cloudformation-ruby-dsl 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0ff566160bc6cd49546a86129814e4f7456149
-  data.tar.gz: f2b3e70794460d1214c1c336762f2d4e238b3247
+  metadata.gz: fcefa7ca9233df5bfcd9223e6558c2849db7b18c
+  data.tar.gz: 9c056b722df8348be8a1932c9374eadd2d71cfa9
 SHA512:
-  metadata.gz: 87f36d247b8db1ec5fcbe951f35a84a71d127883185788fc29676d0be65bac0e5f05648ad81f9d4c0f602a0b52b00d52c4c4b958c837f0b0069b1ac42eff1c9b
-  data.tar.gz: 63de25f85683010039ec5215b41fd05a2e0924b6b69582d691a512c152aff19e98f1f6bbe8950d4580fc68c0eafafc29c03e170c4ccca1d5b76a644a12a17cea
+  metadata.gz: a855706d0b535cb20450fe23a47bf3380342c2f15c7b1899c182179b5e09c85b51d1d3e327f44c6f90ba89ccdcea0dd53d264cd628c4c366e469fe60f8c059ae
+  data.tar.gz: cb4ab5611b187e4da6923f8312e70c2cdfbcc928dd8fd57b41b3ffa68d9a92439044b94357a37af2a0453d33be77352cc5624abaf08214f4ee3bb0ff12cdae9a

data/README.md

@@ -79,6 +79,7 @@ Invoke an intrinsic CloudFormation function.
 - `join(delim, *list)`
 - `select(index, list)`
 - `ref(name)`
+- `import_value(value)`
 
 Intrinsic conditionals are also supported, with some syntactic sugar.
 - `fn_not(condition)`

data/lib/cloudformation-ruby-dsl/cfntemplate.rb

@@ -78,26 +78,32 @@ end
 
 # Parse command-line arguments and return the parameters and region
 def parse_args
-  stack_name = nil
-  parameters = {}
-  region     = default_region
-  profile    = nil
-  nopretty   = false
+  args = {
+    :stack_name  => nil,
+    :parameters  => {},
+    :interactive => false,
+    :region      => default_region,
+    :profile     => nil,
+    :nopretty    => false,
+  }
   ARGV.slice_before(/^--/).each do |name, value|
     case name
     when '--stack-name'
-      stack_name = value
+      args[:stack_name] = value
     when '--parameters'
-      parameters = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]  #/# fix for syntax highlighting
+      args[:parameters] = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]  #/# fix for syntax highlighting
+    when '--interactive'
+      args[:interactive] = true
     when '--region'
-      region = value
+      args[:region] = value
     when '--profile'
-      profile = value
+      args[:profile] = value
     when '--nopretty'
-      nopretty = true
+      args[:nopretty] = true
     end
   end
-  [stack_name, parameters, region, profile, nopretty]
+
+  args
 end
 
 def validate_action(action)
@@ -294,13 +300,16 @@ def cfn(template)
           template_body: template_string,
           parameters: template.parameters.map { |k,v| {parameter_key: k, parameter_value: v}}.to_a,
           tags: cfn_tags.map { |k,v| {"key" => k.to_s, "value" => v} }.to_a,
-          capabilities: ["CAPABILITY_IAM"],
+          capabilities: ["CAPABILITY_NAMED_IAM"],
       }
 
       # fill in options from the command line
       extra_options = parse_arg_array_as_hash(options)
       create_stack_opts = extra_options.merge(create_stack_opts)
 
+      # remove custom options
+      create_stack_opts.delete(:interactive)
+
       # create stack
       create_result = cfn_client.create_stack(create_stack_opts)
       if create_result.successful?
@@ -486,13 +495,16 @@ def cfn(template)
           template_body: template_string,
           parameters: template.parameters.map { |k,v| {parameter_key: k, parameter_value: v}}.to_a,
           tags: cfn_tags.map { |k,v| {"key" => k.to_s, "value" => v.to_s} }.to_a,
-          capabilities: ["CAPABILITY_IAM"],
+          capabilities: ["CAPABILITY_NAMED_IAM"],
       }
 
       # fill in options from the command line
       extra_options = parse_arg_array_as_hash(options)
       update_stack_opts = extra_options.merge(update_stack_opts)
 
+      # remove custom options
+      update_stack_opts.delete(:interactive)
+
       # update the stack
       update_result = cfn_client.update_stack(update_stack_opts)
       if update_result.successful?
@@ -567,6 +579,6 @@ end
 
 # Main entry point
 def template(&block)
-  stack_name, parameters, aws_region, aws_profile, nopretty = parse_args
-  raw_template(parameters, stack_name, aws_region, aws_profile, nopretty, &block)
+  options = parse_args
+  raw_template(options, &block)
 end

data/lib/cloudformation-ruby-dsl/dsl.rb

@@ -44,8 +44,8 @@ end
 ############################# CloudFormation DSL
 
 # Main entry point
-def raw_template(parameters = {}, stack_name = nil, aws_region = default_region, aws_profile = nil, nopretty = false, &block)
-  TemplateDSL.new(parameters, stack_name, aws_region, aws_profile, nopretty, &block)
+def raw_template(options, &block)
+  TemplateDSL.new(options, &block)
 end
 
 def default_region
@@ -54,14 +54,20 @@ end
 
 # Core interpreter for the DSL
 class TemplateDSL < JsonObjectDSL
-  attr_reader :parameters, :aws_region, :nopretty, :stack_name, :aws_profile
-
-  def initialize(parameters = {}, stack_name = nil, aws_region = default_region, aws_profile = nil, nopretty = false)
-    @parameters = parameters
-    @stack_name = stack_name
-    @aws_region = aws_region
-    @aws_profile = aws_profile
-    @nopretty = nopretty
+  attr_reader :parameters,
+              :parameter_cli,
+              :aws_region,
+              :nopretty,
+              :stack_name,
+              :aws_profile
+
+  def initialize(options)
+    @parameters  = options[:parameters]
+    @interactive = options[:interactive]
+    @stack_name  = options[:stack_name]
+    @aws_region  = options[:region]
+    @aws_profile = options[:profile]
+    @nopretty    = options[:nopretty]
     super()
   end
 
@@ -71,7 +77,12 @@ class TemplateDSL < JsonObjectDSL
 
   def parameter(name, options)
     default(:Parameters, {})[name] = options
-    @parameters[name] ||= options[:Default]
+
+    if @interactive
+      @parameters[name] ||= _get_parameter_from_cli(name, options)
+    else
+      @parameters[name] ||= options[:Default]
+    end
   end
 
   # Find parameters where the specified attribute is true then remove the attribute from the cfn template.
@@ -162,6 +173,73 @@ class TemplateDSL < JsonObjectDSL
       { :'Fn::FindInMap' => [ map, key, name ] }
     end
   end
+
+  private
+  def _get_parameter_from_cli(name, options)
+    # basic request
+    param_request = "Parameter '#{name}' (#{options[:Type]})"
+
+    # add description to request
+    if options.has_key?(:Description)
+      param_request += "\nDescription: #{options[:Description]}"
+    end
+
+    # add validation to the request
+
+    # allowed pattern
+    if options.has_key?(:AllowedPattern)
+      param_request += "\nAllowed Pattern: /#{options[:AllowedPattern]}/"
+    end
+
+    # allowed values
+    if options.has_key?(:AllowedValues)
+      param_request += "\nAllowed Values: #{options[:AllowedValues].join(', ')}"
+    end
+
+    # min/max length
+    if options.has_key?(:MinLength) or options.has_key?(:MaxLength)
+      min_length = "-infinity"
+      max_length = "+infinity"
+      if options.has_key?(:MinLength)
+        min_length = options[:MinLength]
+      end
+      if options.has_key?(:MaxLength)
+        max_length = options[:MaxLength]
+      end
+      param_request += "\nValid Length: #{min_length} < string < #{max_length}"
+    end
+
+    # min/max value
+    if options.has_key?(:MinValue) or options.has_key?(:MaxValue)
+      min_value = "-infinity"
+      max_value = "+infinity"
+      if options.has_key?(:MinValue)
+        min_value = options[:MinValue]
+      end
+      if options.has_key?(:MaxValue)
+        max_value = options[:MaxValue]
+      end
+      param_request += "\nValid Number: #{min_value} < number < #{max_value}"
+    end
+
+    # add default to request
+    if options.has_key?(:Default) and !options[:Default].nil?
+      param_request += "\nLeave value empty for default: #{options[:Default]}"
+    end
+
+    param_request += "\nValue: "
+
+    # request the param
+    $stdout.puts "===================="
+    $stdout.print param_request
+    input = $stdin.gets.chomp
+
+    if input.nil? or input.empty?
+      options[:Default]
+    else
+      input
+    end
+  end
 end
 
 def base64(value) { :'Fn::Base64' => value } end
@@ -172,6 +250,8 @@ def get_att(resource, attribute) { :'Fn::GetAtt' => [ resource, attribute ] } en
 
 def get_azs(region = '') { :'Fn::GetAZs' => region } end
 
+def import_value(value) { :'Fn::ImportValue' => value } end
+
 def join(delim, *list)
   case list.length
     when 0 then ''

data/lib/cloudformation-ruby-dsl/version.rb

@@ -15,7 +15,7 @@
 module Cfn
   module Ruby
     module Dsl
-      VERSION = "1.2.5"
+      VERSION = "1.2.6"
     end
   end
 end

data/spec/spec_helper.rb

@@ -104,7 +104,7 @@ module FileHelpers
   # Delete a file from the spec/tmp directory
   def delete_test_file(filename)
     abs_path = File.join(from_project_root("spec/tmp"), filename)
-    FileUtils.rm(abs_path)
+    FileUtils.rm(abs_path) if File.exist?(abs_path)
   end
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-ruby-dsl
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Shawn Smith
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detabulator