Merge pull request #19 from telia-oss/fix-user-data-tests

Fix user data tests
telia-oss · Jul 23, 2019 · 62378d4 · 62378d4
2 parents 078ff46 + fd32727
commit 62378d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/test/asg.go b/test/asg.go
@@ -17,7 +17,7 @@ type Expectations struct {
 	MinSize         int64
 	MaxSize         int64
 	DesiredCapacity int64
-	UserData        string
+	UserData        []string
 	InstanceType    string
 	Volumes         []string
 	InstanceTags    map[string]string
@@ -38,7 +38,11 @@ func RunTestSuite(t *testing.T, name, region string, expected Expectations) {
 	assert.Equal(t, expected.DesiredCapacity, aws.Int64Value(group.DesiredCapacity))
 
 	config = DescribeLaunchConfiguration(t, sess, aws.StringValue(group.LaunchConfigurationName))
-	assert.Equal(t, expected.UserData, DecodeUserData(t, config.UserData))
+
+	userData := DecodeUserData(t, config.UserData)
+	for _, data := range expected.UserData {
+		assert.Contains(t, userData, data)
+	}
 
 	// Wait for capacity in the autoscaling group (max 10min wait)
 	WaitForCapacity(t, sess, name, 10*time.Second, 10*time.Minute)

diff --git a/test/asg_test.go b/test/asg_test.go
@@ -43,7 +43,7 @@ func TestDefaultExample(t *testing.T) {
 				MinSize:         2,
 				MaxSize:         4,
 				DesiredCapacity: 2,
-				UserData:        "#!bin/bash\necho hello world",
+				UserData:        []string{"#!bin/bash\necho hello world"},
 				InstanceType:    "t3.micro",
 				Volumes: []string{
 					"/dev/xvdcz",

diff --git a/variables.tf b/variables.tf
@@ -101,6 +101,7 @@ variable "instance_policy" {
             "NotResource": "*"
         }
     ]
+}
 EOF
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,6 +101,7 @@ variable "instance_policy" { @@
                 "NotResource": "*"
             }
         ]
+    }
     EOF
     }