cfndsl 0.7.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzBmYTE1Y2U0ZDJkZmY4OTg4MDI1NmIyMjQ0NTZiOGYxMzFmMjZhMg==
+    YWZmZjY5YzJjYTMwYzgyMGI4ODViNGViNTNiNjUxMWYwMzZmZTI3Nw==
   data.tar.gz: !binary |-
-    MDgxYTVlNGExMDY5NGEwNzU1MDYzODVkYWMyMjdjYmUyYWIwYzNhMQ==
+    YjM0NDk0NzYxY2IzODc4NDdhMDJjYWJkMzUyZWU1OWJiOTJkMTc4Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZTE0ZTcwNDNmMjRiZWFhOTQ0NTZhY2VhNjU5ZmJhMTBlZDY1NDg2ZjhlOTI3
-    M2U3ODU2Njk2YzY1NWVjYWQwOWFhNDk5YzE0N2EzMjY2ZDQxOWRkM2Q1Mzdk
-    OTY0ZTY5YTBjMmY3NTc0Yzk0MDMwNmU2ODllNTJkMzMzZWMyMzA=
+    MzM4Y2YwNzczMWYxNTA5NWRmYzI4ODFkMTNjOWNmMjkzNWY4M2MzZjllMmU4
+    ZjYwZTMwODE4YmFkODZlYjJmOWU5OWY0Njc5OThmZjkyZmIyNjQ2OTY2ZjY3
+    YjA2MDM5M2MyYjI5ZWI5NzM0Mzc4ODE1OWIwMGM4OGVlMjNiMzc=
   data.tar.gz: !binary |-
-    YjhlM2NiYThlMGZkMmI5YzY0ZDg2ZTIzNjFmNWMxMjA3NzFmY2ZhMjdjZDVl
-    ZWJlMDVhNzkwZjA4MjdmNWM1NzhmOTQxZDU3NTM1ZTdiNzBhMWE4NTQwZTAx
-    MGUyY2NmZDA5MWZhMTMxMmM5MDA2OGZmNzlmMjQxMGJkMjk1ZmM=
+    YjgwNzk4MmU5MTAyOWIxNTc4OGE1YzU1MzVmMGEwYzNjZGVlMWRiNTI5MDdm
+    MjhjOTJmMjc3YzhjNGExMWMyN2IyZDA5MWNiMWRhZTIyMzljZDg0NTk0NzAw
+    MWM2MDZlN2E2ZmEwMDAzODNkMTdkY2MzM2IzY2FlMTkzZTc1NjU=

data/lib/cfndsl/aws/types.yaml

@@ -482,6 +482,15 @@ Resources:
     ElasticsearchClusterConfig: ElasticsearchClusterConfig
     SnapshotOptions: SnapshotOptions
     Tags: [ EC2Tag ]
+  "AWS::Events::Rule" :
+    Properties:
+      Description: String
+      EventPattern: JSON
+      Name: String
+      RoleArn: String
+      SchduleExpression: String
+      State: String
+      Targets: [ EventsRuleTarget ]
   "AWS::IAM::AccessKey" :
    Properties:
     Serial: Integer
@@ -751,6 +760,7 @@ Resources:
   "AWS::Route53::HealthCheck" :
    Properties:
     HealthCheckConfig: Route53HealthCheckConfig
+    HealthCheckTags: [ Route53HealthCheckTags ]
   "AWS::Route53::RecordSet" :
    Properties:
     HostedZoneId: String
@@ -1085,6 +1095,9 @@ Types:
    ResourcePath: String
    SearchString: String
    Type: String
+ Route53HealthCheckTags:
+   Key: String
+   Value: String
  VpcSettings:
    SubnetIds: [ String ]
    VpcId: String
@@ -1212,3 +1225,8 @@ Types:
  VpcConfig:
    SecurityGroupIds: [ String ]
    SubnetIds: [ String ]
+ EventsRuleTarget:
+   Arn: String
+   Id: String
+   Input: String
+   InputPath: String

data/lib/cfndsl/conditions.rb

@@ -6,12 +6,10 @@ module CfnDsl
   # Usage:
   #     Condition :ConditionName, FnEqual(Ref(:ParameterName), 'helloworld')
   class ConditionDefinition < JSONable
+    include JSONSerialisableObject
+
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/creation_policy.rb

@@ -8,14 +8,12 @@ module CfnDsl
   #     CreationPolicy('ResourceSignal', { 'Count' => 1,  'Timeout' => 'PT10M' })
   #   }
   class CreationPolicyDefinition < JSONable
+    include JSONSerialisableObject
+
     attr_reader :value
 
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/json_serialisable_object.rb

@@ -0,0 +1,12 @@
+module CfnDsl
+  # JSONSerialisableObject
+  module JSONSerialisableObject
+    def as_json(_options = {})
+      @value
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
+    end
+  end
+end

data/lib/cfndsl/jsonable.rb

@@ -1,5 +1,6 @@
 require 'cfndsl/errors'
 require 'cfndsl/ref_check'
+require 'cfndsl/json_serialisable_object'
 
 module CfnDsl
   # These functions are available anywhere inside
@@ -134,7 +135,7 @@ module CfnDsl
     # variables that begin with a single underscore are elided.
     # Instance variables that begin with two underscores have one of
     # them removed.
-    def to_json(*a)
+    def as_json(_options = {})
       hash = {}
       instance_variables.each do |var|
         name = var[1..-1]
@@ -149,7 +150,11 @@ module CfnDsl
 
         hash[name] = instance_variable_get(var) if name
       end
-      hash.to_json(*a)
+      hash
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
     end
 
     def ref_children
@@ -186,10 +191,14 @@ module CfnDsl
       @_refs = refs
     end
 
-    def to_json(*a)
+    def as_json(_options = {})
       hash = {}
       hash["Fn::#{@function}"] = @argument
-      hash.to_json(*a)
+      hash
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
     end
 
     def references

data/lib/cfndsl/mappings.rb

@@ -12,12 +12,10 @@ module CfnDsl
   #               "ap-northeast-1" => { "32" => "ami-9c03a89d", "64" => "ami-a003a8a1" }
   #    })
   class MappingDefinition < JSONable
+    include JSONSerialisableObject
+
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/metadata.rb

@@ -3,14 +3,12 @@ require 'cfndsl/jsonable'
 module CfnDsl
   # Handles Metadata objects
   class MetadataDefinition < JSONable
+    include JSONSerialisableObject
+
     attr_reader :value
 
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/properties.rb

@@ -9,13 +9,12 @@ module CfnDsl
   #   }
   #
   class PropertyDefinition < JSONable
+    include JSONSerialisableObject
+
     attr_reader :value
+
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/update_policy.rb

@@ -13,13 +13,12 @@ module CfnDsl
   #   }
   #
   class UpdatePolicyDefinition < JSONable
+    include JSONSerialisableObject
+
     attr_reader :value
+
     def initialize(value)
       @value = value
     end
-
-    def to_json(*a)
-      @value.to_json(*a)
-    end
   end
 end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Steven Jack
@@ -52,6 +52,7 @@ files:
 - lib/cfndsl/errors.rb
 - lib/cfndsl/external_parameters.rb
 - lib/cfndsl/generate_types.rb
+- lib/cfndsl/json_serialisable_object.rb
 - lib/cfndsl/jsonable.rb
 - lib/cfndsl/mappings.rb
 - lib/cfndsl/metadata.rb