miasma-aws 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5b3fe06aa37c3bdc942bceffde1af07852cc74
-  data.tar.gz: 32e6a2752c4da9a2003da5bba5cf00e9c19ae83a
+  metadata.gz: b255feb4bbbd9158ce1928df6b560eafc4b481c5
+  data.tar.gz: 7d54dcb2b4b96012cab3e13d89a772604d9b378d
 SHA512:
-  metadata.gz: 8ad263d55d74bb5058fcd0ac9b89704605ceb4800976b5519b63b71d2f20bd90d55cfde05fa92ecaba303605a787cdad97f8c8935529555aebe0af6db6aef81c
-  data.tar.gz: b4fd118303c565890fff9015e9419fbd228c81f4e220f0bb24d39e2f2ade212d2dd0a3f6665827198f82648d2e7c21bd9f90c505408c85a59b18d25323f77350
+  metadata.gz: 32ab9151988b38628bec1e50b96e3cc360624c04d656e7c959586a31e6c6bac8d4a5d5e17d2fb47108b01d6ef0dabfa7ecf97036841a29e1e54573453bbdbdcf
+  data.tar.gz: e3ceba8f15b6679679f333676a89fe7caa4ef250a047b75fcd5df15761ac50b42e46661cf15180957fed7af107dcabd91a68970aa548261ea546e2257d20b36a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.22
+* Fix instance profile credential auto loading
+* Add support for region auto-detection when using instance profiles
+* Update requests to use HTTP GET where possible for better retry support
+
 # v0.1.20
 * Fix credential loading bug (#11)
 

data/lib/miasma-aws/version.rb

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

data/lib/miasma/contrib/aws.rb

@@ -344,7 +344,7 @@ module Miasma
             attribute :aws_host, String
             attribute :aws_bucket_region, String
             attribute :api_endpoint, String, :required => true, :default => 'amazonaws.com'
-            attribute :euca_compat, [String, Symbol], :allowed_values => [:path, :dns], :coerce => lambda{|v| v.is_a?(String) ? v.to_sym : v}
+            attribute :euca_compat, Symbol, :allowed_values => [:path, :dns], :coerce => lambda{|v| v.is_a?(String) ? v.to_sym : v}
             attribute :euca_dns_map, Smash, :coerce => lambda{|v| v.to_smash}, :default => Smash.new
             attribute :ssl_enabled, [TrueClass, FalseClass], :default => true
 
@@ -355,11 +355,13 @@ module Miasma
           # AWS config file key remapping
           klass.const_set(:CONFIG_FILE_REMAP,
             Smash.new(
-              'region' => 'aws_region'
+              'region' => 'aws_region',
+              'role_arn' => 'aws_sts_role_arn'
             )
           )
           klass.const_set(:INSTANCE_PROFILE_HOST, 'http://169.254.169.254')
           klass.const_set(:INSTANCE_PROFILE_PATH, 'latest/meta-data/iam/security-credentials')
+          klass.const_set(:INSTANCE_PROFILE_AZ_PATH, 'latest/meta-data/placement/availability-zone')
         end
 
         # Build new API for specified type using current provider / creds
@@ -412,7 +414,13 @@ module Miasma
         # @param creds [Hash]
         # @return [TrueClass]
         def load_instance_credentials!(creds)
-          role = HTTP.get(self.class.const_get(:INSTANCE_PROFILE_HOST)).body.to_s.strip
+          role = HTTP.get(
+            [
+              self.class.const_get(:INSTANCE_PROFILE_HOST),
+              self.class.const_get(:INSTANCE_PROFILE_PATH),
+              ''
+            ].join('/')
+          ).body.to_s.strip
           data = HTTP.get(
             [
               self.class.const_get(:INSTANCE_PROFILE_HOST),
@@ -420,10 +428,27 @@ module Miasma
               role
             ].join('/')
           ).body
+          unless(data.is_a?(Hash))
+            begin
+              data = MultiJson.load(data.to_s)
+            rescue MultiJson::ParseError
+              data = {}
+            end
+          end
           creds[:aws_access_key_id] = data['AccessKeyId']
           creds[:aws_secret_access_key] = data['SecretAccessKey']
           creds[:aws_sts_token] = data['Token']
           creds[:aws_sts_token_expires] = Time.xmlschema(data['Expiration'])
+          unless(creds[:aws_region])
+            az = HTTP.get(
+              [
+                self.class.const_get(:INSTANCE_PROFILE_HOST),
+                self.class.const_get(:INSTANCE_PROFILE_AZ_PATH)
+              ].join('/')
+            ).body.to_s.strip
+            az.sub!(/[a-zA-Z]+$/, '')
+            creds[:aws_region] = az
+          end
           true
         end
 
@@ -486,12 +511,16 @@ module Miasma
                 end
               end
             end
-            l_config.fetch(
+
+            l_profile = l_config.fetch(profile, Smash.new)
+            l_source_profile = l_config.fetch(l_profile[:source_profile], Smash.new)
+
+            l_creds = l_config.fetch(
               :default, Smash.new
             ).merge(
-              l_config.fetch(
-                profile, Smash.new
-              )
+              l_source_profile
+            ).merge(
+              l_profile
             )
           else
             Smash.new
@@ -506,7 +535,7 @@ module Miasma
                 self.class.const_defined?(:EUCA_API_SERVICE) ?
                 self.class::EUCA_API_SERVICE :
                 self.class::API_SERVICE
-              ).downcase
+              )
             else
               service_name = self.class::API_SERVICE.downcase
             end

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

@@ -13,6 +13,8 @@ module Miasma
 
         # Service name of the API
         API_SERVICE = 'cloudformation'
+        # Service name of the eucalyptus API
+        EUCA_API_SERVICE = 'CloudFormation'
         # Supported version of the AutoScaling API
         API_VERSION = '2010-05-15'
 
@@ -63,35 +65,27 @@ module Miasma
             descriptions = all_result_pages(nil, :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member') do |options|
               request(
                 :path => '/',
-                :form => options.merge(d_params),
-                :method => :post
+                :params => options.merge(d_params),
+                :method => :get
               )
             end
-            policy = request(
-              :path => '/',
-              :method => :get,
-              :params => Smash.new(
-                'Action' => 'GetStackPolicy',
-                'StackName' => stack.id
+          else
+            lists = all_result_pages(nil, :body, 'ListStacksResponse', 'ListStacksResult', 'StackSummaries', 'member') do |options|
+              request(
+                :path => '/',
+                :form => options.merge(l_params),
+                :method => :post
               )
-            ).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 => '/',
-              :form => options.merge(l_params),
-              :method => :post
-            )
-          end.map do |stk|
-            desc = descriptions.detect do |d_stk|
-              d_stk['StackId'] == stk['StackId']
-            end || Smash.new
-            stk.merge!(desc)
+          (lists || descriptions).map do |stk|
+            if(lists)
+              desc = descriptions.detect do |d_stk|
+                d_stk['StackId'] == stk['StackId']
+              end || Smash.new
+              stk.merge!(desc)
+            end
             if(stack)
               next if stack.id != stk['StackId'] && stk['StackId'].split('/')[1] != stack.id
             end
@@ -136,7 +130,8 @@ module Miasma
                 }
               ],
               :custom => Smash.new(
-                :stack_policy_body => policy
+                :stack_policy => stk['StackPolicyBody'],
+                :stack_policy_url => stk['StackPolicyURL']
               )
             ).valid_state
           end
@@ -314,8 +309,8 @@ module Miasma
           results = all_result_pages(nil, :body, 'DescribeStackResourcesResponse', 'DescribeStackResourcesResult', 'StackResources', 'member') do |options|
             request(
               :path => '/',
-              :method => :post,
-              :form => options.merge(
+              :method => :get,
+              :params => options.merge(
                 Smash.new(
                   'Action' => 'DescribeStackResources',
                   'StackName' => stack.id
@@ -354,8 +349,8 @@ module Miasma
           results = all_result_pages(nil, :body, 'DescribeStackEventsResponse', 'DescribeStackEventsResult', 'StackEvents', 'member') do |options|
             request(
               :path => '/',
-              :method => :post,
-              :form => options.merge(
+              :method => :get,
+              :params => 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.20
+  version: 0.1.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -134,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
-has_rdoc: