Bump 1.0.4: webserver_v2 worker_v2

Dockerfile

@@ -10,4 +10,5 @@ ENV PATH="$PATH:/usr/local/bin/go-deploy"
 
 RUN chmod +x /usr/local/bin/go-deploy/go-deploy
 
+VOLUME /usr/local/bin/go-deploy
 CMD ["/bin/sh", "/run.sh"]

lib/aws/cloudformation/api.go

@@ -119,13 +119,15 @@ func (c *CloudFormation) UpdateStack(paramaters map[string]string, template []by
 	fmt.Printf("%s", cfParameters)
 
 	params := &cloudformation.UpdateStackInput{
-		StackName:  aws.String(fmt.Sprintf("%s-%s-%s", paramaters["AppName"], paramaters["EnvName"], paramaters["Tier"])), // Required
+		StackName:  aws.String(fmt.Sprintf("%s-%s", paramaters["AppName"], paramaters["EnvName"])), // Required
 		Parameters: cfParameters,
 	}
 
 	if usePreviousTemplate {
+		fmt.Println("Using previous template")
 		params.UsePreviousTemplate = aws.Bool(usePreviousTemplate)
 	} else {
+		fmt.Println("Using template file")
 		params.TemplateBody = aws.String(fmt.Sprintf("%s", template))
 	}
 
@@ -158,7 +160,7 @@ func (c *CloudFormation) CreateStack(paramaters map[string]string, template []by
 	fmt.Printf("%s", cfParameters)
 
 	params := &cloudformation.CreateStackInput{
-		StackName:       aws.String(fmt.Sprintf("%s-%s-%s", paramaters["AppName"], paramaters["EnvName"], paramaters["Tier"])), // Required
+		StackName:       aws.String(fmt.Sprintf("%s-%s", paramaters["AppName"], paramaters["EnvName"])), // Required
 		DisableRollback: aws.Bool(false),
 		//OnFailure: aws.String("OnFailure"),
 		Parameters:       cfParameters,

main.go

@@ -52,7 +52,7 @@ var (
 	// Global Vars
 	//--
 	//
-	cliVersion = "1.0.3"
+	cliVersion = "1.0.4"
 
 	// --
 	// Top Level Commands
@@ -140,7 +140,7 @@ func createFunction(createMethod string, awsConfig config.Config, ebService elas
 		}
 
 		environment := utils.GetDefault(*environmentNameArg, *environmentApplicationNameArg)
-		asset, err := Asset(fmt.Sprintf("resources/cloudformation/templates/%s_v1.json", *environmentTierArg))
+		asset, err := Asset(fmt.Sprintf("resources/cloudformation/templates/%s_v2.json", *environmentTierArg))
 
 		if err != nil {
 			log.Fatalf("Asset not found: %s", err)
@@ -212,7 +212,7 @@ func updateFunction(updateMethod string, awsConfig config.Config, ebService elas
 		}
 
 		environment := utils.GetDefault(*environmentNameArg, *environmentApplicationNameArg)
-		asset, err := Asset(fmt.Sprintf("resources/cloudformation/templates/%s_v1.json", *environmentTierArg))
+		asset, err := Asset(fmt.Sprintf("resources/cloudformation/templates/%s_v2.json", *environmentTierArg))
 
 		if err != nil {
 			log.Fatalf("Asset not found: %s", err)
@@ -223,20 +223,23 @@ func updateFunction(updateMethod string, awsConfig config.Config, ebService elas
 			s3Service.UploadSingleFile(*environmentS3Arg, *environmentLocalFilePathArg+"/"+*environmentVersionArg+".zip", *environmentVersionArg)
 		}
 
-		configOptions := make(map[string]string)
-		configOptions["EnvName"] = environment
-		configOptions["AppName"] = *environmentApplicationNameArg
+		additionalConfigOptions := make(map[string]string)
+		additionalConfigOptions["EnvName"] = environment
+		additionalConfigOptions["AppName"] = *environmentApplicationNameArg
 		if len(bucketInfo) > 0 {
-			configOptions["AppBucket"] = bucketInfo[0]
-			configOptions["AppKey"] = bucketInfo[1] + "/" + *environmentVersionArg + ".zip"
+			additionalConfigOptions["AppBucket"] = bucketInfo[0]
+			additionalConfigOptions["AppKey"] = bucketInfo[1] + "/" + *environmentVersionArg + ".zip"
 		}
-		configOptions["VersionLabel"] = *environmentVersionArg
-		configOptions["Tier"] = *environmentTierArg
+		additionalConfigOptions["VersionLabel"] = *environmentVersionArg
+		additionalConfigOptions["Tier"] = *environmentTierArg
 
 		usePreviousTemplate := true
 
+		configOptions := utils.GetConfig(*environmentConfigArg)
+		configOptions = utils.CombineConfigOptions(configOptions, additionalConfigOptions)
+
 		if *environmentConfigArg != "" {
-			configOptions = utils.CombineConfigOptions(utils.GetConfig(*environmentConfigArg), configOptions)
+			fmt.Printf("Config file is present: %s", *environmentConfigArg)
 			usePreviousTemplate = false
 		}
 
@@ -253,6 +256,7 @@ func upsertFunction(updateMethod string, awsConfig config.Config, ebService elas
 	}
 
 	if ebService.EnvironmentExists() {
+		fmt.Println("Updating existing environment...")
 		updateFunction("update environment", awsConfig, ebService, s3Service)
 	} else {
 		fmt.Println("Env DOES NOT exist..creating")

resources/cloudformation/templates/webserver_v1.json

@@ -48,11 +48,23 @@
 			"Type" : "String",
 			"Default" : ""
 		},
-		"loadbalancerManagedSecurityGroup" : {
+		"loadbalancerDefaultListenerEnabled" : {
+			"Description" : "Will ELB cross availability zones. True/False Boolean.",
+			"Type" : "String",
+			"Default" : "true",
+			"AllowedValues" : [ "true", "false" ]
+		},
+		"loadbalancerSecureListenerCertificateId" : {
 			"Description" : "Will ELB cross availability zones. True/False Boolean.",
 			"Type" : "String",
 			"Default" : ""
 		},
+		"loadbalancerSecureListenerEnabled" : {
+			"Description" : "Will ELB cross availability zones. True/False Boolean.",
+			"Type" : "String",
+			"Default" : "false",
+			"AllowedValues" : [ "true", "false" ]
+		},
 		"environmentServiceRole" : {
 			"Description" : "IAM role used by Elastic Beanstalk to manage services.",
 			"Type" : "String",
@@ -346,7 +358,15 @@
 							{"Namespace" : "aws:elasticbeanstalk:environment", "OptionName" : "EnvironmentType", "Value" : { "Ref" : "environmentType" }},
 							{"Namespace" : "aws:elb:loadbalancer", "OptionName" : "CrossZone", "Value" : { "Ref" : "loadbalancerCrossZone" }},
 							{"Namespace" : "aws:elb:loadbalancer", "OptionName" : "SecurityGroups", "Value" : { "Ref" : "loadbalancerSecurityGroups" }},
-							{"Namespace" : "aws:elb:loadbalancer", "OptionName" : "ManagedSecurityGroup", "Value" : { "Ref" : "loadbalancerManagedSecurityGroup" }}
+							{"Namespace" : "aws:elb:listener:80", "OptionName" : "ListenerProtocol", "Value" : "HTTP" },
+							{"Namespace" : "aws:elb:listener:80", "OptionName" : "InstancePort", "Value" : "80" },
+							{"Namespace" : "aws:elb:listener:80", "OptionName" : "InstanceProtocol", "Value" : "HTTP" },
+							{"Namespace" : "aws:elb:listener:80", "OptionName" : "ListenerEnabled", "Value" : { "Ref" : "loadbalancerDefaultListenerEnabled" }},
+							{"Namespace" : "aws:elb:listener:443", "OptionName" : "ListenerProtocol", "Value" : "HTTPS" },
+							{"Namespace" : "aws:elb:listener:443", "OptionName" : "InstancePort", "Value" : "80" },
+							{"Namespace" : "aws:elb:listener:443", "OptionName" : "InstanceProtocol", "Value" : "HTTP" },
+							{"Namespace" : "aws:elb:listener:443", "OptionName" : "SSLCertificateId", "Value" : { "Ref" : "loadbalancerSecureListenerCertificateId" }},
+							{"Namespace" : "aws:elb:listener:443", "OptionName" : "ListenerEnabled", "Value" : { "Ref" : "loadbalancerSecureListenerEnabled" }}
 						]
    			}
 		}