cloudformation-tool 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c314efbe154da6923670e1db9e1d51dbe11ade89
-  data.tar.gz: 81803828778634c0e7fec5c5efc49f17f5fb5aff
+  metadata.gz: 94cf14cf65ed21845906c4101a74e8bdf04aef9c
+  data.tar.gz: cff797604a819f29b3a9d442e260c714c031b9b0
 SHA512:
-  metadata.gz: 5ba0caf5fefe37f31ebfe74bb18537a393a1a163f1ae5fcbd48069e81cfb8e5e201347434ab8481d380d70735a94e0b4bd49300699151bf819f82dcc8ea0a5e7
-  data.tar.gz: 726c7b5c0bafe15e46271b7f11b5b198d99e1a7ad8e8867310bfcd00d095e3407fe0946a47d482ca89da8e1d4b8046728fbb0d7edc6eaba3b4ef12b5238752aa
+  metadata.gz: ab8abfdfdc092df31ed5b1de0f8d73f16edb35285646df0445bdc60b15d2f41904309d4f36d376ee24a789f26e8233476720f32f6e68d4d976c1d1d06632b789
+  data.tar.gz: 09dc1249e7734e35dc44f14093d7a6e90f23a56e842184020bd718fd265513acbdb570a58d8776eaa587028378b8d73246b637e79efa93b109a247d6cc6dd220

data/README.md

@@ -125,7 +125,7 @@ user-data block, it will first be compressed using gzip and if it is still too l
 be uploaded to S3 and the user-data block will be set with a cloud-init download reference to
 the S3 object.
 
-##### Enhanced write_files
+##### Enhanced `write_files`
 
 The ("Cloud Config data" format supports deploying files)[http://cloudinit.readthedocs.io/en/latest/topics/examples.html#writing-out-arbitrary-files]
 into the instance using the `write_files` module. This normally requires the file content
@@ -137,8 +137,24 @@ are binary, or just too large).
 To use an external file in `write_files` instead of specifying the file content using the
 `content` field, use a `file` field to specify the relative path to the file to be loaded.
 
+##### `write_directories`
+
+In the case that you want to deploy multiple files to the same directory, instead of
+listing each and every file as a `write_files` entries (which can get tedious after
+a while, even with the `file` extension), `cftool` offers another cloud-init extension
+as a category named `write_directories`. 
+
+The `write_directories` section is a list where each entry specifies a local
+directory that would be deployed (with all files it includes, recursively - so make
+sure it only includes files you want to deploy) to a target directory on the deployed
+server. For each entry specify a `source` attribute that points to a local directory
+relative to the location of the cloud-init file, and a `target` attribute set to an
+absolute URL to where to deploy the source directory.  
+
 #### Example:
 
+`cloud-formation.yaml`:
+
 ```
   LaunchConfigurationForServer:
     Type: AWS::AutoScaling::LaunchConfiguration
@@ -154,6 +170,21 @@ To use an external file in `write_files` instead of specifying the file content
         File: config.init 
 ```
 
+`config.init`:
+
+```
+#cloud-config
+
+write_files:
+ - path: /etc/default/my-app
+   permissions: '0755'
+   file: my-app.config
+
+write_directory:
+ - source: my-app-data
+   target: /usr/share/my-app
+```
+
 ### Loading Lambda code
 
 When specifying the `Code` property of a `AWS::Lambda::Function` resource, instead of

data/lib/cloud_formation_tool/cloud_formation/stack.rb

@@ -29,19 +29,21 @@ module CloudFormationTool
       
       def update(url, filepath, params = {})
         log "Updating existing stack '#{name}' from '#{filepath}' params #{params.inspect}"
-        resp = awscf.update_stack({
-          stack_name: @name,
-          template_url: url,
-          capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
-          parameters: params.collect do |k,v|
-            {
-              parameter_key: k.to_s,
-              parameter_value: v.to_s,
-              use_previous_value: false,
-            }
-          end
-        })
-        resp.stack_id
+        check do
+          resp = awscf.update_stack({
+            stack_name: @name,
+            template_url: url,
+            capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
+            parameters: params.collect do |k,v|
+              {
+                parameter_key: k.to_s,
+                parameter_value: v.to_s,
+                use_previous_value: false,
+              }
+            end
+          })
+          resp.stack_id
+        end
       end
       
       def create(template, params = {})
@@ -49,7 +51,7 @@ module CloudFormationTool
         url = upload(make_filename('yaml'), @template, gzip: false)
         return update(url, template, params) if exist?
         log "Creating stack '#{name}' from '#{template}' params #{params.inspect}"
-        begin
+        check do
           resp = awscf.create_stack({
             stack_name: @name,
             template_url: url,
@@ -64,8 +66,6 @@ module CloudFormationTool
             end
           })
           @stack_id = resp.stack_id
-        rescue Aws::CloudFormation::Errors::ValidationError => e
-          raise CloudFormationTool::Errors::ValidationError, "Stack validation error: #{e.message}"
         end
       end
       
@@ -171,6 +171,16 @@ module CloudFormationTool
         end
       end
     end
+    
+    private
+    
+    def check
+      begin
+        yield
+      rescue Aws::CloudFormation::Errors::ValidationError => e
+        raise CloudFormationTool::Errors::ValidationError, "Stack validation error: #{e.message}"
+      end  
+    end
 
   end
 end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '0.6.0'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Oded Arbel
@@ -28,14 +28,14 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates