miasma-aws 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3da765abdba597864cae9b1fe0b1c81900c2a94
-  data.tar.gz: b98aab91fd9511e26ca5dbc42a8a6b8dc1730f41
+  metadata.gz: e6251cdfa71808a80c15f084a1c5b99fef161210
+  data.tar.gz: 257f0b4f25ec6fb9b5b2a47720ac852ff069579a
 SHA512:
-  metadata.gz: e1ae3d106af0bcc11a2893a8efab2eabe9980090203409ccfb8127e09afb63df62887ea71a0ae55f7656a06903e59ac3b736bd9d101075f4f6613442a3316228
-  data.tar.gz: 5f49561b607f000311ec3f530426f2898ca1e9278d0bcb5e472811539df9aeef34e32fc7ff378d2d49ed7fe25bd80fa5813410680fcf400d1b08f7c9802c547e
+  metadata.gz: 55f7fc516d4de71dfc646e603ceff90c5b7e38fe0f3c78332c7a731f40ce5a732c58a218ab4e3586a36f5e11c2129db89ae3d2e498123fbb62a267c61bc2f3f3
+  data.tar.gz: 5dd3c7418bbbdb9436f4ef5342dcdedf51716b5d891e0fd211ba8cb8e34016a8b8f59570925f14df1adb0d1a5d2887f7acc415964fb4073134946b0720d7b712

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.1.8
+* Include resource mapping for Stack
+* Add support for aws credentials file
+* Add stack tagging support
+* Enable on failure option for stack creation
+* Update list requests to use post + form to prevent param limitations via get
+
 ## v0.1.6
 * Fix state assignment when undefined within orchestration stacks
 * Fix multi-part S3 uploads

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.6')
+  VERSION = Gem::Version.new('0.1.8')
 end

data/lib/miasma/contrib/aws.rb

@@ -327,6 +327,8 @@ module Miasma
 
         def self.included(klass)
           klass.class_eval do
+            attribute :aws_profile_name, String
+            attribute :aws_credentials_file, String, :required => true, :default => File.expand_path('~/.aws/credentials')
             attribute :aws_access_key_id, String, :required => true
             attribute :aws_secret_access_key, String, :required => true
             attribute :aws_region, String, :required => true
@@ -356,6 +358,42 @@ module Miasma
           end
         end
 
+        # Allow loading credentials via local credentials file
+        #
+        # @param creds [Hash]
+        # @return [TrueClass]
+        def custom_setup(creds)
+          if(creds[:aws_profile_name])
+            creds.replace(load_aws_credentials(creds[:aws_profile_name]).merge(creds))
+          end
+        end
+
+        # Load credentials from the AWS credentials file
+        #
+        # @param profile [String] name of profile to load
+        # @return [Smash]
+        def load_aws_credentials(profile)
+          credentials = Smash.new.tap do |creds|
+            key = nil
+            File.readlines(aws_credentials_file).each do |line|
+              line.strip!
+              if(line.start_with?('[') && line.end_with?(']'))
+                key = line.tr('[]', '')
+                creds[key] = Smash.new
+              else
+                creds[key].merge!(Smash[*line.split('=')])
+              end
+            end
+          end
+          credentials.fetch(
+            :default, Smash.new
+          ).merge(
+            credentials.fetch(
+              profile, Smash.new
+            )
+          )
+        end
+
         # Setup for API connections
         def connect
           unless(aws_host)

data/lib/miasma/contrib/aws/orchestration.rb

@@ -5,6 +5,12 @@ module Miasma
     class Orchestration
       class Aws < Orchestration
 
+        # Extended stack model to provide AWS specific stack options
+        class Stack < Orchestration::Stack
+          attribute :stack_policy_body, Hash, :coerce => lambda{|v| MultiJson.load(v).to_smash}
+          attribute :stack_policy_url, String
+        end
+
         # Service name of the API
         API_SERVICE = 'cloudformation'
         # Supported version of the AutoScaling API
@@ -35,6 +41,10 @@ module Miasma
           'AWS::AutoScaling::AutoScalingGroup' => Smash.new(
             :api => :auto_scale,
             :collection => :groups
+          ),
+          'AWS::CloudFormation::Stack' => Smash.new(
+            :api => :orchestration,
+            :collection => :stacks
           )
         )
 
@@ -53,16 +63,29 @@ module Miasma
             descriptions = all_result_pages(nil, :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member') do |options|
               request(
                 :path => '/',
-                :params => options.merge(d_params)
+                :form => options.merge(d_params),
+                :method => :post
               )
             end
+            policy = request(
+              :path => '/',
+              :method => :get,
+              :params => Smash.new(
+                'Action' => 'GetStackPolicy',
+                'StackName' => stack.id
+              )
+            ).get(:body, 'GetStackPolicyResult', 'StackPolicyBody')
+            if(policy)
+              descriptions.first[:stack_policy] = MultiJson.load(policy).to_smash
+            end
           else
             descriptions = []
           end
           lists = all_result_pages(nil, :body, 'ListStacksResponse', 'ListStacksResult', 'StackSummaries', 'member') do |options|
             request(
               :path => '/',
-              :params => options.merge(l_params)
+              :form => options.merge(l_params),
+              :method => :post
             )
           end.map do |stk|
             desc = descriptions.detect do |d_stk|
@@ -102,11 +125,19 @@ module Miasma
                   :description => o['Description']
                 )
               },
+              :tags => Smash[
+                [stk.fetch('Tags', 'member', [])].flatten(1).map{|param|
+                  [param['Key'], param['Value']]
+                }
+              ],
               :parameters => Smash[
                 [stk.fetch('Parameters', 'member', [])].flatten(1).map{|param|
                   [param['ParameterKey'], param['ParameterValue']]
                 }
-              ]
+              ],
+              :custom => Smash.new(
+                :stack_policy_body => policy
+              )
             ).valid_state
           end
         end
@@ -127,6 +158,22 @@ module Miasma
           (stack.notification_topics || []).each_with_index do |topic, idx|
             params["NotificationARNs.member.#{idx + 1}"] = topic
           end
+          (stack.tags || {}).each_with_index do |tag, idx|
+            params["Tags.member.#{idx + 1}.Key"] = tag.first
+            params["Tags.member.#{idx + 1}.Value"] = tag.last
+          end
+          if(stack.custom[:stack_policy_body])
+            params['StackPolicyBody'] = MultiJson.dump(stack.custom[:stack_policy_body])
+          end
+          if(stack.custom[:stack_policy_url])
+            params['StackPolicyURL'] = stack.custom[:stack_policy_url]
+          end
+          unless(stack.disable_rollback.nil?)
+            params['OnFailure'] = stack.disable_rollback ? 'nothing' : 'delete'
+          end
+          if(stack.on_failure)
+            params['OnFailure'] = stack.on_failure == 'nothing' ? 'DO_NOTHING' : stack.on_failure.upcase
+          end
           if(stack.template.empty?)
             params['UsePreviousTemplate'] = true
           else
@@ -149,8 +196,7 @@ module Miasma
               :path => '/',
               :method => :post,
               :form => Smash.new(
-                'Action' => 'CreateStack',
-                'DisableRollback' => !!stack.disable_rollback
+                'Action' => 'CreateStack'
               ).merge(params)
             )
             stack.id = result.get(:body, 'CreateStackResponse', 'CreateStackResult', 'StackId')
@@ -268,7 +314,8 @@ module Miasma
           results = all_result_pages(nil, :body, 'DescribeStackResourcesResponse', 'DescribeStackResourcesResult', 'StackResources', 'member') do |options|
             request(
               :path => '/',
-              :params => options.merge(
+              :method => :post,
+              :form => options.merge(
                 Smash.new(
                   'Action' => 'DescribeStackResources',
                   'StackName' => stack.id
@@ -307,7 +354,8 @@ module Miasma
           results = all_result_pages(nil, :body, 'DescribeStackEventsResponse', 'DescribeStackEventsResult', 'StackEvents', 'member') do |options|
             request(
               :path => '/',
-              :params => options.merge(
+              :method => :post,
+              :form => options.merge(
                 'Action' => 'DescribeStackEvents',
                 'StackName' => stack.id
               )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma