cfhighlander 0.5.0.alpha.1535961316 → 0.5.0.alpha.1535961584

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3f2fc2c0753578e7d988f09119fc32dd44f898b8a73629730a09085f1fddc5
-  data.tar.gz: 006d4985a78560abaac2dbdbf751c6cc1a1f7ec46eb4852eca97698ca0b8d81a
+  metadata.gz: 2fffe7543ac877cf4a564748bc368730b6d3f494ec2fbb144d92ebefa30152b7
+  data.tar.gz: d7d6f214ae8af483055cc723f07c494e1155f924283f04bc51baa11157369716
 SHA512:
-  metadata.gz: 32c21c1e1b80b2cb54d2927ceed810835e6cb79cf89be3c79fa12957422717739cee583820da324d6e390dd9832a18564b536ef4ba2b08a8b9181ad5ca5e97f4
-  data.tar.gz: 5f97f28dc17688fd9565f9ef604fe9755db3d814b6907f3bf2ee858f265ed94b7b2667c63cacec8bf60e78371752c223de16fe7264e736d32f4b9a1880552696
+  metadata.gz: 463ccebc895cb0aa7551356604a58ceef5421eb92442d267ec8dc2b386295264903a38c75185365eb0e71310e26722130c7947c0a48104ff4298f1c41262c362
+  data.tar.gz: 2542890fbad5d9df0291823552a3e5f9bcb1ca8050fee5bcd188869caa3b42a2f13a8c94505f5d075c76332a29eb9168cf5877188eb132eccc1683988812f870

data/lib/cfhighlander.compiler.rb

@@ -84,7 +84,7 @@ module Cfhighlander
         component_cfndsl.gsub!("\n", "\n\t")
         component_cfndsl.gsub!("\r\n", "\r\n\t")
         # render cfndsl
-        renderer = ERB.new(File.read("#{__dir__}/../templates/cfndsl.component.template.erb"))
+        renderer = ERB.new(File.read("#{__dir__}/../templates/cfndsl.component.template.erb"), nil, '-')
         cfn_template = renderer.result(OpenStruct.new({
             'dsl' => dsl,
             'component_cfndsl' => component_cfndsl,

data/lib/cfhighlander.dsl.params.rb

@@ -35,15 +35,34 @@ module Cfhighlander
         param.provided_value = "#{component}.#{name}"
       end
 
-      def ComponentParam(name, defaultValue = '', isGlobal: false, noEcho: false, type: 'String', allowedValues: nil)
-        param = Parameter.new(name, type, defaultValue, noEcho, isGlobal, allowedValues)
+      def ComponentParam(name, defaultValue = '', isGlobal: false, noEcho: false, type: 'String', allowedValues: nil, allowedPattern: nil,
+                          maxLength: nil, maxValue: nil, minLength: nil, minValue: nil, description: nil, constraintDescription: nil)
+        param = Parameter.new(
+          name: name,
+          type: type,
+          defaultValue: defaultValue,
+          noEcho: noEcho,
+          isGlobal: isGlobal,
+          allowedValues: allowedValues,
+          allowedPattern: allowedPattern,
+          maxLength: maxLength,
+          maxValue: maxValue,
+          minLength: minLength,
+          minValue: minValue,
+          description: description,
+          constraintDescription: constraintDescription
+        )
         param.config = @config
         addParam param
         return param
       end
 
       def MappingParam(name, defaultValue = '', &block)
-        param = MappingParam.new(name, 'String', defaultValue)
+        param = MappingParam.new(
+          name: name,
+          type: 'String',
+          defaultValue: defaultValue
+        )
         param.config = @config
         param.instance_eval(&block)
         addParam param
@@ -60,16 +79,30 @@ module Cfhighlander
           :no_echo,
           :is_global,
           :provided_value,
-          :allowed_values
-
-      def initialize(name, type, defaultValue, noEcho = false, isGlobal = false, allowed_values = nil)
-        @no_echo = noEcho
-        @name = name
-        @type = type
-        @default_value = defaultValue
-        @is_global = isGlobal
-        @allowed_values = allowed_values
-        @provided_value = nil
+          :allowed_values,
+          :allowed_pattern,
+          :max_length,
+          :max_value,
+          :min_length,
+          :min_value,
+          :description,
+          :constraint_description
+
+      def initialize(params = {})
+        @no_echo = params.fetch(:noEcho, false)
+        @name = params.fetch(:name)
+        @type = params.fetch(:type)
+        @default_value = params.fetch(:defaultValue)
+        @is_global = params.fetch(:isGlobal, false)
+        @allowed_values = params.fetch(:allowedValues, nil)
+        @provided_value = params.fetch(:providedValue, nil)
+        @allowed_pattern = params.fetch(:allowedPattern, nil)
+        @max_length = params.fetch(:maxLength, nil)
+        @max_value = params.fetch(:maxValue, nil)
+        @min_length = params.fetch(:minLength, nil)
+        @min_value = params.fetch(:minValue, nil)
+        @description = params.fetch(:description, nil)
+        @constraint_description = params.fetch(:constraintDescription, nil)
       end
 
     end

data/templates/cfndsl.component.template.erb

@@ -35,8 +35,33 @@ CloudFormation do
     Parameter('<%= @param.name %>') do
       Type '<%= @param.type %>'
       Default '<%= @param.default_value %>'
-      <% unless @param.no_echo.nil? %>NoEcho <%= @param.no_echo.to_s %> <% end %>
-      <% unless @param.allowed_values.nil? %>AllowedValues <%= @param.allowed_values.to_s %> <% end %>
+<%- unless @param.no_echo.nil? -%>
+      NoEcho <%= @param.no_echo %>
+<%- end -%>
+<%- unless @param.allowed_values.nil? -%>
+      AllowedValues <%= @param.allowed_values %>
+<%- end -%>
+<%- unless @param.allowed_pattern.nil? -%>
+      AllowedPattern <%= @param.allowed_pattern %>
+<%- end -%>
+<%- unless @param.max_length.nil? -%>
+      MaxLength <%= @param.max_length %>
+<%- end -%>
+<%- unless @param.max_value.nil? -%>
+      MaxValue <%= @param.max_value %>
+<%- end -%>
+<%- unless @param.min_length.nil? -%>
+      MinLength <%= @param.min_length %>
+<%- end -%>
+<%- unless @param.min_value.nil? -%>
+      MinValue <%= @param.min_value %>
+<%- end -%>
+<%- unless @param.description.nil? -%>
+      Description '<%= @param.description %>'
+<%- end -%>
+<%- unless @param.constraint_description.nil? -%>
+      ConstraintDescription '<%= @param.constraint_description %>'
+<%- end -%>
     end
 <% end %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha.1535961316
+  version: 0.5.0.alpha.1535961584
 platform: ruby
 authors:
 - Nikola Tosic