SAN-2554 - Changes for Charon as Dock Service

configs/.env

@@ -4,6 +4,7 @@ KRAIN_VERSION=v0.0.10
 SAURON_VERSION=v0.0.16
 IMAGE_BUILDER_VERSION=d1.6.2-v3.1.1
 DOCKER_LISTENER_VERSION=v0.13.0
+CHARON_VERSION=v2.0.1
 
 # Postgresql
 POSTGRES_CONNECT_STRING=postgres://shiva@localhost/shiva
@@ -61,3 +62,6 @@ BUNYAN_BATCH_LOG_COUNT=25
 DATADOG_HOST=localhost
 DATADOG_PORT=7777
 MONITOR_PREFIX=shiva
+
+# API Host for UserData Script
+API_HOST=api.runnable-beta.com

configs/.env.production-beta

@@ -7,8 +7,8 @@ AWS_CLUSTER_SECURITY_GROUP_ID=sg-87ca04e3
 AWS_CLUSTER_SUBNET=subnet-b36f0fc4
 AWS_SSH_KEY_NAME=oregon
 
-AWS_INSTANCE_IMAGE_ID=ami-cd2133fd
-AWS_INSTANCE_IMAGE_NAME=beta-build-run-dock-1.2.1b3
+AWS_INSTANCE_IMAGE_ID=ami-fb8b93cb
+AWS_INSTANCE_IMAGE_NAME=beta-build-run-dock-2.0.2
 
 AWS_INSTANCE_TYPE=t2.small
 CLUSTER_INITIAL_DOCKS=2

lib/providers/aws.js

@@ -88,14 +88,18 @@ AWSProvider.prototype.getUserDataScript = function (cluster) {
     sauron_version: process.env.SAURON_VERSION,
     image_builder_version: process.env.IMAGE_BUILDER_VERSION,
     docker_listener_version: process.env.DOCKER_LISTENER_VERSION,
+    charon_version: process.env.CHARON_VERSION,
     node_env: process.env.NODE_ENV,
     redis_port: process.env.REDIS_PORT,
     redis_ipaddress: process.env.REDIS_IPADDRESS,
     rabbitmq_hostname: process.env.RABBITMQ_HOSTNAME,
     rabbitmq_port: process.env.RABBITMQ_PORT,
     rabbitmq_username: process.env.RABBITMQ_USERNAME,
     rabbitmq_password: process.env.RABBITMQ_PASSWORD,
-    registry_host: process.env.REGISTRY_HOST
+    registry_host: process.env.REGISTRY_HOST,
+    api_host: process.env.API_HOST,
+    datadog_host: process.env.DATADOG_HOST,
+    datadog_port: process.env.DATADOG_PORT
   });
 };
 

scripts/aws-instance-user-data.sh

@@ -11,13 +11,17 @@ RABBITMQ_PORT_PATH=/opt/runnable/rabbitmq_port
 RABBITMQ_USERNAME_PATH=/opt/runnable/rabbitmq_username
 RABBITMQ_PASSWORD_PATH=/opt/runnable/rabbitmq_password
 REGISTRY_HOST_PATH=/opt/runnable/registry_host
+API_HOST_PATH=/opt/runnable/api_host
+DATADOG_HOST_PATH=/opt/runnable/datadog_host
+DATADOG_PORT_PATH=/opt/runnable/datadog_port
 
 # Set preferred versions of each of the dock services
 echo 'export FILIBUSTER_VERSION={{filibuster_version}}' >> $ENV_FILE
 echo 'export KRAIN_VERSION={{krain_version}}' >> $ENV_FILE
 echo 'export SAURON_VERSION={{sauron_version}}' >> $ENV_FILE
 echo 'export IMAGE_BUILDER_VERSION={{image_builder_version}}' >> $ENV_FILE
 echo 'export DOCKER_LISTENER_VERSION={{docker_listener_version}}' >> $ENV_FILE
+echo 'export CHARON_VERSION={{charon_version}}' >> $ENV_FILE
 
 # Set the host tags file (used by upstart for docker-listener)
 echo '{{host_tags}}' > $HOST_TAGS_FILE
@@ -38,5 +42,12 @@ echo '{{rabbitmq_password}}' > $RABBITMQ_PASSWORD_PATH
 # Set the registry ip
 echo '{{registry_host}}' > $REGISTRY_HOST_PATH
 
+# Set the API Host
+echo '{{api_host}}' > $API_HOST_PATH
+
+# Set datadog variables
+echo '{{datadog_host}}' > $DATADOG_HOST_PATH
+echo '{{datadog_port}}' > $DATADOG_PORT_PATH
+
 # Initialize the dock
 bash $DOCK_INIT_SCRIPT

test/unit/providers/aws.js

@@ -278,6 +278,42 @@ describe('providers', function() {
           .to.equal(expectedVariable);
         done();
       });
+
+      it('should set the correct charon_version', function(done) {
+        var variableName = 'charon_version';
+        var expectedVariable = process.env.CHARON_VERSION;
+        aws.getUserDataScript(cluster);
+        expect(Mustache.render.firstCall.args[1][variableName])
+          .to.equal(expectedVariable);
+        done();
+      });
+
+      it('should set the correct api_host', function(done) {
+        var variableName = 'api_host';
+        var expectedVariable = process.env.API_HOST;
+        aws.getUserDataScript(cluster);
+        expect(Mustache.render.firstCall.args[1][variableName])
+          .to.equal(expectedVariable);
+        done();
+      });
+
+      it('should set the correct datadog_host', function(done) {
+        var variableName = 'datadog_host';
+        var expectedVariable = process.env.DATADOG_HOST;
+        aws.getUserDataScript(cluster);
+        expect(Mustache.render.firstCall.args[1][variableName])
+          .to.equal(expectedVariable);
+        done();
+      });
+
+      it('should set the correct datadog_port', function(done) {
+        var variableName = 'datadog_port';
+        var expectedVariable = process.env.DATADOG_PORT;
+        aws.getUserDataScript(cluster);
+        expect(Mustache.render.firstCall.args[1][variableName])
+          .to.equal(expectedVariable);
+        done();
+      });
     }); // end 'getUserDataScript'
 
     describe('waitFor', function() {