miasma-aws 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b255feb4bbbd9158ce1928df6b560eafc4b481c5
-  data.tar.gz: 7d54dcb2b4b96012cab3e13d89a772604d9b378d
+  metadata.gz: 7d85deafb276b73b989ef3d36568de4b167c9b66
+  data.tar.gz: b5e8c03917f79eab1054abc8d6f60d87336659ce
 SHA512:
-  metadata.gz: 32ab9151988b38628bec1e50b96e3cc360624c04d656e7c959586a31e6c6bac8d4a5d5e17d2fb47108b01d6ef0dabfa7ecf97036841a29e1e54573453bbdbdcf
-  data.tar.gz: e3ceba8f15b6679679f333676a89fe7caa4ef250a047b75fcd5df15761ac50b42e46661cf15180957fed7af107dcabd91a68970aa548261ea546e2257d20b36a
+  metadata.gz: 61c9b43c6f169e567f42f63e2fff72f158976e71bbbe89eab08029129c142360b7a27c6dd92060eccfa3141119f3d84cf2a93bda2d0ef896b7de28d92505e42c
+  data.tar.gz: b1c62ce90ebeff0cd4770ba20cf26bfa521f6f2e5bc72a91ffcddf0bbe43da1abbc4c52964f91de3ecc92e20572b0280ac2d93fc055ccaa13db3b07022418461

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.24
+* Fix token usage causing request errors
+* Tune retry behavior to isolate valid retry requests
+* Properly pass external ID and session name through for STS
+
 # v0.1.22
 * Fix instance profile credential auto loading
 * Add support for region auto-detection when using instance profiles

data/lib/miasma-aws/api/sts.rb

@@ -25,10 +25,7 @@ module Miasma
             req_params = Smash.new.tap do |params|
               params['Action'] = 'AssumeRole'
               params['RoleArn'] = role_arn
-              params['RoleSessionName'] = args.fetch(
-                :session_name,
-                SecureRandom.uuid.tr('-', '')
-              )
+              params['RoleSessionName'] = args[:session_name] || SecureRandom.uuid.tr('-', '')
               params['ExternalId'] = args[:external_id] if args[:external_id]
             end
             result = request(

data/lib/miasma-aws/version.rb

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

data/lib/miasma/contrib/aws.rb

@@ -335,6 +335,7 @@ module Miasma
             attribute :aws_sts_role_arn, String
             attribute :aws_sts_external_id, String
             attribute :aws_sts_role_session_name, String
+            attribute :aws_sts_region, String
             attribute :aws_credentials_file, String, :required => true, :default => File.join(Dir.home, '.aws/credentials')
             attribute :aws_config_file, String, :required => true, :default => File.join(Dir.home, '.aws/config')
             attribute :aws_access_key_id, String, :required => true
@@ -470,7 +471,11 @@ module Miasma
             :aws_profile_name => creds[:aws_profile_name],
             :aws_host => creds[:aws_host]
           )
-          role_info = sts.assume_role(creds[:aws_sts_role_arn])
+          role_info = sts.assume_role(
+            creds[:aws_sts_role_arn],
+            :session_name => creds[:aws_sts_role_session_name],
+            :external_id => creds[:aws_sts_external_id]
+          )
           creds.merge!(role_info)
           true
         end
@@ -591,12 +596,10 @@ module Miasma
           dest, options = request_args
           path = URI.parse(dest).path
           options = options ? options.to_smash : Smash.new
+          options[:headers] = Smash[connection.default_headers.to_a].merge(options.fetch(:headers, Smash.new))
           if(self.class::API_VERSION)
             if(options[:form])
               options.set(:form, 'Version', self.class::API_VERSION)
-              if(aws_sts_token)
-                options.set(:form, 'SecurityToken', aws_sts_token)
-              end
             else
               options[:params] = options.fetch(
                 :params, Smash.new
@@ -605,21 +608,13 @@ module Miasma
                   'Version' => self.class::API_VERSION
                 )
               )
-              if(aws_sts_token)
-                options.set(:params, 'SecurityToken', aws_sts_token)
-              end
             end
           end
+          if(aws_sts_token)
+            options.set(:headers, 'X-Amz-Security-Token', aws_sts_token)
+          end
           update_request(connection, options)
-          signature = signer.generate(
-            http_method, path, options.merge(
-              Smash.new(
-                :headers => Smash[
-                  connection.default_headers.to_a
-                ]
-              )
-            )
-          )
+          signature = signer.generate(http_method, path, options)
           options = Hash[options.map{|k,v|[k.to_sym,v]}]
           connection.auth(signature).send(http_method, dest, options)
         end
@@ -633,6 +628,31 @@ module Miasma
           true
         end
 
+        # Determine if a retry is allowed based on exception
+        #
+        # @param exception [Exception]
+        # @return [TrueClass, FalseClass]
+        def perform_request_retry(exception)
+          if(exception.is_a?(Miasma::Error::ApiError))
+            if([400, 500, 503].include?(exception.response.code))
+              if(exception.response.code == 400)
+                exception.response.body.to_s.downcase.include?('throttl')
+              else
+                true
+              end
+            else
+              false
+            end
+          end
+        end
+
+        # Always allow retry
+        #
+        # @return [TrueClass]
+        def retryable_allowed?(*_)
+          true
+        end
+
       end
 
     end

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

@@ -51,8 +51,9 @@ module Miasma
           end
           result = all_result_pages(nil, :body, 'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult', 'AutoScalingGroups', 'member') do |options|
             request(
+              :method => :post,
               :path => '/',
-              :params => options.merge(params)
+              :form => options.merge(params)
             )
           end.map do |grp|
             (group || Group.new(self)).load_data(

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

@@ -28,8 +28,9 @@ module Miasma
         # @todo catch bad lookup and clear model
         def server_reload(server)
           result = request(
+            :method => :post,
             :path => '/',
-            :params => {
+            :form => {
               'Action' => 'DescribeInstances',
               'InstanceId.1' => server.id
             }
@@ -52,8 +53,9 @@ module Miasma
         def server_destroy(server)
           if(server.persisted?)
             result = request(
+              :method => :post,
               :path => '/',
-              :params => {
+              :form => {
                 'Action' => 'TerminateInstances',
                 'InstanceId.1' => server.id
               }
@@ -67,8 +69,9 @@ module Miasma
           unless(server.persisted?)
             server.load_data(server.attributes)
             result = request(
+              :method => :post,
               :path => '/',
-              :params => {
+              :form => {
                 'Action' => 'RunInstances',
                 'ImageId' => server.image_id,
                 'InstanceType' => server.flavor_id,
@@ -86,7 +89,13 @@ module Miasma
         # @todo need to add auto pagination helper (as common util)
         def server_all
           results = all_result_pages(nil, :body, 'DescribeInstancesResponse', 'reservationSet', 'item') do |options|
-            request(:path => '/', :params => options.merge('Action' => 'DescribeInstances'))
+            request(
+              :method => :post,
+              :path => '/',
+              :form => options.merge(
+                'Action' => 'DescribeInstances'
+              )
+            )
           end
           results.map do |srv|
             [srv[:instancesSet][:item]].flatten.compact.map do |srv|

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

@@ -38,8 +38,9 @@ module Miasma
               end
             end
             result = request(
+              :method => :post,
               :path => '/',
-              :params => params.merge(
+              :form => params.merge(
                 Smash.new(
                   'Action' => 'CreateLoadBalancer'
                 )
@@ -107,15 +108,17 @@ module Miasma
           end
           result = all_result_pages(nil, :body, 'DescribeLoadBalancersResponse', 'DescribeLoadBalancersResult', 'LoadBalancerDescriptions', 'member') do |options|
             request(
+              :method => :post,
               :path => '/',
-              :params => options.merge(params)
+              :form => options.merge(params)
             )
           end
           if(balancer)
             health_result = all_result_pages(nil, :body, 'DescribeInstanceHealthResponse', 'DescribeInstanceHealthResult', 'InstanceStates', 'member') do |options|
               request(
+                :method => :post,
                 :path => '/',
-                :params => options.merge(
+                :form => options.merge(
                   'LoadBalancerName' => balancer.id || balancer.name,
                   'Action' => 'DescribeInstanceHealth'
                 )
@@ -158,8 +161,9 @@ module Miasma
         def balancer_destroy(balancer)
           if(balancer.persisted?)
             request(
+              :method => :post,
               :path => '/',
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'DeleteLoadBalancer',
                 'LoadBalancerName' => balancer.name
               )
@@ -187,8 +191,9 @@ module Miasma
         def availability_zones
           memoize(:availability_zones) do
             res = api_for(:compute).request(
+              :method => :post,
               :path => '/',
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'DescribeAvailabilityZones'
               )
             ).fetch(:body, 'DescribeAvailabilityZonesResponse', 'availabilityZoneInfo', 'item', [])

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

@@ -64,17 +64,17 @@ module Miasma
             d_params['StackName'] = stack.id
             descriptions = all_result_pages(nil, :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member') do |options|
               request(
+                :method => :post,
                 :path => '/',
-                :params => options.merge(d_params),
-                :method => :get
+                :form => options.merge(d_params)
               )
             end
           else
             lists = all_result_pages(nil, :body, 'ListStacksResponse', 'ListStacksResult', 'StackSummaries', 'member') do |options|
               request(
+                :method => :post,
                 :path => '/',
-                :form => options.merge(l_params),
-                :method => :post
+                :form => options.merge(l_params)
               )
             end
             descriptions = []
@@ -226,8 +226,9 @@ module Miasma
         def stack_destroy(stack)
           if(stack.persisted?)
             request(
+              :method => :post,
               :path => '/',
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'DeleteStack',
                 'StackName' => stack.id
               )
@@ -245,8 +246,9 @@ module Miasma
         def stack_template_load(stack)
           if(stack.persisted?)
             result = request(
+              :method => :post,
               :path => '/',
-              :params => Smash.new(
+              :form => Smash.new(
                 'Action' => 'GetTemplate',
                 'StackName' => stack.id
               )
@@ -308,9 +310,9 @@ module Miasma
         def resource_all(stack)
           results = all_result_pages(nil, :body, 'DescribeStackResourcesResponse', 'DescribeStackResourcesResult', 'StackResources', 'member') do |options|
             request(
+              :method => :post,
               :path => '/',
-              :method => :get,
-              :params => options.merge(
+              :form => options.merge(
                 Smash.new(
                   'Action' => 'DescribeStackResources',
                   'StackName' => stack.id
@@ -348,9 +350,9 @@ module Miasma
         def event_all(stack, evt_id=nil)
           results = all_result_pages(nil, :body, 'DescribeStackEventsResponse', 'DescribeStackEventsResult', 'StackEvents', 'member') do |options|
             request(
+              :method => :post,
               :path => '/',
-              :method => :get,
-              :params => options.merge(
+              :form => options.merge(
                 'Action' => 'DescribeStackEvents',
                 'StackName' => stack.id
               )

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

@@ -437,7 +437,7 @@ module Miasma
         # happening (which implicitly forces :form) or :json is used
         # it will not properly checksum. (but that's probably okay)
         def update_request(con, opts)
-          con.default_headers['x-amz-content-sha256'] = Digest::SHA256.
+          opts[:headers]['x-amz-content-sha256'] = Digest::SHA256.
             hexdigest(opts.fetch(:body, ''))
           true
         end

data/miasma-aws.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Smoggy AWS API'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_development_dependency 'miasma', '>= 0.2.18'
+  s.add_development_dependency 'miasma', '>= 0.2.29'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.18
+        version: 0.2.29
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.18
+        version: 0.2.29
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
+has_rdoc: