Merge branch 'master' into dev

Author: mtwomey

deploy.sh

@@ -45,6 +45,8 @@ TC_ADMIN_TOKEN=$(eval "echo \$${ENV}_TC_ADMIN_TOKEN")
 LOG_LEVEL=$(eval "echo \$${ENV}_LOG_LEVEL")
 PORT=$(eval "echo \$${ENV}_PORT")
 
+TC_API_V3_BASE_URL=$(eval "echo \$${ENV}_TC_API_V3_BASE_URL")
+TC_API_V4_BASE_URL=$(eval "echo \$${ENV}_TC_API_V4_BASE_URL")
 
 DB_USER=$(eval "echo \$${ENV}_DB_USER")
 DB_PASSWORD=$(eval "echo \$${ENV}_DB_PASSWORD")
@@ -147,6 +149,14 @@ make_task_def(){
 								"name": "TC_API_BASE_URL",
 								"value": "%s"
 						},
+						{
+								"name": "TC_API_V3_BASE_URL",
+								"value": "%s"
+						},
+						{
+								"name": "TC_API_V4_BASE_URL",
+								"value": "%s"
+						},
 						{
 								"name": "TC_ADMIN_TOKEN",
 								"value": "%s"
@@ -181,9 +191,8 @@ make_task_def(){
 				}
 		}
 	]'
-	
-	#task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_TOPIC_IGNORE_PREFIX $KAFKA_URL $DATABASE_URL $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
-	task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_TOPIC_IGNORE_PREFIX $KAFKA_URL $DATABASE_URL $AUTHSECRET "$AUTHDOMAIN" "$JWKSURI" $TC_API_BASE_URL $TC_ADMIN_TOKEN $LOG_LEVEL $VALID_ISSUERS $PORT $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
+
+	task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID "$KAFKA_TOPIC_IGNORE_PREFIX" $KAFKA_URL $DATABASE_URL $AUTHSECRET "$AUTHDOMAIN" "$JWKSURI" $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_ADMIN_TOKEN $LOG_LEVEL $VALID_ISSUERS $PORT $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
 }
 
 register_definition() {