cfhighlander 0.12.0.alpha.1586689671 → 0.12.2.alpha.1603234673

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2621ce04b1a08e7d4d77c8412f98fe7866ccb58c78b76ce9788f323c80a9ae
-  data.tar.gz: 3bf4fe4646e24230d0fb7e6dc09730eb5694b2346376e60d95e1251ddff6c104
+  metadata.gz: d536f8e52032ab314218ebc97602337ce9641674dc922162e5edd0bf85fc1c45
+  data.tar.gz: 6c8b11170fd53dd05101febff9805875bd09ef7ef978d045231d42d036179330
 SHA512:
-  metadata.gz: 6ebcc02c712f281750604d4d875b684de9390d05a4f420ce49657d2fe33d2bc56aef1fac361bb084be4e4a2a27f03c6b26fe977b426e6c606f417a4e825ece34
-  data.tar.gz: dd8d65d96c1790deea973f5b2a89b3150065353f932f1e65bbeb61b515d37e1928edced90626b16072a399cacea2e4115c842d86fa94e745921f770702541944
+  metadata.gz: 262fa6c520fbf222e38a3a6d6213fd5999774d06eb6b9dbb5cba02a353338a3638ccecf9afdb5abcb77c7d4f99dca2b3d732d893aea65d39dbd2df36d89ff404
+  data.tar.gz: 391b8f33fe0da950823abb6286116612c900a62cc273e9114bb2915cad42764b74459b8efd623a91035ce2531c9d139de96c750e471216899c6b3a49073d978c

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
 
@@ -486,6 +495,17 @@ CfhighlanderTemplate do
 end
 ```
 
+**Nested Stack Timeout** - If you ant set a timeout on your nested cloudformation stack you can set this with the `timeout: int` option on the component.
+
+```ruby
+CfhighlanderTemplate do
+  
+  # sets a timeout for 10 minutes on the nested VPC stack, if the stack is not created or updated within 10 minutes the stack rolls back.
+  Component name: 'vpc', template: 'vpc-v2', timeout: 10
+  
+end
+```
+
 **Convert config value to parameter** - In case of inner component having configuration value
 you wish to expose as runtime parameter, it is possible to do so with limitation that configuration
 value is only used in *resource declarations*, as property value. If configuration value is being used

data/lib/cfhighlander.dsl.subcomponent.rb

@@ -36,7 +36,8 @@ module Cfhighlander
           :template_version,
           :inlined,
           :dependson,
-          :condition
+          :condition,
+          :template_timeout
           
       def initialize(parent,
           name,
@@ -49,6 +50,7 @@ module Cfhighlander
           condition = nil,
           enabled = true,
           dependson = [],
+          template_timeout = nil,
           inline = false,
           distribution_format = 'yaml')
 
@@ -59,6 +61,7 @@ module Cfhighlander
         @conditional = conditional
         @condition = condition
         @dependson = [*dependson]
+        @template_timeout = template_timeout
         @inlined = inline
         
         template_name = template
@@ -95,12 +98,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
@@ -151,13 +157,12 @@ module Cfhighlander
           param_ovr[:maxValue] = maxValue unless maxValue.nil?
           param_ovr[:minLength] = minLength unless minLength.nil?
           param_ovr[:minValue] = minValue unless minValue.nil?
-          
           @component_loaded.highlander_dsl.Parameters do
             ComponentParam name, value, param_ovr
           end
         else
           parameter.default_value = defaultValue unless defaultValue.nil?
-          parameter.type unless type.nil?
+          parameter.type = type unless type.nil?
           parameter.no_echo = noEcho unless noEcho.nil?
           parameter.allowed_values = allowedValues unless allowedValues.nil?
           parameter.allowed_pattern = allowedPattern unless allowedPattern.nil?

data/lib/cfhighlander.dsl.template.rb

@@ -37,7 +37,8 @@ module Cfhighlander
           :lambda_functions_keys,
           :description,
           :dependson_components,
-          :template_dir
+          :template_dir,
+          :template_timeout
 
       attr_reader :conditions,
           :subcomponents,
@@ -57,6 +58,7 @@ module Cfhighlander
         @lambda_functions_keys = []
         @dependson_components_templates = []
         @dependson_components = []
+        @template_timeout = nil
         @conditions = []
         @config_overrides = {}
         @extended_template = nil
@@ -127,6 +129,7 @@ module Cfhighlander
           condition: nil,
           enabled: true,
           dependson: [],
+          timeout: nil,
           render: Cfhighlander::Model::Component::Substack,
           &block)
         puts "INFO: Requested subcomponent #{name} with template #{template}"
@@ -151,6 +154,7 @@ module Cfhighlander
             condition,
             enabled,
             dependson,
+            timeout,
             render == Cfhighlander::Model::Component::Inline
         )
         # component.instance_eval(&block) unless block.nil?

data/lib/cfhighlander.version.rb

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

data/templates/cfndsl.component.template.erb

@@ -17,12 +17,15 @@ 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 %>,
         <% end %>})
         <% if @subcomponent.conditional %>Condition '<%= @subcomponent.condition %>' <% end %>
+        <%- if !@subcomponent.template_timeout.nil? %>
+        TimeoutInMinutes <%=  @subcomponent.template_timeout.to_i %>
+        <%- end %>
     end
 <% end %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.12.0.alpha.1586689671
+  version: 0.12.2.alpha.1603234673
 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-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -281,8 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components