handel - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

lib/services/beanstalk/index.js

@@ -76,3 +76,3 @@ const winston = require('winston');
     }
-    
+
     //Use enhanced metrics (shouldnt be extra $ unless we specify to send metrics to CloudWatch)
@@ -83,7 +83,5 @@ handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:healthreporting:system", "SystemType", "enhanced"));
     handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment", "LoadBalancerType", "application"));
-    let healthCheckUrl = serviceParams.health_check_url || '/';
-    handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:application", "Application Healthcheck URL", healthCheckUrl));
     let serviceRoleName = `${serviceRole.Path}${serviceRole.RoleName}`;
-    if(serviceRoleName.startsWith('/')) { //Beanstalk doesnt like the leading slash, it just wants something like services/HandelBeanstalkServiceRole
-        serviceRoleName = serviceRoleName.substr(1); 
+    if (serviceRoleName.startsWith('/')) { //Beanstalk doesnt like the leading slash, it just wants something like services/HandelBeanstalkServiceRole
+        serviceRoleName = serviceRoleName.substr(1);
     }
@@ -97,5 +95,2 @@ handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment", "ServiceRole", serviceRoleName));
         handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elbv2:listener:default", "ListenerEnabled", "false"));
-        handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "HealthCheckPath", healthCheckUrl));
-        handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "Port", "80"));
-        handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "Protocol", "HTTP"));
     }
@@ -107,2 +102,9 @@ else { //HTTP ALB Listener
 
+    //Set up health checking
+    let healthCheckUrl = serviceParams.health_check_url || '/';
+    handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:application", "Application Healthcheck URL", healthCheckUrl));
+    handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "HealthCheckPath", healthCheckUrl));
+    handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "Port", "80"));
+    handlebarsParams.optionSettings.push(getEbConfigurationOption("aws:elasticbeanstalk:environment:process:default", "Protocol", "HTTP"));
+
     //Add tags (if present)
@@ -358,4 +360,4 @@ if (serviceParams.tags) {
  */
-exports.getConsumeEventsContextForExternalRef = function (ownServiceContext,  ownDeployContext, externalRefServiceContext, externalRefDeployContext) {
-    return  Promise.reject(new Error("The Beanstalk service doesn't consume events from other services"));
+exports.getConsumeEventsContextForExternalRef = function (ownServiceContext, ownDeployContext, externalRefServiceContext, externalRefDeployContext) {
+    return Promise.reject(new Error("The Beanstalk service doesn't consume events from other services"));
 }
@@ -362,0 +364,0 @@

package.json

 {
   "name": "handel",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Simple orchestration of your AWS deployments",
@@ -5,0 +5,0 @@ "main": "lib/handel.js",

No alert changes

Improved metrics

Total package byte prevSize

681232

Lines of code

10987

increased by0.01%

No dependency changes