From 23e8684aaefab157163fd66e76c91a2bb76cc2c9 Mon Sep 17 00:00:00 2001 From: "sangkyu.kim" Date: Tue, 6 Apr 2021 11:40:41 +0900 Subject: [PATCH] fix lint, fmt, generate --- builder/ncloud/config.go | 5 +++-- builder/ncloud/step_create_access_control_group.go | 3 ++- builder/ncloud/step_create_block_storage_instance.go | 2 +- builder/ncloud/step_create_init_script.go | 2 +- builder/ncloud/step_create_init_script_test.go | 1 + builder/ncloud/step_create_public_ip_instance.go | 2 +- builder/ncloud/step_create_server_image.go | 2 +- builder/ncloud/step_create_server_instance.go | 2 +- builder/ncloud/step_delete_block_storage_instance.go | 6 +++--- builder/ncloud/step_get_rootpassword.go | 2 +- builder/ncloud/step_stop_server_instance.go | 2 +- builder/ncloud/step_terminate_server_instance.go | 2 +- builder/ncloud/step_validate_template.go | 4 ++-- builder/ncloud/waiter_block_storage_instance.go | 2 +- builder/ncloud/waiter_server_image_status.go | 2 +- builder/ncloud/waiter_server_instance_status.go | 2 +- .../content/partials/builder/ncloud/Config-not-required.mdx | 2 ++ 17 files changed, 24 insertions(+), 19 deletions(-) diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go index 198091ef5..6bf088217 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -6,9 +6,10 @@ package ncloud import ( "errors" "fmt" + "os" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vpc" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" - "os" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" @@ -62,7 +63,7 @@ type Config struct { // advance if you use CLASSIC env. If this field is left blank, // Packer will create temporary ACG for automatically in VPC environment. AccessControlGroupNo string `mapstructure:"access_control_group_no" required:"false"` - SupportVPC bool `mapstructure:"support_vpc" required:"false"` + SupportVPC bool `mapstructure:"support_vpc" required:"false"` // The ID of the Subnet where you want to place the Server Instance. If this field is left blank, Packer will try to get the Public Subnet ID from the `vpc_no`. SubnetNo string `mapstructure:"subnet_no" required:"false"` // The ID of the VPC where you want to place the Server Instance. If this field is left blank, Packer will try to get the VPC ID from the `subnet_no`. diff --git a/builder/ncloud/step_create_access_control_group.go b/builder/ncloud/step_create_access_control_group.go index 90a4f5a3a..c56983081 100644 --- a/builder/ncloud/step_create_access_control_group.go +++ b/builder/ncloud/step_create_access_control_group.go @@ -3,11 +3,12 @@ package ncloud import ( "context" "fmt" + "log" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - "log" ) type StepCreateAccessControlGroup struct { diff --git a/builder/ncloud/step_create_block_storage_instance.go b/builder/ncloud/step_create_block_storage_instance.go index 878303637..6435bc8c6 100644 --- a/builder/ncloud/step_create_block_storage_instance.go +++ b/builder/ncloud/step_create_block_storage_instance.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_create_init_script.go b/builder/ncloud/step_create_init_script.go index 6e523336d..117a85515 100644 --- a/builder/ncloud/step_create_init_script.go +++ b/builder/ncloud/step_create_init_script.go @@ -3,10 +3,10 @@ package ncloud import ( "context" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "io/ioutil" "time" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" diff --git a/builder/ncloud/step_create_init_script_test.go b/builder/ncloud/step_create_init_script_test.go index a722d40a1..aba954726 100644 --- a/builder/ncloud/step_create_init_script_test.go +++ b/builder/ncloud/step_create_init_script_test.go @@ -16,6 +16,7 @@ func TestStepCreateInitScriptShouldFailIfOperationCreateInitScriptFails(t *testi Config: &Config{ Region: "Korea", SupportVPC: true, + UserData: "test", }, } diff --git a/builder/ncloud/step_create_public_ip_instance.go b/builder/ncloud/step_create_public_ip_instance.go index 5f9af7ed7..b33ddcfac 100644 --- a/builder/ncloud/step_create_public_ip_instance.go +++ b/builder/ncloud/step_create_public_ip_instance.go @@ -3,12 +3,12 @@ package ncloud import ( "context" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_create_server_image.go b/builder/ncloud/step_create_server_image.go index d3ad06d49..d6cc6c820 100644 --- a/builder/ncloud/step_create_server_image.go +++ b/builder/ncloud/step_create_server_image.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_create_server_instance.go b/builder/ncloud/step_create_server_instance.go index f55f75bae..2ec5452b5 100644 --- a/builder/ncloud/step_create_server_instance.go +++ b/builder/ncloud/step_create_server_instance.go @@ -4,13 +4,13 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "io/ioutil" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_delete_block_storage_instance.go b/builder/ncloud/step_delete_block_storage_instance.go index f64caa155..8fa9e30ee 100644 --- a/builder/ncloud/step_delete_block_storage_instance.go +++ b/builder/ncloud/step_delete_block_storage_instance.go @@ -4,11 +4,11 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) @@ -92,7 +92,7 @@ func (s *StepDeleteBlockStorage) getVpcBlockList(serverInstanceNo string) []*str func (s *StepDeleteBlockStorage) deleteClassicBlockStorage(serverInstanceNo string) error { blockStorageInstanceList := s.getClassicBlockList(serverInstanceNo) - if blockStorageInstanceList == nil || len(blockStorageInstanceList) == 0 { + if len(blockStorageInstanceList) == 0 { return nil } reqParams := server.DeleteBlockStorageInstancesRequest{ @@ -114,7 +114,7 @@ func (s *StepDeleteBlockStorage) deleteClassicBlockStorage(serverInstanceNo stri func (s *StepDeleteBlockStorage) deleteVpcBlockStorage(serverInstanceNo string) error { blockStorageInstanceList := s.getVpcBlockList(serverInstanceNo) - if blockStorageInstanceList == nil || len(blockStorageInstanceList) == 0 { + if len(blockStorageInstanceList) == 0 { return nil } reqParams := vserver.DeleteBlockStorageInstancesRequest{ diff --git a/builder/ncloud/step_get_rootpassword.go b/builder/ncloud/step_get_rootpassword.go index fb455be2a..590b36d68 100644 --- a/builder/ncloud/step_get_rootpassword.go +++ b/builder/ncloud/step_get_rootpassword.go @@ -3,9 +3,9 @@ package ncloud import ( "context" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_stop_server_instance.go b/builder/ncloud/step_stop_server_instance.go index 609234bf0..04d0401ac 100644 --- a/builder/ncloud/step_stop_server_instance.go +++ b/builder/ncloud/step_stop_server_instance.go @@ -3,10 +3,10 @@ package ncloud import ( "context" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_terminate_server_instance.go b/builder/ncloud/step_terminate_server_instance.go index ed1def333..add729100 100644 --- a/builder/ncloud/step_terminate_server_instance.go +++ b/builder/ncloud/step_terminate_server_instance.go @@ -4,11 +4,11 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go index 0ff0a8a75..d65f4c215 100644 --- a/builder/ncloud/step_validate_template.go +++ b/builder/ncloud/step_validate_template.go @@ -5,12 +5,12 @@ import ( "context" "errors" "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vpc" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "strings" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vpc" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/olekukonko/tablewriter" diff --git a/builder/ncloud/waiter_block_storage_instance.go b/builder/ncloud/waiter_block_storage_instance.go index 6a0109dda..af76a7101 100644 --- a/builder/ncloud/waiter_block_storage_instance.go +++ b/builder/ncloud/waiter_block_storage_instance.go @@ -2,11 +2,11 @@ package ncloud import ( "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" ) func waiterClassicBlockStorageStatus(conn *NcloudAPIClient, blockStorageInstanceNo *string, status string, timeout time.Duration) error { diff --git a/builder/ncloud/waiter_server_image_status.go b/builder/ncloud/waiter_server_image_status.go index 1a281012f..00504b6fd 100644 --- a/builder/ncloud/waiter_server_image_status.go +++ b/builder/ncloud/waiter_server_image_status.go @@ -2,11 +2,11 @@ package ncloud import ( "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" ) func waiterClassicMemberServerImageStatus(conn *NcloudAPIClient, memberServerImageNo string, status string, timeout time.Duration) error { diff --git a/builder/ncloud/waiter_server_instance_status.go b/builder/ncloud/waiter_server_instance_status.go index 8f846cf37..d400de3e7 100644 --- a/builder/ncloud/waiter_server_instance_status.go +++ b/builder/ncloud/waiter_server_instance_status.go @@ -2,11 +2,11 @@ package ncloud import ( "fmt" - "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" "log" "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" + "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/vserver" ) func waiterClassicServerInstanceStatus(conn *NcloudAPIClient, serverInstanceNo string, status string, timeout time.Duration) error { diff --git a/website/content/partials/builder/ncloud/Config-not-required.mdx b/website/content/partials/builder/ncloud/Config-not-required.mdx index 1e06b84f7..92dcd967b 100644 --- a/website/content/partials/builder/ncloud/Config-not-required.mdx +++ b/website/content/partials/builder/ncloud/Config-not-required.mdx @@ -37,6 +37,8 @@ advance if you use CLASSIC env. If this field is left blank, Packer will create temporary ACG for automatically in VPC environment. +- `support_vpc` (bool) - Support VPC + - `subnet_no` (string) - The ID of the Subnet where you want to place the Server Instance. If this field is left blank, Packer will try to get the Public Subnet ID from the `vpc_no`. - `vpc_no` (string) - The ID of the VPC where you want to place the Server Instance. If this field is left blank, Packer will try to get the VPC ID from the `subnet_no`.