From 3f23a5ec745b4fa2c013b6bbb307b81af46c41c8 Mon Sep 17 00:00:00 2001
From: "sangkyu.kim" <sangkyu.kim@navercorp.com>
Date: Fri, 2 Apr 2021 14:55:36 +0900
Subject: [PATCH] Remove `getClassicServerImageProductList` within block
 storage size 100GB

---
 builder/ncloud/config.go                 |  2 +-
 builder/ncloud/step_validate_template.go | 32 +++++-------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go
index 5f8aeaf2f..198091ef5 100644
--- a/builder/ncloud/config.go
+++ b/builder/ncloud/config.go
@@ -133,7 +133,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 
 	if c.UserData != "" && c.UserDataFile != "" {
-		errs = packersdk.MultiErrorAppend(errs, errors.New("only one of user_data or `user_data`_file can be specified."))
+		errs = packersdk.MultiErrorAppend(errs, errors.New("only one of `user_data` or `user_data_file` can be specified."))
 	} else if c.UserDataFile != "" {
 		if _, err := os.Stat(c.UserDataFile); err != nil {
 			errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("`user_data_file` not found: %s", c.UserDataFile))
diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go
index 8d224117c..19c55d670 100644
--- a/builder/ncloud/step_validate_template.go
+++ b/builder/ncloud/step_validate_template.go
@@ -22,7 +22,7 @@ type StepValidateTemplate struct {
 	Validate                  func() error
 	getZone                   func() error
 	getMemberServerImageList  func() ([]*server.MemberServerImage, error)
-	getServerImageProductList func(blockStorageSize *int32) ([]*server.Product, error)
+	getServerImageProductList func() ([]*server.Product, error)
 	getServerProductList      func(serverImageProductCode string) ([]*server.Product, error)
 	Say                       func(message string)
 	Error                     func(e error)
@@ -199,10 +199,9 @@ func (s *StepValidateTemplate) getVpcMemberServerImageList() ([]*server.MemberSe
 	return results, nil
 }
 
-func (s *StepValidateTemplate) getClassicServerImageProductList(blockStorageSize *int32) ([]*server.Product, error) {
+func (s *StepValidateTemplate) getClassicServerImageProductList() ([]*server.Product, error) {
 	reqParams := &server.GetServerImageProductListRequest{
-		RegionNo:         &s.regionNo,
-		BlockStorageSize: blockStorageSize,
+		RegionNo: &s.regionNo,
 	}
 
 	resp, err := s.Conn.server.V2Api.GetServerImageProductList(reqParams)
@@ -213,10 +212,9 @@ func (s *StepValidateTemplate) getClassicServerImageProductList(blockStorageSize
 	return resp.ProductList, nil
 }
 
-func (s *StepValidateTemplate) getVpcServerImageProductList(blockStorageSize *int32) ([]*server.Product, error) {
+func (s *StepValidateTemplate) getVpcServerImageProductList() ([]*server.Product, error) {
 	reqParams := &vserver.GetServerImageProductListRequest{
-		RegionCode:       &s.regionCode,
-		BlockStorageSize: blockStorageSize,
+		RegionCode: &s.regionCode,
 	}
 
 	resp, err := s.Conn.vserver.V2Api.GetServerImageProductList(reqParams)
@@ -241,7 +239,7 @@ func (s *StepValidateTemplate) validateServerImageProduct() error {
 		return nil
 	}
 
-	serverImageProductList, err := s.getServerImageProductList(nil)
+	serverImageProductList, err := s.getServerImageProductList()
 	if err != nil {
 		return err
 	}
@@ -263,24 +261,6 @@ func (s *StepValidateTemplate) validateServerImageProduct() error {
 		table.Append([]string{*product.ProductName, *product.ProductCode})
 	}
 
-	if !isExistServerImage {
-		serverImageProductList, err := s.getServerImageProductList(ncloud.Int32(100))
-		if err != nil {
-			return err
-		}
-
-		for _, product := range serverImageProductList {
-			// Check exist server image product code
-			if *product.ProductCode == serverImageProductCode {
-				isExistServerImage = true
-				productName = *product.ProductName
-				break
-			}
-
-			table.Append([]string{*product.ProductName, *product.ProductCode})
-		}
-	}
-
 	if !isExistServerImage {
 		table.Render()
 		s.Say(buf.String())