Merge pull request #72 from IBM/vsi-userdata-support

User data support as string

Author: BShrivastav

README.md

@@ -200,6 +200,8 @@ vsi_interface | string | Set it as "public" to create a Floating IP to connect t
 | |
 | |
 vsi_user_data_file | string | User data to be made available when setting up the virtual server instance. Optional.
+| OR |
+vsi_user_data | string | User data to be made available when setting up the virtual server instance. Optional. This is the string input variable.
 vpc_endpoint_url | string | Configure URL for VPC test environments. Optional.
 iam_url | string | Configure URL for IAM test environments. Optional.
 image_name | string | The name of the resulting custom Image that will appear in your account. Required.

builder/ibmcloud/vpc/config.go

@@ -35,6 +35,7 @@ type Config struct {
 	VSIProfile                string `mapstructure:"vsi_profile"`
 	VSIInterface              string `mapstructure:"vsi_interface"`
 	VSIUserDataFile           string `mapstructure:"vsi_user_data_file"`
+	VSIUserDataString         string `mapstructure:"vsi_user_data"`
 
 	ImageName string `mapstructure:"image_name"`
 
@@ -105,6 +106,12 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 		c.VSIInterface = "public"
 	}
 
+	// Check for mutual exclusion of User data input via file or as a string.
+	if c.VSIUserDataFile != "" && c.VSIUserDataString != "" {
+		errs = packer.MultiErrorAppend(
+			errs, errors.New("mutual exclusion: User data input, either a file as in vsi_user_data_file could be used or a string in vsi_user_data_string, together are not supported"))
+	}
+
 	if c.VSIUserDataFile != "" {
 		if _, err := os.Stat(c.VSIUserDataFile); os.IsNotExist(err) {
 			errs = packer.MultiErrorAppend(

builder/ibmcloud/vpc/config.hcl2spec.go

@@ -77,6 +77,7 @@ func (step *stepCreateInstance) Run(_ context.Context, state multistep.StateBag)
 		instancePrototypeModel.CatalogOffering = catalogOfferingPrototype
 
 		userDataFilePath := config.VSIUserDataFile
+		userDataString := config.VSIUserDataString
 		if userDataFilePath != "" {
 			content, err := ioutil.ReadFile(userDataFilePath)
 			if err != nil {
@@ -86,6 +87,8 @@ func (step *stepCreateInstance) Run(_ context.Context, state multistep.StateBag)
 				return multistep.ActionHalt
 			}
 			instancePrototypeModel.UserData = &[]string{string(content)}[0]
+		} else if userDataString != "" {
+			instancePrototypeModel.UserData = &[]string{string(userDataString)}[0]
 		}
 
 		if config.ResourceGroupID != "" {
@@ -152,6 +155,7 @@ func (step *stepCreateInstance) Run(_ context.Context, state multistep.StateBag)
 		}
 
 		userDataFilePath := config.VSIUserDataFile
+		userDataString := config.VSIUserDataString
 		if userDataFilePath != "" {
 			content, err := ioutil.ReadFile(userDataFilePath)
 			if err != nil {
@@ -161,6 +165,8 @@ func (step *stepCreateInstance) Run(_ context.Context, state multistep.StateBag)
 				return multistep.ActionHalt
 			}
 			instancePrototypeModel.UserData = &[]string{string(content)}[0]
+		} else if userDataString != "" {
+			instancePrototypeModel.UserData = &[]string{string(userDataString)}[0]
 		}
 
 		if config.ResourceGroupID != "" {

builder/ibmcloud/vpc/step_create_instance.go

@@ -8,7 +8,7 @@ var IBMCloudPluginVersion *version.PluginVersion
 
 var (
 	// Version is the main version number that is being run at the moment.
-	Version           = "v3.1.0"
+	Version           = "v3.1.1"
 	VersionPrerelease = "dev"
 )