Merge pull request #59 from IBM/classic-userdata

Add support for userdata on classic infrastructure

Author: juanpinzon

.github/workflows/greetings.yml

@@ -1,16 +1,21 @@
 name: Greetings
 
-on: [pull_request, issues]
-
+on: 
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, reopened]
+    
 jobs:
   greeting:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
     steps:
-    - uses: actions/first-interaction@v1
+    - name: 'Greet the contributor'
+      uses: garg3133/welcome-new-contributors@v1.2
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: 'Thank you so much for reporting an issue'
-        pr-message: 'Thank you so much for contributing to this project with your first pull request'
+        issue-message: 'Hi, @${{ github.actor }}. Thank you so much for reporting an issue.'
+        pr-message: 'Hi, @${{ github.actor }}. Thank you so much for contributing to this project. Keep making such awesome contributions!'

builder/ibmcloud/classic/client.go

@@ -49,6 +49,8 @@ type InstanceType struct {
 	BaseImageId            string
 	BaseOsCode             string
 	PublicSecurityGroupIds []int64
+	UserData               []Attribute
+	UserDataCount          uint64
 }
 
 type InstanceReq struct {
@@ -68,6 +70,8 @@ type InstanceReq struct {
 	BlockDeviceTemplateGroup *BlockDeviceTemplateGroup `json:"blockDeviceTemplateGroup,omitempty"`
 	OsReferenceCode          string                    `json:"operatingSystemReferenceCode,omitempty"`
 	SshKeys                  []*SshKey                 `json:"sshKeys,omitempty"`
+	UserData                 []Attribute               `json:"userData,omitempty"`
+	UserDataCount            uint64                    `json:"userDataCount,omitempty"`
 }
 
 type InstanceImage struct {
@@ -128,6 +132,10 @@ type SecurityGroup struct {
 	Id int64 `json:"id,omitempty"`
 }
 
+type Attribute struct {
+	Value string `json:"value,omitempty"`
+}
+
 func (s SoftlayerClient) New(user string, key string) *SoftlayerClient {
 	return &SoftlayerClient{
 		http: &http.Client{
@@ -302,6 +310,8 @@ func (s SoftlayerClient) CreateInstance(instance InstanceType) (map[string]inter
 				MaxSpeed: instance.NetworkSpeed,
 			},
 		},
+		UserData:      instance.UserData,
+		UserDataCount: instance.UserDataCount,
 	}
 
 	if instance.ProvisioningSshKeyId != 0 {

builder/ibmcloud/classic/config.go

@@ -4,6 +4,7 @@ package classic
 import (
 	"errors"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/hashicorp/packer-plugin-sdk/common"
@@ -38,6 +39,7 @@ type Config struct {
 	InstanceNetworkSpeed           int     `mapstructure:"instance_network_speed"`
 	ProvisioningSshKeyId           int64   `mapstructure:"provisioning_ssh_key_id"`
 	InstancePublicSecurityGroupIds []int64 `mapstructure:"public_security_groups"`
+	UserDataFilePath               string  `mapstructure:"user_data_file_path"`
 
 	RawStateTimeout string              `mapstructure:"instance_state_timeout"`
 	StateTimeout    time.Duration       `mapstructure-to-hcl2:",skip"`
@@ -157,6 +159,13 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 	c.StateTimeout = stateTimeout
 
+	if c.UserDataFilePath != "" {
+		if _, err := os.ReadFile(c.UserDataFilePath); err != nil {
+			errs = packer.MultiErrorAppend(
+				errs, fmt.Errorf("[ERROR] Error reading user data file. Error: %s", err))
+		}
+	}
+
 	//log.Println(common.ScrubConfig(self.config, c.APIKey, c.Username))
 
 	if errs != nil && len(errs.Errors) > 0 {

builder/ibmcloud/classic/config.hcl2spec.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"os"
 
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
@@ -46,6 +47,17 @@ func (s *stepCreateInstance) Run(_ context.Context, state multistep.StateBag) mu
 		BaseOsCode:             config.BaseOsCode,
 	}
 
+	if config.UserDataFilePath != "" {
+		if userDataBytes, err := os.ReadFile(config.UserDataFilePath); err == nil {
+			instanceDefinition.UserData = []Attribute{{Value: string(userDataBytes)}}
+			instanceDefinition.UserDataCount += 1
+		} else {
+			ui.Error(err.Error())
+			state.Put("error", err)
+			return multistep.ActionHalt
+		}
+	}
+
 	ui.Say("Creating an instance...")
 	instanceData, err := client.CreateInstance(*instanceDefinition)
 	if err != nil {