Merge pull request #143 from stelligent/develop

0.1.4 - bug fixes

README.md

@@ -19,7 +19,7 @@ Watch the 90 second demo below to see mu in action!
 Install latest version to /usr/local/bin (or for additional options, see [wiki](https://github.com/stelligent/mu/wiki/Installation)):
 
 ```bash
-curl -s http://getmu.io/install.sh | sh
+curl -s https://getmu.io/install.sh | sh
 ```
 
 Assuming your project already has a Dockerfile, you can initialize your mu.yml file with: `mu init`.  More details available in the [quickstart](https://github.com/stelligent/mu/wiki/Quickstart).

VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

common/stack.go

@@ -126,11 +126,13 @@ func buildStackTags(tags map[string]string) []*cloudformation.Tag {
 		})
 
 	for key, value := range tags {
-		stackTags = append(stackTags,
-			&cloudformation.Tag{
-				Key:   aws.String(fmt.Sprintf("mu:%s", key)),
-				Value: aws.String(value),
-			})
+		if value != "" {
+			stackTags = append(stackTags,
+				&cloudformation.Tag{
+					Key:   aws.String(fmt.Sprintf("mu:%s", key)),
+					Value: aws.String(value),
+				})
+		}
 	}
 	return stackTags
 }

examples/elb-https/mu.yml

@@ -3,5 +3,5 @@
 environments:
   - name: env-with-elb-https
     loadbalancer:
-      certificate: "arn:aws:acm:us-west-2:312340000000:certificate/973c1a2f-e1c6-4f65-8d43-0000000000"
+      certificate: "973c1a2f-e1c6-4f65-8d43-0000000000"
 

templates/assets/cluster.yml

@@ -68,7 +68,7 @@ Parameters:
     Default: ''
   ElbCert:
     Type: String
-    Description: The ARN for the certificate to use for ELB. Leave blank to disable HTTPS
+    Description: The identifier for the certificate to use for ELB. Leave blank to disable HTTPS
     Default: ''
   ConsulServerAutoScalingGroup:
     Type: String
@@ -539,7 +539,7 @@ Resources:
       - Type: forward
         TargetGroupArn: !Ref EcsElbDefaultTargetGroup
       Certificates:
-        - CertificateArn: !Ref ElbCert
+        - CertificateArn: !Sub "arn:aws:acm:${AWS::Region}:${AWS::AccountId}:certificate/${ElbCert}"
       Port: '443'
       Protocol: HTTPS
   EcsElbDefaultTargetGroup:
@@ -619,7 +619,7 @@ Resources:
             awslogs-stream-prefix: instance
         Command:
           - 'agent'
-          - !Sub '-datacenter=${AWS::Region}'
+          - !Sub "-datacenter=${AWS::Region}"
           - '-retry-join-ec2-tag-key=aws:autoscaling:groupName'
           - !Sub "-retry-join-ec2-tag-value=${ConsulServerAutoScalingGroup}"
       - Name: registrator

templates/assets/consul.yml

@@ -578,7 +578,7 @@ Resources:
           - '-server'
           - !Sub "-bootstrap-expect=${DesiredCapacity}"
           - '-ui'
-          - !Sub '-datacenter=${AWS::Region}'
+          - !Sub "-datacenter=${AWS::Region}"
           - '-retry-join-ec2-tag-key=aws:autoscaling:groupName'
           - !Sub "-retry-join-ec2-tag-value=${ECSAutoScalingGroup}"
         PortMappings:

templates/assets/service.yml

@@ -35,7 +35,7 @@ Parameters:
   ListenerRulePriority:
     Type: Number
     Description: The priority of the rule being added to the listener
-    Default: 1
+    Default: '1'
   VpcId:
     Type: String
     Description: Name of the value to import for the VpcId