Add support of raw user data as driver arguments (#38)

Author: outcatcher

Makefile

@@ -3,7 +3,7 @@ export PATH:=/usr/local/go/bin:$(PATH)
 exec_path := /usr/local/bin/
 exec_name := docker-machine-driver-otc
 
-VERSION := 0.2.3b3
+VERSION := 0.2.3b4
 
 
 default: test build

driver/opentelekomcloud.go

@@ -111,6 +111,7 @@ type Driver struct {
 	Token                  string             `json:"token,omitempty"`
 	RootVolumeOpts         *services.DiskOpts `json:"-"`
 	UserDataFile           string             `json:"-"`
+	UserData               []byte             `json:"-"`
 	IPVersion              int                `json:"-"`
 	skipEIPCreation        bool
 	eipConfig              *services.ElasticIPOpts
@@ -356,6 +357,18 @@ func (d *Driver) Create() error {
 	return nil
 }
 
+func (d *Driver) getUserData() error {
+	if d.UserDataFile == "" || len(d.UserData) != 0 {
+		return nil
+	}
+	userData, err := ioutil.ReadFile(d.UserDataFile)
+	if err != nil {
+		return err
+	}
+	d.UserData = userData
+	return nil
+}
+
 func (d *Driver) createInstance() error {
 	if d.InstanceID != "" {
 		return nil
@@ -384,13 +397,10 @@ func (d *Driver) createInstance() error {
 		ServerGroupID: d.ServerGroupID,
 	}
 
-	if d.UserDataFile != "" {
-		userData, err := ioutil.ReadFile(d.UserDataFile)
-		if err != nil {
-			return err
-		}
-		serverOpts.UserData = userData
+	if err := d.getUserData(); err != nil {
+		return err
 	}
+	serverOpts.UserData = d.UserData
 
 	instance, err := d.client.CreateInstance(serverOpts)
 	if err != nil {
@@ -552,6 +562,10 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			EnvVar: "OS_USER_DATA_FILE",
 			Usage:  "File containing an user data script",
 		},
+		mcnflag.StringFlag{
+			Name:  "otc-user-data-raw",
+			Usage: "Contents of user data file as a string",
+		},
 		mcnflag.StringFlag{
 			Name:   "otc-token",
 			EnvVar: "OS_TOKEN",
@@ -965,6 +979,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.PrivateKeyFile = flags.String("otc-private-key-file")
 	d.Token = flags.String("otc-token")
 	d.UserDataFile = flags.String("otc-user-data-file")
+	d.UserData = []byte(flags.String("otc-user-data-raw"))
 	d.ServerGroup = flags.String("otc-server-group")
 	d.ServerGroupID = flags.String("otc-server-group-id")
 	d.AccessKey = services.AccessKey{
@@ -1023,5 +1038,8 @@ func (d *Driver) checkConfig() error {
 		(d.AccessKey.AccessKey == "" || d.AccessKey.SecretKey == "") {
 		return fmt.Errorf("at least one authorization method must be provided")
 	}
+	if len(d.UserData) > 0 && d.UserDataFile != "" {
+		return fmt.Errorf("both `-otc-user-data` and `-otc-user-data` is defined")
+	}
 	return nil
 }

driver/opentelekomcloud_test.go

@@ -362,7 +362,7 @@ func TestDriver_SetConfigFromFlagsDeprecated(t *testing.T) {
 // This test won't check anything really, it exists only for debug purposes
 func TestDriver_CreateWithUserData(t *testing.T) {
 	fileName := "tmp.sh"
-	userData := []byte("#!/usr/bin/bash\necho touch > /tmp/my")
+	userData := []byte("#!/bin/bash\necho touch > /tmp/my")
 	require.NoError(t, ioutil.WriteFile(fileName, userData, os.ModePerm))
 	defer func() {
 		_ = os.Remove(fileName)
@@ -383,6 +383,32 @@ func TestDriver_CreateWithUserData(t *testing.T) {
 	assert.NoError(t, driver.Remove())
 }
 
+func TestDriver_UserDataRaw(t *testing.T) {
+	fileName := "tmp.sh"
+	userData := []byte("#!/bin/bash\necho touch > /tmp/my")
+	require.NoError(t, ioutil.WriteFile(fileName, userData, os.ModePerm))
+	defer func() {
+		_ = os.Remove(fileName)
+	}()
+
+	driverFl, err := newDriverFromFlags(
+		map[string]interface{}{
+			"otc-cloud":          "otc",
+			"otc-user-data-file": fileName,
+		})
+	require.NoError(t, err)
+	require.NoError(t, driverFl.getUserData())
+
+	driverRaw, err := newDriverFromFlags(
+		map[string]interface{}{
+			"otc-cloud":         "otc",
+			"otc-user-data-raw": string(userData),
+		})
+	require.NoError(t, err)
+
+	assert.Equal(t, driverFl.UserData, driverRaw.UserData)
+}
+
 func TestDriver_ResolveServerGroup(t *testing.T) {
 	driver, err := defaultDriver()
 	require.NoError(t, err)