cfndsl 0.1.17 → 0.1.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU3YmUxZDJhYTg1YWNjNmE5MWE5OWY3NDBiNzM5NjNhMTMxYmM4Mw==
+    NDZhMzRmZTA1MjIwNTE1Y2Y3NDE4N2EyYjBmNDVkNDFkMWMxMDBkOQ==
   data.tar.gz: !binary |-
-    OGM0MGQ3ZjY4YzllMDFiMGM2N2ZjNWNhZDhkN2U2OTVjY2QwYjhjMQ==
+    MzE3ZmUzN2FkNjQwNGI1ZmNhZmUyNWU2OWI5MzY2MTBlYmM1Njk4OA==
 SHA512:
   metadata.gz: !binary |-
-    ZmUwNTYyZmY0NjM4YWJmYzdhZmY2ZmVjNThmOTZhZTc0OGZjZDRmZmZjMzE5
-    N2UyNzg2NmM0MTJjZGUzMDNmMTc4YTk0ZmYxMjViMWY5MGQ0ZTI4ZDIzZmU2
-    MGNiZWU5Y2QxNWJlZmEyMTY3ZjMzNGQxYzBlYWFmOWNjNDlmMjE=
+    NzA2YjllYmJlNzhhYWFhOWY1ZjE0YThkZDlmMzNhODIwMGE5NTI5MzU1NGNh
+    ZTEwM2EyMjA0ZTkwMGE4ODkzMzA4ZmRjODM1NDk4MTI5NGFmOGRmYWYzMjI1
+    NTk4NDM3YjQ0N2M1M2E2ZTg1M2ZiZGI0NGE1MTkxYzM5Njc1NmM=
   data.tar.gz: !binary |-
-    ZTczZDA1NTAzNDUyNDIwNGYxY2M4YjcxMjI3OWE1Mzc5YzQwNTM2MGQ3MjNi
-    ZWZiMWM0Y2ZhMWRkMGI4NGU2MDE5NDUyNDU0YjljYTQyNWNhY2JlNjU5Y2Qy
-    MDM1OWRkMTBlMTUxZDFiNzQ2NjU1NDQxNDYxMWNmNWQ2YmM4MjE=
+    YmMxYmI5ZGNkYjZmNjQ0NTY2NDU5NTI5M2M4Mzk1MWMzMGNjMzQ5MDgxNDYw
+    YmI2YTE0ZDJiYjc2MTRmY2U0MzA4NGQ3NGYxOTE2MTQ2ZWE2NTA0OTk2ZTBm
+    YmJmNjRkZWM0YjM5Y2ZjMWM2ZTBjNmM3ZTlmMzNiNjQ4ZTc2NjM=

data/Rakefile

@@ -12,7 +12,7 @@ task :bump, :type do |t, args|
 
   fail unless %w(major minor patch).include? type
 
-  if `git rev-parse --abbrev-ref HEAD` != "master"
+  if `git rev-parse --abbrev-ref HEAD`.strip != "master"
     fail "Looks like you're trying to create a release in a branch, you can only create one in 'master'"
   end
 

data/lib/cfndsl/aws_types.yaml

@@ -642,6 +642,19 @@ Resources:
     Attributes:
      Arn: String
      QueueName: String
+  "AWS::ECS::Cluster" :
+   Properties: {}
+  "AWS::ECS::Service" :
+   Properties:
+    Cluster: String
+    DesiredCount: Integer
+    LoadBalancers: [ ECSLoadBalancer ]
+    Role: String
+    TaskDefinition: String
+  "AWS::ECS::TaskDefinition" :
+   Properties:
+    ContainerDefinitions: [ ECSContainerDefinition ]
+    Volumes: [ ECSVolume ]
 
 Types:
  String:  String
@@ -863,3 +876,38 @@ Types:
    LoadBalancerPorts: [ String ]
    PolicyName: String
    PolicyType: String
+ ECSHost:
+   SourcePath: String
+ ECSEnvironmentVariable:
+   Name: String
+   Value: String
+ ECSMountPoint:
+   ContainerPath: String
+   SourceVolume: String
+   ReadOnly: Boolean
+ ECSPortMap:
+   ContainerPort: Integer
+   HostPort: Integer
+ ECSVolumeFrom:
+   SourceContainer: String
+   ReadOnly: Boolean
+ ECSLoadBalancer:
+   ContainerName: String
+   ContainerPort: Integer
+   LoadBalancerName: String
+ ECSContainerDefinition:
+   Command: [ String ]
+   Cpu: Integer
+   EntryPoint: [ String ]
+   Environment: [ ECSEnvironmentVariable ]
+   Essential: Boolean
+   Image: String
+   Links: [ String ]
+   Memory: Integer
+   MountPoints: [ ECSMountPoint ]
+   Name: String
+   PortMappings: [ ECSPortMap ]
+   VolumesFrom: [ ECSVolumeFrom ]
+ ECSVolume:
+   Name: String
+   Host: ECSHost

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

data/sample/ecs.rb

@@ -0,0 +1,51 @@
+CloudFormation {
+  DESCRIPTION ||= "ecs description"
+
+  Description DESCRIPTION
+
+  Resource('MyECSCluster') {
+    Type 'AWS::ECS::Cluster'
+  }
+
+  Resource('MyTaskDef') {
+    Type 'AWS::ECS::Service'
+    Property('ContainerDefinitions', [
+      {
+        Command: ['echo hello'],
+        Cpu: 300,
+        EntryPoint: ['/bin/bash'],
+        Environment: [{
+          Name: 'test',
+          Value: 'testvalue'
+        }],
+        Essential: true,
+        Image: 'ubuntu:latest',
+        Links: ['myothercontainer'],
+        Memory: 1024,
+        MountPoints: [{
+          ContainerPath: '/var/log',
+          SourceVolume: 'log_volume',
+          ReadOnly: false
+        }],
+        Name: 'MyTaskDef',
+        PortMappings: [{
+          ContainerPort: 80,
+          HostPort: 8080
+        }],
+        VolumesFrom: [{
+          SourceContainer: 'myothercontainer',
+          ReadOnly: true
+        }]
+
+      }
+    ])
+  }
+
+  Resource('MyECSService') {
+    Type 'AWS::ECS::Service'
+    Property('Cluster', Ref('MyECSCluster'))
+    Property('DesiredCount', 10)
+    Property('Role', 'ecsServiceRole')
+    Property('TaskDefinition', 'MyTask:1')
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Steven Jack
@@ -67,6 +67,7 @@ files:
 - sample/autoscale.template
 - sample/autoscale2.rb
 - sample/circular.rb
+- sample/ecs.rb
 - sample/t1.rb
 - sample/t1.yaml
 - sample/vpc-example.rb