cfndsl 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9249a9d31e7834cc88e725fefd07df25c4a4a59dfcb8c9a5e68924fa19443bb
-  data.tar.gz: c74e4fbd7a36fbdf7e09a1aa10b6e327e6656b999b920537045d6717ae176108
+  metadata.gz: d08e50970be94f664f6e4775cb3367c51a16e8702e6ff023e632b69bd9802ab6
+  data.tar.gz: dc2ed8885d37cc044293a3cc1aa4ee4139a237042bc5722d2f07c78aecba584d
 SHA512:
-  metadata.gz: e169d2badcba3d0ed23f38111ad0d4ffb44a0672c686ee3929fef8bfbda3305e38f920cfccda851e2ddaa3c35f3343cc2ef725ccd98e286d5cb5ed511c35d0db
-  data.tar.gz: 90391665c122cb7c9d8d79243af6cc4ca17303b701b095149a06cf93d91e0271282a820417db46418b714c78c109705314cae89d6172e7ba151c0209c219f63a
+  metadata.gz: 345a8c5bca051ecd484118cbb6ccbb862de0dceac2a9abbf5d314ca288741cd920be05fbe0a76b2331639a03f6e97bc48e2896ca0f3f6b7dc349e5ee862f4934
+  data.tar.gz: ae7442508593ec6bb3cd0957cd3656f6782e31d1487292c5a37bdd703b83aea3c4751b5a5470b630abfc2295b5c181415da5c3066986f772f49851c1b3c957fd

data/.travis.yml

@@ -2,11 +2,10 @@ language: ruby
 rvm:
 - 2.3.3
 sudo: false
-
 deploy:
   provider: rubygems
   api_key:
-    secure: AH+4R+m6U0kmALFYAYEQl2oF/dj1yOnu/M1ZOtWttk+Zjwnw6kFc0hFLbvxdy6uivq1XmMXVa9eXzDPsRjW4ow2g+UuDLxvkvfT45SMmJ5sYQpoiD7AIJnEvMu6TXnmfiRNgM5bHnV3oilNJ8KKCbCFCd+imGRLTkBuhLkhkejA=
+    secure: cIDF27JCirxxg7SXw6R+xxABMwCrrirJiJzljVxb/MdlRyUVaSW8XdZjOVyNgJkCx+vQOX4U+hp+p0xVI/Loh4EXkgbDvu2oGIAn/g1lfWabwKtdkFEviQn4tWvqDcEkxm5Hm6Gs0pFCaurqynMPNbsLVAEIiSw+la8LxEeeQ6I=
   gem: cfndsl
   on:
     tags: true
@@ -14,7 +13,7 @@ deploy:
 notifications:
   email:
     recipients:
-      - dempsey.travis@gmail.com
-      - gergnz@gmail.com
+    - dempsey.travis@gmail.com
+    - gergnz@gmail.com
     on_failure: change
     on_success: never

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
-## [0.17.1](https://github.com/cfndsl/cfndsl/tree/0.17.1) (2019-09-02)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.0...0.17.1)
+## [0.17.2](https://github.com/cfndsl/cfndsl/tree/0.17.2) (2019-09-05)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.1...0.17.2)
+
+**Fixed bugs:**
+
+- update rubygems api key [\#416](https://github.com/cfndsl/cfndsl/pull/416) ([gergnz](https://github.com/gergnz))
+
+**Closed issues:**
+
+- Support for cross-parameter validation rules [\#414](https://github.com/cfndsl/cfndsl/issues/414)
+- Missing patch for Tag support in AWS::IAM::Role and AWS::Serverless::Function  [\#412](https://github.com/cfndsl/cfndsl/issues/412)
+- Access to rubygems [\#391](https://github.com/cfndsl/cfndsl/issues/391)
+
+**Merged pull requests:**
+
+- Added Rules support for cross-parameter validation [\#417](https://github.com/cfndsl/cfndsl/pull/417) ([cmaxwellau](https://github.com/cmaxwellau))
+
+## [v0.17.1](https://github.com/cfndsl/cfndsl/tree/v0.17.1) (2019-09-01)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.0...v0.17.1)
 
 **Fixed bugs:**
 
@@ -327,6 +344,7 @@
 **Merged pull requests:**
 
 - Update AWS::CloudWatch::Alarm with 2 new properties [\#312](https://github.com/cfndsl/cfndsl/pull/312) ([AnominousSign](https://github.com/AnominousSign))
+- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
 
 ## [v0.12.8](https://github.com/cfndsl/cfndsl/tree/v0.12.8) (2017-05-03)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.12.7...v0.12.8)
@@ -483,7 +501,6 @@
 
 - Certificate manager type [\#267](https://github.com/cfndsl/cfndsl/pull/267) ([kornypoet](https://github.com/kornypoet))
 - Add monitoring properties to AWS::RDS::DBInstance [\#266](https://github.com/cfndsl/cfndsl/pull/266) ([mikechau](https://github.com/mikechau))
-- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
 
 ## [v0.11.6](https://github.com/cfndsl/cfndsl/tree/v0.11.6) (2016-10-23)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.11.5...v0.11.6)

data/lib/cfndsl.rb

@@ -15,6 +15,7 @@ require 'cfndsl/creation_policy'
 require 'cfndsl/conditions'
 require 'cfndsl/mappings'
 require 'cfndsl/resources'
+require 'cfndsl/rules'
 require 'cfndsl/parameters'
 require 'cfndsl/outputs'
 require 'cfndsl/patches'

data/lib/cfndsl/globals.rb

@@ -27,6 +27,6 @@ module CfnDsl
   end
 
   def reserved_items
-    %w[Resource Parameter Output].freeze
+    %w[Resource Rule Parameter Output].freeze
   end
 end

data/lib/cfndsl/orchestration_template.rb

@@ -11,7 +11,7 @@ module CfnDsl
   # rubocop:disable Metrics/ClassLength
   class OrchestrationTemplate < JSONable
     dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata, :Transform
-    dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
+    dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping, :Rule
 
     GLOBAL_REFS = {
       'AWS::NotificationARNs' => 1,
@@ -132,7 +132,7 @@ module CfnDsl
     # rubocop:enable Metrics/PerceivedComplexity
 
     def check_refs
-      invalids = check_resource_refs + check_output_refs
+      invalids = check_resource_refs + check_output_refs + check_rule_refs
       invalids unless invalids.empty?
     end
 
@@ -167,6 +167,22 @@ module CfnDsl
       end
       invalids
     end
+
+    def check_rule_refs
+      invalids = []
+      @_rule_refs = {}
+      if @Rules
+        @Rules.each_key do |rule|
+          @_rule_refs[resource.to_s] = @Rules[rule].build_references({})
+        end
+        @_rule_refs.each_key do |origin|
+          @_rule_refs[origin].each_key do |ref|
+            invalids.push "Invalid Reference: Rule #{origin} refers to #{ref}" unless valid_ref?(ref, origin)
+          end
+        end
+      end
+      invalids
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/lib/cfndsl/rules.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'cfndsl/jsonable'
+
+module CfnDsl
+  # Handles Rule objects
+  class RuleDefinition < JSONable
+    dsl_attr_setter :RuleCondition, :Assertions
+
+    def initialize
+      @Assertions = []
+    end
+
+    def Assert(desc, struct)
+      @Assertions.push('Assert' => struct, 'AssertDescription' => desc)
+    end
+
+    def FnContains(list_of_strings, string)
+      Fn.new('Contains', [list_of_strings, string])
+    end
+
+    def FnEachMemberEquals(list_of_strings, string)
+      Fn.new('EachMemberEquals', [list_of_strings, string])
+    end
+
+    def FnEachMemberIn(strings_to_check, strings_to_match)
+      Fn.new('EachMemberIn', [strings_to_check, strings_to_match])
+    end
+
+    def FnRefAll(parameter_type)
+      Fn.new('RefAll', parameter_type)
+    end
+
+    def FnValueOf(parameter_logical_id, attribute)
+      raise 'Cannot use functions within FnValueOf' unless parameter_logical_id.is_a?(String) && attribute.is_a?(String)
+
+      Fn.new('ValueOf', [parameter_logical_id, attribute])
+    end
+
+    def FnValueOfAll(parameter_logical_id, attribute)
+      raise 'Cannot use functions within FnValueOfAll' unless parameter_logical_id.is_a?(String) && attribute.is_a?(String)
+
+      Fn.new('ValueOfAll', [parameter_logical_id, attribute])
+    end
+  end
+end

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '0.17.1'
+  VERSION = '0.17.2'
 end

data/spec/fixtures/rule-assertion.json

@@ -0,0 +1 @@
+{"Assertions":[{"Assert":{"Fn::EachMemberIn":[{"Fn::ValueOfAll":["a","b"]},{"Fn::RefAll":"c"}]},"AssertDescription":"x"}],"RuleCondition":{"Fn::Equals":[{"Ref":"y"},"z"]}}

data/spec/rule_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CfnDsl::OutputDefinition do
+  let(:template) { CfnDsl::OrchestrationTemplate.new }
+  let(:target) { File.read("#{File.dirname(__FILE__)}/fixtures/rule-assertion.json") }
+  context '#Assert' do
+    it 'formats correctly' do
+      output = template.Rule(:testRule) do
+        Assert('x', FnEachMemberIn(FnValueOfAll('a', 'b'), FnRefAll('c')))
+        RuleCondition FnEquals(Ref('y'), 'z')
+      end
+      expect(output.to_json).to eq(target)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/cfndsl/rake_task.rb
 - lib/cfndsl/ref_check.rb
 - lib/cfndsl/resources.rb
+- lib/cfndsl/rules.rb
 - lib/cfndsl/specification.rb
 - lib/cfndsl/types.rb
 - lib/cfndsl/update_policy.rb
@@ -115,6 +116,7 @@ files:
 - spec/deep_merge_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
@@ -126,6 +128,7 @@ files:
 - spec/output_spec.rb
 - spec/plurals_spec.rb
 - spec/resources_spec.rb
+- spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
 - spec/transform_spec.rb
@@ -170,6 +173,7 @@ test_files:
 - spec/deep_merge_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
@@ -181,6 +185,7 @@ test_files:
 - spec/output_spec.rb
 - spec/plurals_spec.rb
 - spec/resources_spec.rb
+- spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
 - spec/transform_spec.rb