cfhighlander 0.10.7 → 0.10.8.alpha.1582708349

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1da99a1d678b6b91cccc949d2586a42775346c9e10e84b2045d560adccfafd3
-  data.tar.gz: 5bf57aa759886f52450a2c98ad0f4408d4d1fa4b1c348da2cff2c14f28601db9
+  metadata.gz: 81ea5de47811b5292478483603cf5ab59bb115f9dfe3f3a851d655c2c98eb105
+  data.tar.gz: b706aae6e5ecf53293a4f70d3cd1add5c024eced73bdfa396e740e979e5a30f2
 SHA512:
-  metadata.gz: 1990a192aa56820f49cbc4519a9214dd894587060fe9b833ad1f55c337c5a1ac0fe48bd29991caf5cf308050c639c1c340ec30e35888f60539065a2af498c8f3
-  data.tar.gz: '0963a8b1eb0f42350e1523cde9e373adfb6b2fb74215655b312a875d1792121b5149b2bee8d84fddab37cb3454f704bbe8355d904b630444fbbf360bd8daf5ed'
+  metadata.gz: 63155d443df716a879d714b9a5b64d535d41649769db0a507bffcb4928b3cdd5de8475617ffdf2828ac8dc13f514c0a07d4cab5dcb373203af8f409bba45f221
+  data.tar.gz: cb65a4d8789096c3fa28f78f4ee0f4d3b679bd5ba52c2cbac85e2f7ea2fdfc64f8b87138cec64511da32f819ed0bbc567ec356cdaf61bec664d87cfa2511aac8

data/README.md

@@ -967,6 +967,26 @@ test_metadata:
   description: Create 2 queues with name and override available config
 ```
 
+### Test Paramaters
+
+If you want to test a component with a parameter input you can specify the `test-parameters:` key with key:value pairs of parameters
+
+```yaml
+# Define the test parameter
+test_parameters:
+  SecurityGroupId: sg-123456789
+
+# Test configuration
+security_group_rules:
+  -
+    from: 22
+    protocol: tcp
+    security_group_id:
+      # use the parameter within our test
+      Ref: SecurityGroupId
+    desc: ssh access from another security group
+```
+
 ### Running Test
 
 ```bash

data/bin/cfhighlander.rb

@@ -214,6 +214,10 @@ class HighlanderCli < Thor
         puts "INFO: Reloading component, as auto-generated distribution settings  are being applied..."
         component.load
       end if autogenerate_dist
+      
+      test[:test_parameters].each do |name,value|
+        component.highlander_dsl.parameters.ComponentParam(name,value)
+      end
 
       # compile cloud formation
       component_compiler = Cfhighlander::Compiler::ComponentCompiler.new(component)

data/lib/cfhighlander.compiler.rb

@@ -86,6 +86,10 @@ module Cfhighlander
           sc.distribution_format = out_format
         }
 
+        # figure out cfndsl version
+        cfndsl_version = CfnDsl::VERSION
+        legacy_cfndsl = cfndsl_version.to_f < 1
+
         # indent component cfndsl
         component_cfndsl.gsub!("\n", "\n\t")
         component_cfndsl.gsub!("\r\n", "\r\n\t")
@@ -95,7 +99,9 @@ module Cfhighlander
             'dsl' => dsl,
             'component_cfndsl' => component_cfndsl,
             'component_requires' => (@@global_extensions_paths + @component.cfndsl_ext_files),
-            'distribution_format' => out_format
+            'distribution_format' => out_format,
+            'legacy_cfndsl' => legacy_cfndsl,
+            'cfndsl_version' => cfndsl_version
         }).instance_eval { binding })
 
         # write to output file

data/lib/cfhighlander.model.component.rb

@@ -241,9 +241,6 @@ module Cfhighlander
       end
       def eval_cfndsl
         compiler = Cfhighlander::Compiler::ComponentCompiler.new self
-        # there is no need for processing lambda source code during cloudformation evaluation,
-        # this version never gets published
-        compiler.process_lambdas = false
         @cfn_model = compiler.evaluateCloudFormation().as_json
         @cfn_model_raw = JSON.parse(@cfn_model.to_json)
         @outputs = (

data/lib/cfhighlander.tests.rb

@@ -28,7 +28,13 @@ module CfHighlander
     def get_cases
       @test_files.each do |file|
         test_case = load_test_case(file)
-        @cases << { metadata: test_case['test_metadata'], file: file, config: load_default_config.deep_merge(test_case) }
+        test_parameters = test_case['test_parameters'] || {}
+        @cases << { 
+          metadata: test_case['test_metadata'],
+          test_parameters: test_parameters,
+          file: file,
+          config: load_default_config.deep_merge(test_case)
+        }
       end
     end
 

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.10.7".freeze
+  VERSION="0.10.8".freeze
 end

data/templates/cfndsl.component.template.erb

@@ -2,12 +2,17 @@
     load('<%= @require %>')
 <% end %>
 CloudFormation do
-
+  # cfhl meta: cfndsl_version=<%=cfndsl_version %>
+<% unless legacy_cfndsl -%>
+<% dsl.config.each_key do |key|-%>
+  <%=key-%> = external_parameters.fetch(:<%=key-%>, nil)
+<% end -%>
+<% end -%>
 <% for @mapping in dsl.mappings %>
     Mapping('<%= @mapping %>', mappings['<%= @mapping %>'])
-<% end %>
+<% end -%>
 
-# render subcomponents
+  # render subcomponents
 <% for @subcomponent in dsl.subcomponents %>
     CloudFormation_Stack('<%= @subcomponent.cfn_name %>') do
         TemplateURL '<%= @subcomponent.distribution_url %>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8.alpha.1582708349
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -56,16 +56,22 @@ dependencies:
   name: cfndsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -271,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7