Merge pull request #2 from clouddrove/CD-92

Cd 92

README.md

@@ -77,7 +77,7 @@ Here is an example of how you can use this module in your inventory structure:
     application   = "clouddrove"
     environment   = "test"
     protocol      = "tcp"
-    label_order   = ["environment", "name", "application"]
+    label_order   = ["environment", "application", "name"]
     vpc_id        = "vpc-xxxxxxxxx"
     allowed_ip    = ["172.16.0.0/16", "10.0.0.0/16"]
     allowed_ports = [22, 27017]

README.yaml

@@ -41,7 +41,7 @@ usage : |-
       application   = "clouddrove"
       environment   = "test"
       protocol      = "tcp"
-      label_order   = ["environment", "name", "application"]
+      label_order   = ["environment", "application", "name"]
       vpc_id        = "vpc-xxxxxxxxx"
       allowed_ip    = ["172.16.0.0/16", "10.0.0.0/16"]
       allowed_ports = [22, 27017]

_example/example.tf

@@ -8,7 +8,7 @@ module "vpc" {
   name        = "vpc"
   application = "clouddrove"
   environment = "test"
-  label_order = ["environment", "name", "application"]
+  label_order = ["environment", "application", "name"]
 
   cidr_block = "10.0.0.0/16"
 }
@@ -19,7 +19,7 @@ module "security_group" {
   name        = "security-group"
   application = "clouddrove"
   environment = "test"
-  label_order = ["environment", "name", "application"]
+  label_order = ["environment", "application", "name"]
 
   vpc_id        = module.vpc.vpc_id
   protocol      = "tcp"

_test/securitygroup_test.go

@@ -29,6 +29,6 @@ func Test(t *testing.T) {
 	Tags := terraform.OutputMap(t, terraformOptions, "tags")
 
 	// Check that we get back the outputs that we expect
-	assert.Equal(t, "test-security-group-clouddrove", Tags["Name"])
+	assert.Equal(t, "test-clouddrove-security-group", Tags["Name"])
 	assert.Contains(t, Id, "sg-")
 }