- Remove plugin version

- remove `os_type`. use `communicator` instead of this.

builder/ncloud/builder.go

@@ -8,8 +8,6 @@ import (
 	"github.com/mitchellh/multistep"
 )
 
-const version = "1.0.0"
-
 // Builder assume this implements packer.Builder
 type Builder struct {
 	config   *Config
@@ -30,8 +28,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 }
 
 func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
-	ui.Say("Running builder for Naver Cloud Platform (version: " + version + ") ...")
-
 	ui.Message("Creating Naver Cloud Platform Connection ...")
 	conn := ncloud.NewConnection(b.config.AccessKey, b.config.SecretKey)
 
@@ -42,7 +38,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 
 	steps = []multistep.Step{}
 
-	if b.config.OSType == "Linux" {
+	if b.config.Comm.Type == "ssh" {
 		steps = []multistep.Step{
 			NewStepValidateTemplate(conn, ui, b.config),
 			NewStepCreateLoginKey(conn, ui),
@@ -63,7 +59,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			NewStepDeleteLoginKey(conn, ui),
 			NewStepDeletePublicIPInstance(conn, ui),
 		}
-	} else if b.config.OSType == "Windows" {
+	} else if b.config.Comm.Type == "Windows" {
 		steps = []multistep.Step{
 			NewStepValidateTemplate(conn, ui, b.config),
 			NewStepCreateLoginKey(conn, ui),
@@ -94,7 +90,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, b.stateBag)
 	b.runner.Run(b.stateBag)
 
 	// If there was an error, return that

builder/ncloud/config.go

@@ -16,13 +16,13 @@ type Config struct {
 
 	AccessKey                         string `mapstructure:"access_key"`
 	SecretKey                         string `mapstructure:"secret_key"`
-	OSType                            string `mapstructure:"os_type"`
 	ServerImageProductCode            string `mapstructure:"server_image_product_code"`
 	ServerProductCode                 string `mapstructure:"server_product_code"`
 	MemberServerImageNo               string `mapstructure:"member_server_image_no"`
 	ServerImageName                   string `mapstructure:"server_image_name"`
 	ServerImageDescription            string `mapstructure:"server_image_description"`
 	UserData                          string `mapstructure:"user_data"`
+	UserDataFile                          string `mapstructure:"user_data_file"`
 	BlockStorageSize                  int    `mapstructure:"block_storage_size"`
 	Region                            string `mapstructure:"region"`
 	AccessControlGroupConfigurationNo string `mapstructure:"access_control_group_configuration_no"`
@@ -60,10 +60,6 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 		errs = packer.MultiErrorAppend(errs, errors.New("secret_key is required"))
 	}
 
-	if c.OSType != "Linux" && c.OSType != "Windows" {
-		errs = packer.MultiErrorAppend(errs, errors.New("os_type is required. ('Linux' or 'Windows')"))
-	}
-
 	if c.MemberServerImageNo == "" && c.ServerImageProductCode == "" {
 		errs = packer.MultiErrorAppend(errs, errors.New("server_image_product_code or member_server_image_no is required"))
 	}
@@ -100,8 +96,8 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 		errs = packer.MultiErrorAppend(errs, errors.New("If user_data field is set, length of UserData should be max 21847"))
 	}
 
-	if c.OSType == "Windows" && c.AccessControlGroupConfigurationNo == "" {
-		errs = packer.MultiErrorAppend(errs, errors.New("If os_type is Windows, access_control_group_configuration_no is required"))
+	if c.Comm.Type == "wrinrm" && c.AccessControlGroupConfigurationNo == "" {
+		errs = packer.MultiErrorAppend(errs, errors.New("If Communicator is winrm, access_control_group_configuration_no is required"))
 	}
 
 	c.FeeSystemTypeCode = "MTRAT"

builder/ncloud/config_test.go

@@ -9,7 +9,6 @@ func testConfig() map[string]interface{} {
 	return map[string]interface{}{
 		"access_key":                "access_key",
 		"secret_key":                "secret_key",
-		"os_type":                   "Windows",
 		"server_image_product_code": "SPSW0WINNT000016",
 		"server_product_code":       "SPSVRSSD00000011",
 		"server_image_name":         "packer-test {{timestamp}}",
@@ -27,7 +26,6 @@ func testConfigForMemberServerImage() map[string]interface{} {
 	return map[string]interface{}{
 		"access_key":               "access_key",
 		"secret_key":               "secret_key",
-		"os_type":                  "Windows",
 		"server_product_code":      "SPSVRSSD00000011",
 		"member_server_image_no":   "2440",
 		"server_image_name":        "packer-test {{timestamp}}",
@@ -135,7 +133,6 @@ func TestExistsBothServerImageProductCodeAndMemberServerImageNoConfig(t *testing
 	raw := map[string]interface{}{
 		"access_key":                "access_key",
 		"secret_key":                "secret_key",
-		"os_type":                   "Windows",
 		"server_image_product_code": "SPSW0WINNT000016",
 		"server_product_code":       "SPSVRSSD00000011",
 		"member_server_image_no":    "2440",

builder/ncloud/step_create_public_ip_instance.go

@@ -91,10 +91,10 @@ func (s *StepCreatePublicIPInstance) Run(state multistep.StateBag) multistep.Ste
 
 	publicIPInstance, err := s.CreatePublicIPInstance(serverInstanceNo)
 	if err == nil {
-		switch s.Config.OSType {
-		case "Linux":
+		switch s.Config.Comm.Type {
+		case "ssh":
 			state.Put("SSHHost", publicIPInstance.PublicIP)
-		case "Windows":
+		case "winrm":
 			state.Put("WinRMHost", publicIPInstance.PublicIP)
 		}
 

builder/ncloud/step_create_public_ip_instance_test.go

@@ -31,13 +31,17 @@ func TestStepCreatePublicIPInstanceShouldFailIfOperationCreatePublicIPInstanceFa
 }
 
 func TestStepCreatePublicIPInstanceShouldPassIfOperationCreatePublicIPInstancePasses(t *testing.T) {
+	c := new(Config)
+	c.Comm.Prepare(nil)
+	c.Comm.Type = "ssh"
+
 	var testSubject = &StepCreatePublicIPInstance{
 		CreatePublicIPInstance: func(serverInstanceNo string) (*ncloud.PublicIPInstance, error) {
 			return &ncloud.PublicIPInstance{PublicIPInstanceNo: "a", PublicIP: "b"}, nil
 		},
 		Say:    func(message string) {},
 		Error:  func(e error) {},
-		Config: &Config{OSType: "Windows"},
+		Config: c,
 	}
 
 	stateBag := createTestStateBagStepCreatePublicIPInstance()