cloudformation-ruby-dsl 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 689a6e23672cf1be2ca2acaad415484f9c79fab5
-  data.tar.gz: 280c4250cb0a541faaac7c7ced39a67fcdac6474
+  metadata.gz: 5160b62e070108409db1f685692e0158efece837
+  data.tar.gz: 2b06be14903bd5f45f1e2fcb2be5a452ce24560a
 SHA512:
-  metadata.gz: 85e1e94afbaf7fdcd320c748fc91de02b8cbaedf974dd66ee4f8d0d30d255c749892d1af1c188c3e73f8c9f54cc2c32ee3811d4f46590c4c8224f4dd74ce5fed
-  data.tar.gz: 92ed9f50c46fbc82cd01aef262dc330fa6914bcd93df806bdfe5b927db4a3ea76cd09ae4c9b57d165ef8b0e359e9ea69dcd2845e499e7f8ab3b39ce9bd30e530
+  metadata.gz: 50eb7c54962bfc80b276941da6c58859ecc57a64ad5149d2be357e2591009f90ce334e19c2cbf2673365c3b48ff1a70afdcc1bf947fa0a665f5b8ababb38edff
+  data.tar.gz: 2da8a50dc1de0440c92505aae6a2bab993e0517568d5c5806fa89e392721b534f62a7e9161c0e0262c16fc9e67e7c3654d7d5bfbf99392e202dcccb8c373366d

data/README.md

@@ -94,6 +94,8 @@ Invoke an intrinsic CloudFormation function.
 - `select(index, list)`
 - `ref(name)`
 - `import_value(value)`
+- `sub(sub_string)`
+- `sub(sub_string, var_map)`
 
 Intrinsic conditionals are also supported, with some syntactic sugar.
 - `fn_not(condition)`

data/examples/cloudformation-ruby-script.rb

@@ -23,7 +23,7 @@ require 'cloudformation-ruby-dsl/table'
 
 template do
 
-  # Metadata may be embedded into the stack, as per http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/metadata-section-structure.html 
+  # Metadata may be embedded into the stack, as per http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/metadata-section-structure.html
   # The below definition produces CloudFormation interface metadata.
   metadata 'AWS::CloudFormation::Interface', {
     :ParameterGroups => [
@@ -35,7 +35,7 @@ template do
         :Label => { :default => 'Other options' },
         :Parameters => [ 'Label', 'EmailAddress' ]
       }
-    ], 
+    ],
     :ParameterLabels => {
       :EmailAddress => {
         :default => "We value your privacy!"
@@ -79,6 +79,10 @@ template do
             :Type => 'String',
             :Description => 'Email address at which to send notification events.'
 
+  parameter 'BucketName',
+            :Type => 'String',
+            :Description => 'Name of the bucket to upload to.'
+
   mapping 'InlineExampleMap',
           :team1 => {
               :name => 'test1',
@@ -134,7 +138,7 @@ template do
   #   These tags are excised from the template and used to generate a series of --tag arguments
   #   which are passed to CloudFormation when a stack is created.
   #   They do not ultimately appear in the expanded CloudFormation template.
-  #   The diff subcommand will compare tags with the running stack and identify any changes, 
+  #   The diff subcommand will compare tags with the running stack and identify any changes,
   #   but a stack update will do the diff and throw an error on any immutable tags update attempt.
   #   The tags are propagated to all resources created by the stack, including the stack itself.
   #   If a resource has its own tag with the same name as CF's it's not overwritten.
@@ -238,6 +242,24 @@ template do
       :Path => '/',
   }
 
+  # Use sub to set bucket names for an S3 Policy.
+  resource 'ManagedPolicy', :Type => "AWS::IAM::ManagedPolicy", :Properties => {
+    :Description => 'Access policy for S3 Buckets',
+    :PolicyDocument => {
+      :Version => "2012-10-17",
+      :Statement => [
+        {
+          :Action => ["s3:ListBucket"],
+          :Effect => "Allow",
+          :Resource => [
+            sub("arn:aws:s3:::${BucketName}"),
+            sub("arn:aws:s3:::${BaseName}${Hash}", {:BaseName => 'Bucket', :Hash => '3bsd73w'}),
+          ]
+        }
+      ]
+    }
+  }
+
   # add conditions that can be used elsewhere in the template
   condition 'myCondition', fn_and(equal("one", "two"), not_equal("three", "four"))
 

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

@@ -94,7 +94,6 @@ def parse_args
       args[:parameters] = Hash[value.split(/;/).map { |pair| parts = pair.split(/=/, 2); [ parts[0], Parameter.new(parts[1]) ] }]  #/# fix for syntax highlighting
     when '--interactive'
       args[:interactive] = true
-default and previous values of a parameter. Updated excise_parameter_attributes! to support multiple parameters.
     when '--region'
       args[:region] = value
     when '--profile'

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

@@ -265,6 +265,15 @@ def get_azs(region = '') { :'Fn::GetAZs' => region } end
 
 def import_value(value) { :'Fn::ImportValue' => value } end
 
+# There are two valid forms of Fn::Sub, with a map and without.
+def sub(sub_string, var_map = {})
+  if var_map.empty?
+    return { :'Fn::Sub' => sub_string }
+  else
+    return { :'Fn::Sub' => [sub_string, var_map] }
+  end
+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.4.1"
+      VERSION = "1.4.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-ruby-dsl
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Shawn Smith