cfndsl 0.11.1 → 0.11.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2M3MmIxMWQyMTcxZjhhODJhYmYzZWM1OTdjZGM0ZmM3MGRlNzMyMQ==
+    NDEyMTg0ZmVkZjIxYjk2MjAxOGM0MDZiM2E2MDhlMTViYWYyOTMxZg==
   data.tar.gz: !binary |-
-    MDU1ODE0NTk4OWM2NjIzZWZjMGQ4NDczN2NkOWZhMDUzMjkxNWZkYQ==
+    ZTY2MjdlMjY4N2VjMjMyNmYwNTk3NDM2ZjljY2MwN2MzMTliZjQ3MA==
 SHA512:
   metadata.gz: !binary |-
-    MzEwMGE0Y2RmZmMyNzhkNjM2MjVkMGQ3MjkxNDcyMDQyZmNlMThhZjIyYjkz
-    MzBlZWVjYzllMTRjNDNkYmIzOWU5OTViNjI2ZjI5NWI4M2FhYTg0ZGM1MWEz
-    MTAyY2ViYjI4MDMyZDYzMzdkZWZkZDRkZTgxYmJlMjBhN2RkNmY=
+    OWZiZDEzZGUyNWQ3MzdmZGIyZWUwODc5MmM1OTdhNjJiNjI4YWE4YTgwNTE0
+    OTIyY2EwYjllNjgyMDJmMWY1ZWY2NmI5NmNlMThlNGZhMjlhYzQxYzUxM2I4
+    YmUwZjczZjBkYzNhZTYyYWU1ZmVjMzY2MDVhOTJiN2ZkNzE0ODU=
   data.tar.gz: !binary |-
-    MDc3MTRiOWZkNzk0MDFiYzQ5YmU0YjBjNmVjYzYwZGRjNTIxZDUxOWY0ZTUx
-    NzA1NjNlN2ZmMjgzY2JjYjY0NGEwN2VmMGExZmUwYjNhNmE1OWVmNzJiZjU1
-    MWFjOGU4N2E2NTg5Y2FmOWM3YWJiNjk1YTZmZmEzOGExZDBmMDI=
+    MTI5Mjk2OTJmMDRiZGVjY2E3YmFiNmEzNDFkZDUxNzhiNjBiZTFlNTllZDhl
+    NmZiN2Q1MjI1NTVhNWMxNDkwMzNlNDBjZTgxNWUzNDYxYjJiOTRkNDgwZjIy
+    ZDNkOTZkYTFmOTE2N2MxNzJkZjFlOGMwMjIxNTkyMTJiNzA2YjI=

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 tmp/
 coverage/
+*.swp
+*.swo

data/bin/cfndsl

@@ -7,6 +7,7 @@ require 'json'
 options = {}
 
 optparse = OptionParser.new do |opts|
+  Version = CfnDsl::VERSION
   opts.banner = 'Usage: cfndsl [options] FILE'
 
   # Define the options, and what they do

data/lib/cfndsl.rb

@@ -16,6 +16,7 @@ require 'cfndsl/outputs'
 require 'cfndsl/aws/cloud_formation_template'
 require 'cfndsl/os/heat_template'
 require 'cfndsl/external_parameters'
+require 'cfndsl/version'
 
 # CfnDsl
 module CfnDsl

data/lib/cfndsl/aws/types.yaml

@@ -544,6 +544,7 @@ Resources:
     VersionLabel: String
   "AWS::ElasticLoadBalancing::LoadBalancer" :
    Properties:
+    AccessLoggingPolicy: AccessLoggingPolicy
     AvailabilityZones: [String]
     CrossZone: Boolean
     HealthCheck: HealthCheck
@@ -610,6 +611,7 @@ Resources:
     AdvancedOptions: JSON
     DomainName: String
     EBSOptions: EBSOptions
+    ElasticsearchVersion: String
     ElasticsearchClusterConfig: ElasticsearchClusterConfig
     SnapshotOptions: SnapshotOptions
     Tags: [ ResourceTag ]
@@ -1149,6 +1151,11 @@ Types:
  AppCookieStickinessPolicy:
   CookieName: String
   PolicyName: String
+ AccessLoggingPolicy:
+  EmitInterval: Integer
+  Enabled: Boolean
+  S3BucketName: String
+  S3BucketPrefix: String
  HealthCheck:
   HealthyThreshold: String
   Interval: String

data/lib/cfndsl/conditions.rb

@@ -4,7 +4,7 @@ module CfnDsl
   # Handles condition objects
   #
   # Usage:
-  #     Condition :ConditionName, FnEqual(Ref(:ParameterName), 'helloworld')
+  #     Condition :ConditionName, FnEquals(Ref(:ParameterName), 'helloworld')
   class ConditionDefinition < JSONable
     include JSONSerialisableObject
 

data/lib/cfndsl/external_parameters.rb

@@ -53,7 +53,7 @@ module CfnDsl
       when /ya?ml/
         params = YAML.load_file fname
       when /json/
-        params = JSON.load File.read(fname)
+        params = JSON.parse File.read(fname)
       else
         raise "Unrecognized extension #{format}"
       end

data/lib/cfndsl/jsonable.rb

@@ -56,7 +56,11 @@ module CfnDsl
 
     # Equivalent to the Cloudformation template built in function Fn::Not
     def FnNot(value)
-      Fn.new('Not', value)
+      if value.is_a?(Array)
+        Fn.new('Not', value)
+      else
+        Fn.new('Not', [value])
+      end
     end
 
     # Equivalent to the CloudFormation template built in function Fn::Or

data/lib/cfndsl/orchestration_template.rb

@@ -76,17 +76,16 @@ module CfnDsl
 
         sname = CfnDsl::Plurals.singularize pname
 
-        unless sname == pname
-          resource.class_eval do
-            CfnDsl.method_names(sname) do |method|
-              define_method(method) do |value = nil, &block|
-                @Properties ||= {}
-                @Properties[pname] ||= PropertyDefinition.new([])
-                value = pclass.new unless value
-                @Properties[pname].value.push value
-                value.instance_eval(&block) if block
-                value
-              end
+        return if sname == pname
+        resource.class_eval do
+          CfnDsl.method_names(sname) do |method|
+            define_method(method) do |value = nil, &block|
+              @Properties ||= {}
+              @Properties[pname] ||= PropertyDefinition.new([])
+              value = pclass.new unless value
+              @Properties[pname].value.push value
+              value.instance_eval(&block) if block
+              value
             end
           end
         end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.3'.freeze
 end

data/spec/cfndsl_spec.rb

@@ -154,6 +154,20 @@ describe CfnDsl::CloudFormationTemplate do
       expect(func.to_json).to eq('{"Fn::GetAZs":"reg"}')
     end
 
+    context 'FnNot', 'Array' do
+      it 'FnNot' do
+        func = subject.FnNot(['foo'])
+        expect(func.to_json).to eq('{"Fn::Not":["foo"]}')
+      end
+    end
+
+    context 'FnNot', 'String' do
+      it 'FnNot' do
+        func = subject.FnNot('foo')
+        expect(func.to_json).to eq('{"Fn::Not":["foo"]}')
+      end
+    end
+
     context 'FnFormat', 'String' do
       it 'formats correctly' do
         func = subject.FnFormat('abc%0def%1ghi%%x', 'A', 'B')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler