cfndsl 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQyZDBlNzMzYWU2OGNiOWY3NWU2ZjhlYzVmYzBhZTIwYjdiNjZjMw==
+    YmEzYWFkNWUxNGEwYzE5MDFkYTczOWUzNTk4NDIyZmE0ODM3NTI0Nw==
   data.tar.gz: !binary |-
-    Yzc4MzM2MjkzYzI1MTllYzIxNzFlZmE4NGIzNDdkYWM3OTU3N2NjNw==
+    YTZlMzMxMmQ0NGQ2NjM4NjdjNDRmMmM1NzA3NDZiNTYzOTM0MzZjOA==
 SHA512:
   metadata.gz: !binary |-
-    NmI1MzdiMTg2ODFhYTE0ZDVmMDA4OWM4NGQyYWIwNTAzYWExZmVmZjYxNTli
-    NDZmZDlhYmJkNzhlNmIxMDM0Y2ZjNzIxZmJiODk0ZTQ3ZjBhZGRjMTE4ODY1
-    ZTgxNzU1NTFjMWYzNzE3OTJjOGM4MjNjM2JmYTAwYjA3MTc4OTA=
+    ZGIzZWZiZjFiMDdlMTAwNzdjYzk5NGQ0N2VjZTQ2NDQxNTQ0OGM4NTMyMGIy
+    MDA0ZDA4MTI5MTRjZGE2OGNhMmFlZjAxNmY5ZWY4OGZkZTI4MzRkNWIzMWJh
+    NjgzZGYyODczNzdiMWEzY2RhMWFhMTVkMThmZWJmZjhlMDQwNGE=
   data.tar.gz: !binary |-
-    NTgzZTQ5OWIxYTM4YTVlNTc2MzhlNDVjMDM5YTE3M2MxZjY5NDkxNTRiOWJi
-    OTAzZDVmN2M1NWU1MWFiMjE2NDI3OTVjZDYxNWQzZjdmN2E1MGE3MTgwYzI5
-    NmQ2MDE1ZGY2YjAyMTMwMDU0ZDllNGYwZmI3MTQ3NDgxOWIzOTI=
+    MjRiNDFjZDFhNDA0ZmU0NDAwYjY1ZTAxNjQxNzhlMDAzYjc5MzA0ZDg3NWJh
+    YzUyNmQ3MmZjYWIzZmQ5M2EzOWNiNjA3MTU3NTM2NDNiYTQwYzZlYTU0MDQy
+    NWYxNzcxNWM2M2YwZDMyNDY0NDZhNjZhMjA2MThhZjA4MDlkYTc=

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'json'
+
 group :test do
   gem 'rake'
   gem 'rspec'

data/README.md

@@ -125,7 +125,7 @@ template
 CloudFormation {
 
   DESCRIPTION ||= "default description"
-  MACHINES ||= 3
+  MACHINES ||= 1
 
   Description DESCRIPTION
 

data/lib/cfndsl/CloudFormationTemplate.rb

@@ -90,7 +90,7 @@ module CfnDsl
                   values.push create_klass.new
                 end
                 @Properties ||= {}
-                @Properties[pname] ||= CfnDsl::PropertyDefinition.new( *values )
+                @Properties[pname] = CfnDsl::PropertyDefinition.new( *values )
                 @Properties[pname].value.instance_eval &block if block
                 @Properties[pname].value
               end
@@ -192,7 +192,7 @@ module CfnDsl
                   values.push create_klass.new
                 end
                 @Properties ||= {}
-                @Properties[pname] ||= CfnDsl::PropertyDefinition.new( *values )
+                @Properties[pname] = CfnDsl::PropertyDefinition.new( *values )
                 @Properties[pname].value.instance_eval &block if block
                 @Properties[pname].value
               end

data/lib/cfndsl/Types.rb

@@ -86,7 +86,7 @@ module CfnDsl
                     val = klass.new
                     existing.push val
                     value.instance_eval &block(val)
-                    return existin
+                    return existing
                   end
                      
                   # Glue all of our parameters together into

data/lib/cfndsl/aws_types.yaml

@@ -660,6 +660,7 @@ Resources:
     BucketName: String
     AccessControl: String
     LifecycleConfiguration: JSON
+    NotificationConfiguration: S3NotificationConfiguration
     VersioningConfiguration: JSON
     WebsiteConfiguration: JSON
     Tags: [ EC2Tag ]
@@ -1006,3 +1007,17 @@ Types:
    Key: String
    Type: String
    Value: String
+ S3NotificationConfiguration:
+   LambdaConfigurations: [ S3NotificationLambdaConfiguration ]
+   QueueConfigurations: [ S3NotificationQueueConfiguration ]
+   TopicConfigurations: [ S3NotificationTopicConfiguration ]
+ S3NotificationLambdaConfiguration:
+   Event: String
+   Function: String
+ S3NotificationQueueConfiguration:
+   Event: String
+   Queue: String
+ S3NotificationTopicConfiguration:
+   Event: String
+   Topic: String
+   

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/sample/s3.rb

@@ -0,0 +1,46 @@
+CloudFormation {
+  S3_Bucket('Bucket') {
+    BucketName 'MyBucket'
+    VersioningConfiguration(Status: 'Enabled')
+    NotificationConfiguration(
+      LambdaConfigurations: [ 
+        {
+          Function: 'MyLambdaFunction',
+          Event: 'S3:ObjectCreated:*'
+        },
+        {
+          Function: 'MyLambdaFunction',
+          Event: 's3:ObjectRemoved:*'
+        }
+      ],
+      QueueConfigurations: [ 
+        {
+          Queue: 'SQSQueue',
+          Event: 'S3:ObjectCreated:*'
+        }
+      ],
+      TopicConfigurations: [ 
+        {
+          Topic: 'SNSTopic',
+          Event: 'S3:ObjectCreated:*'
+        }
+      ]
+    )
+    WebsiteConfiguration(
+      ErrorDocument: 'error.htm',
+      IndexDocument: 'index.htm',
+      RoutingRules: [
+        {
+          RoutingRuleCondition: {
+            HttpErrorCodeReturnedEquals: "404",
+            KeyPrefixEquals: "out1/"
+          },
+          RedirectRule: {
+            HostName: "ec2-11-22-333-44.compute-1.amazonaws.com",
+            ReplaceKeyPrefixWith: "report-404/"
+          }
+        }
+      ]
+    )
+  }
+}

data/spec/cfndsl_spec.rb

@@ -1,5 +1,19 @@
 require 'spec_helper'
 
+describe CfnDsl::HeatTemplate do
+  it 'honors last-set value for non-array properties' do
+    spec = self
+    subject.declare do
+      Server('myserver') do
+        flavor 'foo'
+        flavor 'bar'
+        f = @Properties['flavor'].value
+        spec.expect(f).to spec.eq('bar')
+      end
+    end
+  end
+end
+
 describe CfnDsl::CloudFormationTemplate do
 
   it 'populates an empty template' do
@@ -82,6 +96,18 @@ describe CfnDsl::CloudFormationTemplate do
     end
   end
 
+  it 'honors last-set value for non-array properties' do
+    spec = self
+    subject.declare do
+      EC2_Instance('myserver') do
+        InstanceType 'foo'
+        InstanceType 'bar'
+        f = @Properties['InstanceType'].value
+        spec.expect(f).to spec.eq('bar')
+      end
+    end
+  end
+
   context 'built-in functions' do
     it 'FnGetAtt' do
       func = subject.FnGetAtt('A', 'B')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - sample/circular.rb
 - sample/codedeploy.rb
 - sample/ecs.rb
+- sample/s3.rb
 - sample/t1.rb
 - sample/t1.yaml
 - sample/vpc-example.rb