Merge pull request #26 from Guslington/develop

create config tests, replace az function with list of subnetIds parameter

.travis.yml

@@ -1,6 +1,11 @@
+
 language: ruby
 rvm:
-  - 2.3
+  - 2.5
+install:
+  - gem install cfhighlander cfn-nag
+before_script:
+  - cfndsl -u 2.21.0
 script:
-  - gem install cfhighlander --prerelease
-  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then cfhighlander cfcompile ; else cfhighlander cfcompile --validate; fi
+  - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then cfhighlander cftest --no-validate; else cfhighlander cftest; fi
+  - cfn_nag_scan -i out/tests

ecs-service.cfhighlander.rb

@@ -1,6 +1,6 @@
 CfhighlanderTemplate do
 
-  DependsOn 'vpc@1.2.0' if ((defined? network_mode) && (network_mode == "awsvpc"))
+  DependsOn 'vpc' if ((defined? network_mode) && (network_mode == "awsvpc"))
 
   Description "ecs-service - #{component_name} - #{component_version}"
 
@@ -27,9 +27,7 @@
     ComponentParam 'EnableScaling', 'false', allowedValues: ['true','false']
 
     if ((defined? network_mode) && (network_mode == "awsvpc"))
-      maximum_availability_zones.times do |az|
-        ComponentParam "SubnetCompute#{az}"
-      end
+      ComponentParam 'SubnetIds', type: 'CommaDelimitedList'
       ComponentParam 'SecurityGroupBackplane'
     end
 

ecs-service.cfndsl.rb

@@ -5,10 +5,6 @@
     awsvpc_enabled = true
   end
 
-  if awsvpc_enabled
-    az_conditions_resources('SubnetCompute', maximum_availability_zones)
-  end
-
   Condition('IsScalingEnabled', FnEquals(Ref('EnableScaling'), 'true'))
 
   log_retention = 7 unless defined?(log_retention)
@@ -340,7 +336,7 @@
         AwsvpcConfiguration: {
           AssignPublicIp: "DISABLED",
           SecurityGroups: [ Ref(sg_name) ],
-          Subnets: az_conditional_resources('SubnetCompute', maximum_availability_zones)
+          Subnets: Ref('SubnetIds')
         }
       })
     end

tests/default.test.yaml

@@ -0,0 +1,4 @@
+test_metadata:
+  type: config
+  name: default
+  description: test with default config

tests/nginx-service.test.yaml

@@ -0,0 +1,19 @@
+test_metadata:
+  type: config
+  name: nginx
+  description: create a nginx ecs service with a targetgroup
+
+task_definition:
+  nginx:
+    repo: nginx
+    image: nginx
+
+targetgroup:
+  name: nginx
+  container: nginx
+  port: 80
+  protocol: http
+  listener: http
+  healthcheck:
+    path: /
+    code: 200