fix when additional tags are ssh fingerprints are not provided

Author: jsiebens

plugin/digitalocean.go

@@ -41,7 +41,7 @@ func (t *TargetPlugin) scaleOut(ctx context.Context, num int64, template *drople
 			Image: godo.DropletCreateImage{
 				ID: template.snapshotID,
 			},
-			Tags: append(template.tags, template.nodeClass),
+			Tags: template.tags,
 		}
 
 		if len(template.sshKeys) != 0 {

plugin/plugin.go

@@ -208,8 +208,8 @@ func (t *TargetPlugin) createDropletTemplate(config map[string]string) (*droplet
 		return nil, fmt.Errorf("invalid value for config param %s", configKeySnapshotID)
 	}
 
-	sshKeyFingerprint, _ := t.getValue(config, configKeySshKeys)
-	tags, _ := t.getValue(config, configKeyTags)
+	sshKeyFingerprintAsString, _ := t.getValue(config, configKeySshKeys)
+	tagsAsString, _ := t.getValue(config, configKeyTags)
 	userData, _ := t.getValue(config, configKeyUserData)
 
 	// We cannot scale droplets without knowing the target node class.
@@ -218,15 +218,25 @@ func (t *TargetPlugin) createDropletTemplate(config map[string]string) (*droplet
 		return nil, fmt.Errorf("required config param %s not found", sdk.TargetConfigKeyClass)
 	}
 
+	var tags = []string{nodeClass}
+	if len(tagsAsString) != 0 {
+		tags = append(tags, strings.Split(tagsAsString, ",")...)
+	}
+
+	var sshKeyFingerprints = []string{}
+	if len(sshKeyFingerprintAsString) != 0 {
+		sshKeyFingerprints = append(sshKeyFingerprints, strings.Split(sshKeyFingerprintAsString, ",")...)
+	}
+
 	return &dropletTemplate{
 		region:     region,
 		size:       size,
 		vpc:        vpc,
 		snapshotID: int(snapshotID),
 		nodeClass:  nodeClass,
-		sshKeys:    strings.Split(sshKeyFingerprint, ","),
+		sshKeys:    sshKeyFingerprints,
 		userData:   userData,
-		tags:       strings.Split(tags, ","),
+		tags:       tags,
 	}, nil
 }
 

plugin/plugin_test.go

@@ -47,3 +47,37 @@ func TestTargetPlugin_calculateDirection(t *testing.T) {
 		})
 	}
 }
+
+func TestTargetPlugin_createDropletTemplate(t *testing.T) {
+	input := map[string]string{
+		"region" : "ny1",
+		"size" : "s-1vcpu-1gb",
+		"vpc_uuid" : "b6ac51f4-dc83-11e8-a3da-3cfdfea9f0d8",
+		"snapshot_id" : "123",
+		"node_class" : "hashistack",
+	}
+
+	plugin := TargetPlugin{}
+	dropletTemplate, err := plugin.createDropletTemplate(input)
+
+	assert.Nil(t, err)
+	assert.Equal(t, []string{}, dropletTemplate.sshKeys)
+	assert.Equal(t, []string{"hashistack"}, dropletTemplate.tags)
+}
+
+func TestTargetPlugin_createDropletTemplateWithMultipleTags(t *testing.T) {
+	input := map[string]string{
+		"region" : "ny1",
+		"size" : "s-1vcpu-1gb",
+		"vpc_uuid" : "b6ac51f4-dc83-11e8-a3da-3cfdfea9f0d8",
+		"snapshot_id" : "123",
+		"tags" : "tag1,tag2",
+		"node_class" : "hashistack",
+	}
+
+	plugin := TargetPlugin{}
+	dropletTemplate, err := plugin.createDropletTemplate(input)
+
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"hashistack", "tag1", "tag2"}, dropletTemplate.tags)
+}