miasma-aws 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc0b7f33082a8144660f29aac8f48f73f2df07c
-  data.tar.gz: 7a6122fa2188e2b7d516de4497d21aa5d6247f42
+  metadata.gz: caa36177f0ea2511cec15e3f84b55ab542845255
+  data.tar.gz: c2e70dcbce33f6514fd110a2d1e90f2baf148675
 SHA512:
-  metadata.gz: 106e62613c03de1fb70e1cf28d0ffd183ba4ca1036dc2621d18d6a1b10c0b79f4e2090cb3464c735b5ae2ce69a76d15398a962fe5e1331512aae12c608911c27
-  data.tar.gz: a5126856fe8f37891bceaf382482690c32d185926d1239d06221388789c25294b1be63628d59d7fcd4673dd96ff7c35fc85599e662d6b6c7cffd1bcf86112ce6
+  metadata.gz: 7aff9a89bb222d9a3a247d167a3536759b4008aa1bb6fc83ab5baf536292452a7524319cbd113ea998c2be0bf3ed92833af6336f7d58f37f375b2e0ed46546c8
+  data.tar.gz: 488ba3c0126a6d38795edd6d78f5e060b89370c9c34ababcd1f5996cff2bab4e428a924d0ecc947e0756e7686d8357bb3f4c60bbf02a357c1c717f866ce5df0d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.6
+* [enhancement] Support previous parameter reuse on stack update (#41)
+* [feature] Add support for ECS task profile (#40)
+
 # v0.3.4
 * [fix] Support template url for stack models (#39)
 

data/README.md

@@ -33,6 +33,10 @@ Miasma.api(
 
 * `aws_iam_instance_profile` - Extract and use instance IAM credentials
 
+### ECS task related attributes
+
+* `aws_ecs_task_profile` - Extract and use ECS task IAM credentials
+
 ### Secure Token Service related:
 
 * `aws_sts_token` - Set STS token to use with current key ID and secret

data/lib/miasma-aws/api.rb

@@ -3,6 +3,7 @@ require 'miasma'
 module Miasma
   module Contrib
     module Aws
+      # AWS API helpers
       module Api
         autoload :Sts, 'miasma-aws/api/sts'
         autoload :Iam, 'miasma-aws/api/iam'

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

@@ -4,12 +4,13 @@ module Miasma
   module Contrib
     module Aws
       module Api
+        # IAM helper class
         class Iam < Miasma::Types::Api
 
           # Service name of the API
-          API_SERVICE = 'iam'
+          API_SERVICE = 'iam'.freeze
           # Supported version of the IAM API
-          API_VERSION = '2010-05-08'
+          API_VERSION = '2010-05-08'.freeze
 
           include Contrib::AwsApiCore::ApiCommon
           include Contrib::AwsApiCore::RequestUtils

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

@@ -4,12 +4,13 @@ module Miasma
   module Contrib
     module Aws
       module Api
+        # STS helper class
         class Sts < Miasma::Types::Api
 
           # Service name of the API
-          API_SERVICE = 'sts'
+          API_SERVICE = 'sts'.freeze
           # Supported version of the STS API
-          API_VERSION = '2011-06-15'
+          API_VERSION = '2011-06-15'.freeze
 
           include Contrib::AwsApiCore::ApiCommon
           include Contrib::AwsApiCore::RequestUtils

data/lib/miasma-aws/version.rb

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

data/lib/miasma/contrib/aws.rb

@@ -4,14 +4,17 @@ require 'miasma/utils/smash'
 require 'time'
 require 'openssl'
 
+# Miasma
 module Miasma
   module Contrib
+    # AWS API implementations
     module Aws
       autoload :Api, 'miasma-aws/api'
     end
     # Core API for AWS access
     class AwsApiCore
 
+      # Utility methods for API requests
       module RequestUtils
 
         # Fetch all results when tokens are being used
@@ -34,6 +37,11 @@ module Miasma
           end
           set = result.get(*result_key.slice(0, 3))
           if(set.is_a?(Hash) && set['NextToken'])
+            [content].flatten.compact.each do |item|
+              if(item.is_a?(Hash))
+                item['NextToken'] = set['NextToken']
+              end
+            end
             list += all_result_pages(set['NextToken'], *result_key, &block)
           end
           list.compact
@@ -127,8 +135,8 @@ module Miasma
         # @param string [String] string to escape
         # @return [String] escaped string
         def safe_escape(string)
-          string.to_s.gsub(/([^a-zA-Z0-9_.\-~])/) do
-            '%' << $1.unpack('H2' * $1.bytesize).join('%').upcase
+          string.to_s.gsub(/([^a-zA-Z0-9_.\-~])/) do |match|
+            '%' << match.unpack('H2' * match.bytesize).join('%').upcase
           end
         end
 
@@ -168,7 +176,8 @@ module Miasma
         # @return [String] signature
         def generate(http_method, path, opts)
           signature = generate_signature(http_method, path, opts)
-          "#{algorithm} Credential=#{access_key}/#{credential_scope}, SignedHeaders=#{signed_headers(opts[:headers])}, Signature=#{signature}"
+          "#{algorithm} Credential=#{access_key}/#{credential_scope}, " \
+            "SignedHeaders=#{signed_headers(opts[:headers])}, Signature=#{signature}"
         end
 
         # Generate URL with signed params
@@ -185,7 +194,10 @@ module Miasma
               'X-Amz-Credential' => "#{access_key}/#{credential_scope}"
             )
           )
-          signature = generate_signature(http_method, path, opts.merge(:body => 'UNSIGNED-PAYLOAD'))
+          signature = generate_signature(
+            http_method, path,
+            opts.merge(:body => 'UNSIGNED-PAYLOAD')
+          )
           params = opts[:params].merge('X-Amz-Signature' => signature)
           "https://#{opts[:headers]['Host']}/#{path}?#{canonical_query(params)}"
         end
@@ -326,6 +338,7 @@ module Miasma
 
       end
 
+      # Common API setup
       module ApiCommon
 
         def self.included(klass)
@@ -340,17 +353,22 @@ module Miasma
             attribute :aws_sts_session_token, String
             attribute :aws_sts_session_token_code, [String, Proc, Method]
             attribute :aws_sts_mfa_serial_number, [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_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
             attribute :aws_secret_access_key, String, :required => true
             attribute :aws_iam_instance_profile, [TrueClass, FalseClass], :default => false
+            attribute :aws_ecs_task_profile, [TrueClass, FalseClass], :default => false
             attribute :aws_region, String, :required => true
             attribute :aws_host, String
             attribute :aws_bucket_region, String
             attribute :api_endpoint, String, :required => true, :default => 'amazonaws.com'
-            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 :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
           end
 
@@ -361,11 +379,21 @@ module Miasma
               'role_arn' => 'aws_sts_role_arn',
               'aws_security_token' => 'aws_sts_token',
               'aws_session_token' => 'aws_sts_session_token'
-            )
+            ).to_smash.freeze
+          )
+          klass.const_set(:INSTANCE_PROFILE_HOST, 'http://169.254.169.254'.freeze)
+          klass.const_set(
+            :INSTANCE_PROFILE_PATH,
+            'latest/meta-data/iam/security-credentials'.freeze
+          )
+          klass.const_set(
+            :INSTANCE_PROFILE_AZ_PATH,
+            'latest/meta-data/placement/availability-zone'.freeze
+          )
+          klass.const_set(:ECS_TASK_PROFILE_HOST, 'http://169.254.170.2'.freeze)
+          klass.const_set(
+            :ECS_TASK_PROFILE_PATH, ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']
           )
-          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
@@ -406,7 +434,9 @@ module Miasma
             )
           end
           if(creds[:aws_iam_instance_profile])
-            load_instance_credentials!(creds)
+            self.class.const_get(:ECS_TASK_PROFILE_PATH).nil? ?
+              load_instance_credentials!(creds) :
+              load_ecs_credentials(creds)
           end
           true
         end
@@ -418,7 +448,7 @@ module Miasma
         # @return [TrueClass]
         def after_setup(creds)
           skip = self.class.attributes.keys.map(&:to_s)
-          creds.each do |k,v|
+          creds.each do |k, v|
             k = k.to_s
             if(k.start_with?('aws_') && !skip.include?(k))
               data[k] = v
@@ -452,33 +482,82 @@ module Miasma
               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'])
+          creds.merge!(extract_creds(data))
           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
+            creds[:aws_region] = get_region
           end
           true
         end
 
+        # Attempt to load credentials from instance metadata
+        #
+        # @param creds [Hash]
+        # @return [TrueClass]
+        def load_ecs_credentials!(creds)
+          # As per docs ECS_TASK_PROFILE_PATH is defined as
+          # /credential_provider_version/credentials?id=task_UUID
+          # where AWS fills in the version and UUID.
+          # @see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html
+          data = HTTP.get(
+            [
+              self.class.const_get(:ECS_TASK_PROFILE_HOST),
+              self.class.const_get(:ECS_TASK_PROFILE_PATH)
+            ].join
+          ).body
+          unless(data.is_a?(Hash))
+            begin
+              data = MultiJson.load(data.to_s)
+            rescue MultiJson::ParseError
+              data = {}
+            end
+          end
+          creds.merge!(extract_creds(data))
+          unless(creds[:aws_region])
+            creds[:aws_region] = get_region
+          end
+          true
+        end
+
+        # Return hash with needed information to assume role
+        #
+        # @param data [Hash]
+        # @return [Hash]
+        def extract_creds(data)
+          c = Smash.new
+          c[:aws_access_key_id] = data['AccessKeyId']
+          c[:aws_secret_access_key] = data['SecretAccessKey']
+          c[:aws_sts_token] = data['Token']
+          c[:aws_sts_token_expires] = Time.xmlschema(data['Expiration'])
+          c[:aws_sts_role_arn] = data['RoleArn'] # used in ECS Role but not instance role
+          c
+        end
+
+        # Return region from meta-data service
+        #
+        # @return [String]
+        def get_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]+$/, '')
+          az
+        end
+
         def sts_mfa_session!(creds)
           if(sts_mfa_session_update_required?(creds))
             sts = Miasma::Contrib::Aws::Api::Sts.new(
               :aws_access_key_id => creds[:aws_access_key_id],
               :aws_secret_access_key => creds[:aws_secret_access_key],
               :aws_region => creds.fetch(:aws_sts_region, 'us-east-1'),
-              :aws_credentials_file => creds.fetch(:aws_credentials_file, aws_credentials_file),
+              :aws_credentials_file => creds.fetch(
+                :aws_credentials_file, aws_credentials_file
+              ),
               :aws_config_file => creds.fetch(:aws_config_file, aws_config_file),
               :aws_profile_name => creds[:aws_profile_name],
-              :aws_host => creds[:aws_sts_host],
+              :aws_host => creds[:aws_sts_host]
             )
             creds.merge!(
               sts.mfa_session(
@@ -500,7 +579,9 @@ module Miasma
               :aws_access_key_id => get_credential(:access_key_id, creds),
               :aws_secret_access_key => get_credential(:secret_access_key, creds),
               :aws_region => creds.fetch(:aws_sts_region, 'us-east-1'),
-              :aws_credentials_file => creds.fetch(:aws_credentials_file, aws_credentials_file),
+              :aws_credentials_file => creds.fetch(
+                :aws_credentials_file, aws_credentials_file
+              ),
               :aws_config_file => creds.fetch(:aws_config_file, aws_config_file),
               :aws_host => creds[:aws_sts_host],
               :aws_sts_token => creds[:aws_sts_session_token]
@@ -521,7 +602,7 @@ module Miasma
         # @param profile [String] name of profile to load
         # @return [Smash]
         def load_aws_file(file_path, profile)
-          if(File.exists?(file_path))
+          if(File.exist?(file_path))
             l_config = Smash.new.tap do |creds|
               key = nil
               File.readlines(file_path).each_with_index do |line, idx|
@@ -529,13 +610,18 @@ module Miasma
                 next if line.empty? || line.start_with?('#')
                 if(line.start_with?('['))
                   unless(line.end_with?(']'))
-                    raise ArgumentError.new("Failed to parse aws file! (#{file_path} line #{idx + 1})")
+                    raise ArgumentError.new(
+                      "Failed to parse aws file! (#{file_path} line #{idx + 1})"
+                    )
                   end
                   key = line.tr('[]', '').strip.sub(/^profile /, '')
                   creds[key] = Smash.new
                 else
                   unless(key)
-                    raise ArgumentError.new("Failed to parse aws file! (#{file_path} line #{idx + 1}) - No section defined!")
+                    raise ArgumentError.new(
+                      "Failed to parse aws file! (#{file_path} line #{idx + 1}) " \
+                        '- No section defined!'
+                    )
                   end
                   line_args = line.split('=', 2).map(&:strip)
                   line_args.first.replace(
@@ -545,14 +631,18 @@ module Miasma
                   )
                   if(line_args.last.start_with?('"'))
                     unless(line_args.last.end_with?('"'))
-                      raise ArgumentError.new("Failed to parse aws file! (#{file_path} line #{idx + 1})")
+                      raise ArgumentError.new(
+                        "Failed to parse aws file! (#{file_path} line #{idx + 1})"
+                      )
                     end
                     line_args.last.replace(line_args.last[1..-2]) # NOTE: strip quoted values
                   end
                   begin
                     creds[key].merge!(Smash[*line_args])
                   rescue => e
-                    raise ArgumentError.new("Failed to parse aws file! (#{file_path} line #{idx + 1})")
+                    raise ArgumentError.new(
+                      "Failed to parse aws file! (#{file_path} line #{idx + 1})"
+                    )
                   end
                 end
               end
@@ -659,7 +749,8 @@ module Miasma
           dest, options = request_args
           path = URI.parse(dest).path
           options = options ? options.to_smash : Smash.new
-          options[:headers] = Smash[connection.default_options.headers.to_a].merge(options.fetch(:headers, Smash.new))
+          options[:headers] = Smash[connection.default_options.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)
@@ -687,7 +778,7 @@ module Miasma
           end
           signature = signer.generate(http_method, path, options)
           update_request(connection, options)
-          options = Hash[options.map{|k,v|[k.to_sym,v]}]
+          options = Hash[options.map{|k, v| [k.to_sym, v] }]
           connection.auth(signature).send(http_method, dest, options)
         end
 
@@ -705,8 +796,12 @@ module Miasma
         # @return [TrueClass, FalseClass]
         # @note update check only applied if assuming role
         def sts_mfa_session_update_required?(args={})
-          if(args.fetch(:aws_sts_session_token_code, attributes[:aws_sts_session_token_code]))
-            expiry = args.fetch(:aws_sts_session_token_expires, attributes[:aws_sts_session_token_expires])
+          if(args.fetch(:aws_sts_session_token_code,
+            attributes[:aws_sts_session_token_code]))
+            expiry = args.fetch(
+              :aws_sts_session_token_expires,
+              attributes[:aws_sts_session_token_expires]
+            )
             expiry.nil? || expiry <= Time.now - 15
           else
             false

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

@@ -3,12 +3,13 @@ require 'miasma'
 module Miasma
   module Models
     class AutoScale
+      # AWS autoscaling API
       class Aws < AutoScale
 
         # Service name of the API
-        API_SERVICE = 'autoscaling'
+        API_SERVICE = 'autoscaling'.freeze
         # Supported version of the AutoScaling API
-        API_VERSION = '2011-01-01'
+        API_VERSION = '2011-01-01'.freeze
 
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
@@ -49,7 +50,10 @@ module Miasma
           if(group)
             params.merge('AutoScalingGroupNames.member.1' => group.id || group.name)
           end
-          result = all_result_pages(nil, :body, 'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult', 'AutoScalingGroups', 'member') do |options|
+          result = all_result_pages(nil, :body,
+            'DescribeAutoScalingGroupsResponse', 'DescribeAutoScalingGroupsResult',
+            'AutoScalingGroups', 'member'
+          ) do |options|
             request(
               :method => :post,
               :path => '/',
@@ -65,14 +69,15 @@ module Miasma
               :minimum_size => grp['MinSize'],
               :maximum_size => grp['MaxSize'],
               :status => grp['Status'],
-              :load_balancers => [grp.get('LoadBalancerNames', 'member')].flatten(1).compact.map{|i|
+              :load_balancers => [
+                grp.get('LoadBalancerNames', 'member')
+              ].flatten(1).compact.map{|i|
                 Group::Balancer.new(self, :id => i, :name => i)
               }
             ).valid_state
           end
         end
 
-
         # Return all auto scale groups
         #
         # @param options [Hash] filter

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

@@ -8,9 +8,9 @@ module Miasma
       class Aws < Compute
 
         # Service name of the API
-        API_SERVICE = 'ec2'
+        API_SERVICE = 'ec2'.freeze
         # Supported version of the EC2 API
-        API_VERSION = '2014-06-15'
+        API_VERSION = '2014-06-15'.freeze
 
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
@@ -23,7 +23,7 @@ module Miasma
           'terminated' => :terminated,
           'stopping' => :pending,
           'stopped' => :stopped
-        )
+        ).to_smash(:freeze)
 
         # @todo catch bad lookup and clear model
         def server_reload(server)
@@ -35,15 +35,24 @@ module Miasma
               'InstanceId.1' => server.id
             }
           )
-          srv = result.get(:body, 'DescribeInstancesResponse', 'reservationSet', 'item', 'instancesSet', 'item')
+          srv = result.get(:body,
+            'DescribeInstancesResponse', 'reservationSet',
+            'item', 'instancesSet', 'item'
+          )
           server.load_data(
             :id => srv[:instanceId],
-            :name => [srv.fetch(:tagSet, :item, [])].flatten.map{|tag| tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'}.compact.first,
+            :name => [srv.fetch(:tagSet, :item, [])].flatten.map{|tag|
+              tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'
+            }.compact.first,
             :image_id => srv[:imageId],
             :flavor_id => srv[:instanceType],
             :state => SERVER_STATE_MAP.fetch(srv.get(:instanceState, :name), :pending),
-            :addresses_private => [Server::Address.new(:version => 4, :address => srv[:privateIpAddress])],
-            :addresses_public => [Server::Address.new(:version => 4, :address => srv[:ipAddress])],
+            :addresses_private => [
+              Server::Address.new(:version => 4, :address => srv[:privateIpAddress])
+            ],
+            :addresses_public => [
+              Server::Address.new(:version => 4, :address => srv[:ipAddress])
+            ],
             :status => srv.get(:instanceState, :name),
             :key_name => srv[:keyName]
           )
@@ -80,7 +89,9 @@ module Miasma
                 'MaxCount' => 1
               }
             )
-            server.id = result.get(:body, 'RunInstancesResponse', 'instancesSet', 'item', 'instanceId')
+            server.id = result.get(:body,
+              'RunInstancesResponse', 'instancesSet', 'item', 'instanceId'
+            )
             server.valid_state
             request(
               :method => :post,
@@ -99,7 +110,9 @@ 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|
+          results = all_result_pages(nil, :body,
+            'DescribeInstancesResponse', 'reservationSet', 'item'
+          ) do |options|
             request(
               :method => :post,
               :path => '/',
@@ -108,17 +121,23 @@ module Miasma
               )
             )
           end
-          results.map do |srv|
-            [srv[:instancesSet][:item]].flatten.compact.map do |srv|
+          results.map do |server|
+            [server[:instancesSet][:item]].flatten.compact.map do |srv|
               Server.new(
                 self,
                 :id => srv[:instanceId],
-                :name => srv.fetch(:tagSet, :item, []).map{|tag| tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'}.compact.first,
+                :name => srv.fetch(:tagSet, :item, []).map{|tag|
+                  tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'
+                }.compact.first,
                 :image_id => srv[:imageId],
                 :flavor_id => srv[:instanceType],
                 :state => SERVER_STATE_MAP.fetch(srv.get(:instanceState, :name), :pending),
-                :addresses_private => [Server::Address.new(:version => 4, :address => srv[:privateIpAddress])],
-                :addresses_public => [Server::Address.new(:version => 4, :address => srv[:ipAddress])],
+                :addresses_private => [
+                  Server::Address.new(:version => 4, :address => srv[:privateIpAddress])
+                ],
+                :addresses_public => [
+                  Server::Address.new(:version => 4, :address => srv[:ipAddress])
+                ],
                 :status => srv.get(:instanceState, :name),
                 :key_name => srv[:keyName]
               ).valid_state
@@ -129,5 +148,4 @@ module Miasma
       end
     end
   end
-
 end

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

@@ -3,15 +3,16 @@ require 'miasma'
 module Miasma
   module Models
     class LoadBalancer
+      # AWS load balancer API
       class Aws < LoadBalancer
 
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
 
         # Service name of API
-        API_SERVICE = 'elasticloadbalancing'
+        API_SERVICE = 'elasticloadbalancing'.freeze
         # Supported version of the ELB API
-        API_VERSION = '2012-06-01'
+        API_VERSION = '2012-06-01'.freeze
 
         # Save load balancer
         #
@@ -23,7 +24,7 @@ module Miasma
               'LoadBalancerName' => balancer.name
             )
             availability_zones.each_with_index do |az, i|
-              params["AvailabilityZones.member.#{i+1}"] = az
+              params["AvailabilityZones.member.#{i + 1}"] = az
             end
             if(balancer.listeners)
               balancer.listeners.each_with_index do |listener, i|
@@ -47,7 +48,9 @@ module Miasma
               )
             )
             balancer.public_addresses = [
-              :address => result.get(:body, 'CreateLoadBalancerResponse', 'CreateLoadBalancerResult', 'DNSName')
+              :address => result.get(:body,
+                'CreateLoadBalancerResponse', 'CreateLoadBalancerResult', 'DNSName'
+              )
             ]
             balancer.load_data(:id => balancer.name).valid_state
             if(balancer.health_check)
@@ -114,9 +117,12 @@ module Miasma
         def load_balancer_data(balancer=nil)
           params = Smash.new('Action' => 'DescribeLoadBalancers')
           if(balancer)
-            params.merge!('LoadBalancerNames.member.1' => balancer.id || balancer.name)
+            params['LoadBalancerNames.member.1'] = balancer.id || balancer.name
           end
-          result = all_result_pages(nil, :body, 'DescribeLoadBalancersResponse', 'DescribeLoadBalancersResult', 'LoadBalancerDescriptions', 'member') do |options|
+          result = all_result_pages(nil, :body,
+            'DescribeLoadBalancersResponse', 'DescribeLoadBalancersResult',
+            'LoadBalancerDescriptions', 'member'
+          ) do |options|
             request(
               :method => :post,
               :path => '/',
@@ -124,7 +130,10 @@ module Miasma
             )
           end
           if(balancer)
-            health_result = all_result_pages(nil, :body, 'DescribeInstanceHealthResponse', 'DescribeInstanceHealthResult', 'InstanceStates', 'member') do |options|
+            health_result = all_result_pages(nil, :body,
+              'DescribeInstanceHealthResponse', 'DescribeInstanceHealthResult',
+              'InstanceStates', 'member'
+            ) do |options|
               request(
                 :method => :post,
                 :path => '/',
@@ -156,7 +165,13 @@ module Miasma
               ).merge(
                 health_result.nil? ? {} : Smash.new(
                   :server_states => health_result.nil? ? nil : health_result.map{|i|
-                    Balancer::ServerState.new(self.api_for(:compute), :id => i['InstanceId'], :status => i['State'], :reason => i['ReasonCode'], :state => i['State'] == 'InService' ? :up : :down)
+                    Balancer::ServerState.new(
+                      self.api_for(:compute),
+                      :id => i['InstanceId'],
+                      :status => i['State'],
+                      :reason => i['ReasonCode'],
+                      :state => i['State'] == 'InService' ? :up : :down
+                    )
                   }
                 )
               )
@@ -206,7 +221,9 @@ module Miasma
               :form => Smash.new(
                 'Action' => 'DescribeAvailabilityZones'
               )
-            ).fetch(:body, 'DescribeAvailabilityZonesResponse', 'availabilityZoneInfo', 'item', [])
+            ).fetch(:body,
+              'DescribeAvailabilityZonesResponse', 'availabilityZoneInfo', 'item', []
+            )
             [res].flatten.compact.map do |item|
               if(item['zoneState'] == 'available')
                 item['zoneName']

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

@@ -3,6 +3,7 @@ require 'miasma'
 module Miasma
   module Models
     class Orchestration
+      # AWS Orchestration API
       class Aws < Orchestration
 
         # Extended stack model to provide AWS specific stack options
@@ -12,20 +13,20 @@ module Miasma
         end
 
         # Service name of the API
-        API_SERVICE = 'cloudformation'
+        API_SERVICE = 'cloudformation'.freeze
         # Service name of the eucalyptus API
-        EUCA_API_SERVICE = 'CloudFormation'
+        EUCA_API_SERVICE = 'CloudFormation'.freeze
         # Supported version of the AutoScaling API
-        API_VERSION = '2010-05-15'
+        API_VERSION = '2010-05-15'.freeze
 
         # Valid stack lookup states
         STACK_STATES = [
-          "CREATE_COMPLETE", "CREATE_FAILED", "CREATE_IN_PROGRESS", "DELETE_FAILED",
-          "DELETE_IN_PROGRESS", "ROLLBACK_COMPLETE", "ROLLBACK_FAILED", "ROLLBACK_IN_PROGRESS",
-          "UPDATE_COMPLETE", "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_IN_PROGRESS",
-          "UPDATE_ROLLBACK_COMPLETE", "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS", "UPDATE_ROLLBACK_FAILED",
-          "UPDATE_ROLLBACK_IN_PROGRESS"
-        ]
+          'CREATE_COMPLETE', 'CREATE_FAILED', 'CREATE_IN_PROGRESS', 'DELETE_FAILED',
+          'DELETE_IN_PROGRESS', 'ROLLBACK_COMPLETE', 'ROLLBACK_FAILED', 'ROLLBACK_IN_PROGRESS',
+          'UPDATE_COMPLETE', 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS', 'UPDATE_IN_PROGRESS',
+          'UPDATE_ROLLBACK_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS', 'UPDATE_ROLLBACK_FAILED',
+          'UPDATE_ROLLBACK_IN_PROGRESS'
+        ].map(&:freeze).freeze
 
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
@@ -48,7 +49,7 @@ module Miasma
             :api => :orchestration,
             :collection => :stacks
           )
-        )
+        ).to_smash(:freeze)
 
         # Fetch stacks or update provided stack data
         #
@@ -62,7 +63,10 @@ module Miasma
           end
           if(stack)
             d_params['StackName'] = stack.id
-            descriptions = all_result_pages(nil, :body, 'DescribeStacksResponse', 'DescribeStacksResult', 'Stacks', 'member') do |options|
+            descriptions = all_result_pages(nil, :body,
+              'DescribeStacksResponse', 'DescribeStacksResult',
+              'Stacks', 'member'
+            ) do |options|
               request(
                 :method => :post,
                 :path => '/',
@@ -70,7 +74,10 @@ module Miasma
               )
             end
           else
-            lists = all_result_pages(nil, :body, 'ListStacksResponse', 'ListStacksResult', 'StackSummaries', 'member') do |options|
+            lists = all_result_pages(nil, :body,
+              'ListStacksResponse', 'ListStacksResult',
+              'StackSummaries', 'member'
+            ) do |options|
               request(
                 :method => :post,
                 :path => '/',
@@ -143,9 +150,18 @@ module Miasma
         # @return [Models::Orchestration::Stack]
         def stack_save(stack)
           params = Smash.new('StackName' => stack.name)
+          if(stack.dirty?(:parameters))
+            initial_parameters = stack.data[:parameters] || {}
+          else
+            initial_parameters = {}
+          end
           (stack.parameters || {}).each_with_index do |pair, idx|
             params["Parameters.member.#{idx + 1}.ParameterKey"] = pair.first
-            params["Parameters.member.#{idx + 1}.ParameterValue"] = pair.last
+            if(initial_parameters[pair.first] == pair.last)
+              params["Parameters.member.#{idx + 1}.UsePreviousValue"] = true
+            else
+              params["Parameters.member.#{idx + 1}.ParameterValue"] = pair.last
+            end
           end
           (stack.capabilities || []).each_with_index do |cap, idx|
             params["Capabilities.member.#{idx + 1}"] = cap
@@ -171,12 +187,10 @@ module Miasma
           end
           if(stack.template_url)
             params['TemplateURL'] = stack.template_url
+          elsif(!stack.dirty?(:template) && stack.persisted?)
+            params['UsePreviousTemplate'] = true
           else
-            if(!stack.dirty?(:template) && stack.persisted?)
-              params['UsePreviousTemplate'] = true
-            else
-              params['TemplateBody'] = MultiJson.dump(stack.template)
-            end
+            params['TemplateBody'] = MultiJson.dump(stack.template)
           end
           if(stack.persisted?)
             result = request(
@@ -316,7 +330,10 @@ module Miasma
         # @param stack [Models::Orchestration::Stack]
         # @return [Array<Models::Orchestration::Stack::Resource>]
         def resource_all(stack)
-          results = all_result_pages(nil, :body, 'ListStackResourcesResponse', 'ListStackResourcesResult', 'StackResourceSummaries', 'member') do |options|
+          results = all_result_pages(nil, :body,
+            'ListStackResourcesResponse', 'ListStackResourcesResult',
+            'StackResourceSummaries', 'member'
+          ) do |options|
             request(
               :method => :post,
               :path => '/',
@@ -353,7 +370,10 @@ module Miasma
               'LogicalResourceId' => resource.logical_id,
               'StackName' => resource.stack.name
             )
-          ).get(:body, 'DescribeStackResourceResponse', 'DescribeStackResourceResult', 'StackResourceDetail')
+          ).get(:body,
+            'DescribeStackResourceResponse', 'DescribeStackResourceResult',
+            'StackResourceDetail'
+          )
           resource.updated = result['LastUpdatedTimestamp']
           resource.type = result['ResourceType']
           resource.state = result['ResourceStatus'].downcase.to_sym
@@ -368,7 +388,11 @@ module Miasma
         # @param stack [Models::Orchestration::Stack]
         # @return [Array<Models::Orchestration::Stack::Event>]
         def event_all(stack, evt_id=nil)
-          results = all_result_pages(nil, :body, 'DescribeStackEventsResponse', 'DescribeStackEventsResult', 'StackEvents', 'member') do |options|
+          evt_id = stack.custom[:last_event_token] if evt_id == true
+          results = all_result_pages(evt_id, :body,
+            'DescribeStackEventsResponse', 'DescribeStackEventsResult',
+            'StackEvents', 'member'
+          ) do |options|
             request(
               :method => :post,
               :path => '/',
@@ -379,6 +403,7 @@ module Miasma
             )
           end
           events = results.map do |event|
+            stack.custom[:last_event_token] = event['NextToken'] if event['NextToken']
             Stack::Event.new(
               stack,
               :id => event['EventId'],
@@ -393,8 +418,7 @@ module Miasma
           end
           if(evt_id)
             idx = events.index{|d| d.id == evt_id}
-            idx ? idx + 1 : 0
-            events.slice(0, idx)
+            idx ? events.slice(0, idx) : events
           else
             events
           end

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

@@ -5,14 +5,15 @@ require 'miasma'
 module Miasma
   module Models
     class Storage
+      # AWS storage API
       class Aws < Storage
 
         # Service name of the API
-        API_SERVICE = 's3'
+        API_SERVICE = 's3'.freeze
         # Service name of the API in eucalyptus
-        EUCA_API_SERVICE = 'objectstorage'
+        EUCA_API_SERVICE = 'objectstorage'.freeze
         # Supported version of the Storage API
-        API_VERSION = '2006-03-01'
+        API_VERSION = '2006-03-01'.freeze
 
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
@@ -39,7 +40,9 @@ module Miasma
           end
           set = result.get(*result_key.slice(0, 2))
           if(set.is_a?(Hash) && set['IsTruncated'] && set['Contents'])
-            content_key = (set['Contents'].respond_to?(:last) ? set['Contents'].last : set['Contents'])['Key']
+            content_key = (
+              set['Contents'].respond_to?(:last) ? set['Contents'].last : set['Contents']
+            )['Key']
             list += all_result_pages(content_key, *result_key, &block)
           end
           list.compact
@@ -256,7 +259,8 @@ module Miasma
             unless(headers.empty?)
               args[:headers] = headers
             end
-            if(file.attributes[:body].respond_to?(:read) && file.attributes[:body].size >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
+            if(file.attributes[:body].respond_to?(:read) &&
+              file.attributes[:body].size >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
               upload_id = request(
                 args.merge(
                   Smash.new(

data/miasma-aws.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
   s.add_runtime_dependency 'miasma', '>= 0.3.1', '< 0.5'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rake', '~> 10.5.0'
+  s.add_development_dependency 'rubocop', '0.37.2'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'webmock', '~> 1.23.0'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-vcr'
   s.files = Dir['lib/**/*'] + %w(miasma-aws.gemspec README.md CHANGELOG.md LICENSE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -34,30 +34,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +104,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -183,9 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
-has_rdoc: