cfhighlander 0.12.0 → 0.12.1.alpha.1589238004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894cac0fd48e60d1b3a8f36bae4d025ef6faeb71f3477287105b7eb5a7d673e0
-  data.tar.gz: 2754a30993473d481129988618627e3565f7f5a42ff5f22b96263912c0c21026
+  metadata.gz: e0a790344ca30bc58633601d8d0b9b8eede6b69663fa149405f7162ceb1e1b5b
+  data.tar.gz: 0aa482c8e3f726b92ef291216b68bf56acad55ffa764dc0e41575ef220e6b334
 SHA512:
-  metadata.gz: 064b05d3f42885aa55cb0563cd24368dc51972bc4be2d58f7fd985591dc9a66a1609639cb32cc46e217ea2be6738af74a0d46dacb14e66f6ffb941002d74ec53
-  data.tar.gz: 4e34ed01686c18a29e91934311b0a4fb47fb327859e67a69dc0c2c9ad123ca4e9d2d5f1fdaea2f6c2cdeb70a7801deb34d5724d43a58d2f5f787568662e1304a
+  metadata.gz: '030590a7fb1d3bfa411349b7fc2fb37c9806825ce6e6ac557b3052194691a5d496ac594de74ffa4eecc6f56537d7593a84ffcd8a65e974f990feb65cf642756a'
+  data.tar.gz: 91d9168c855c70fa0c34caf4bb7c6f6deae7b8e85615647f36f8e20fb5b10bc82e05b37835379d0f1fdbbedb0ea97ded3987e9cf7f4eb7d5d9c8a39bc46f58c5

data/README.md

@@ -448,7 +448,9 @@ end
 
 **Conditional components** - If you want to add top level paramater as feature toggle for one of the inner
 components, just mark it as conditional, using `conditional:` named parameter. In addition to this, default
-value for feature toggle can be supplied using `enabled:` named parameter
+value for feature toggle can be supplied using `enabled:` named parameter. Autogenerated parameter will be named
+`Enable$COMPONENTNAME`, defaulting to `[true,false]` as set of allowed values. Autogenerated condition will 
+be named same as parameter, and checking if the parameter value equlas `true` 
 
 
 ```ruby
@@ -469,16 +471,23 @@ end
 
 ```
 
-**Conditional Groups** - If you have more than 1 stack you want to control with a single parameter, you can supply the `condition:` option with a string value on each component you want to control with the condition.
+**Override default behaviour** - If you have more than 1 stack you want to control with a single parameter, or you want to change
+parameter name, you can supply the `condition:` option with a string value on each component you want to control with the condition.
+Autogenerated condition can be overriden as well, by defining your own condition with the same name on the highlander 
+template, as in example below. 
+
 
 ```ruby
 CfhighlanderTemplate do
   
+  # [Optional - Define your own condition, instead of default true/false one]
+  Condition 'EnableDevelopmentResources', FnEquals(Ref(:EnvironmentName),'dev')
+
   # Components always required
   Component 'vpc'
   Component name: 'ecs', template: 'ecs'
   
-  # Components only required in development environments
+  # Components only required in development environments with common condition name
   Component name: 'linux-bastion', template: 'bastion', conditional: true, condition: 'EnableDevelopmentResources', enabled: false
   Component name: 'windows-bastion', template: 'bastion', conditional: true, condition: 'EnableDevelopmentResources', enabled: false
 

data/lib/cfhighlander.dsl.subcomponent.rb

@@ -95,12 +95,15 @@ module Cfhighlander
         if @conditional
           condition = "Enable#{@cfn_name}" if @condition.nil?
           @condition = condition
-          @parent.Condition(condition, CfnDsl::Fn.new('Equals', [
-              CfnDsl::RefDefinition.new(condition),
-              'true'
-          ]).to_json)
-          @parent.Parameters do
-            ComponentParam condition, enabled.to_s, allowedValues: %w(true false)
+          parent_condition_defined = @parent.conditions.find {|c| c.name == @condition}
+          unless parent_condition_defined
+            @parent.Condition(condition, CfnDsl::Fn.new('Equals', [
+                CfnDsl::RefDefinition.new(condition),
+                'true'
+            ]).to_json)
+            @parent.Parameters do
+              ComponentParam condition, enabled.to_s, allowedValues: %w(true false)
+            end
           end
         end
       end

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.12.0".freeze
+  VERSION="0.12.1".freeze
 end

data/templates/cfndsl.component.template.erb

@@ -17,7 +17,7 @@ CloudFormation do
     CloudFormation_Stack('<%= @subcomponent.cfn_name %>') do
         TemplateURL '<%= @subcomponent.distribution_url %>'
         <%- if !@subcomponent.dependson.empty? %>
-        DependsOn <%= @subcomponent.dependson %>
+        DependsOn <%=  @subcomponent.dependson %>
         <%- end %>
         Parameters ({
         <% for @param in @subcomponent.parameters %><%="\t"%>'<%=@param.name %>' => <%= @param.cfndsl_value %>,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1.alpha.1589238004
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -277,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