miasma-aws 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ddfd1e74d80ada8575393aabf92009624191fa0
-  data.tar.gz: 3733de905ea6752c7118a0ac36091da340a6bff6
+  metadata.gz: dec42282eff92d4366b4b357da8d9cd85b47d649
+  data.tar.gz: e1ae8523f2b7dcbf098cd0f51b0907e9242c549a
 SHA512:
-  metadata.gz: f5ae40e62e7d0aee7d2ca6c260f3fe99d54f85d9760701d8f71cd5b4d7bd5b9bf8017b1a467b8e392e8933dd574b0a08fab46a71090cf5f0db99a41ae59226b1
-  data.tar.gz: a7a9320181bd4079068ba19a0cfe434d3aaf141a81251ad71a06132957bf65f74d2a66f0de3f7f5dd66b208045171063425adeaa07c99d70585df981833443ec
+  metadata.gz: c5d8fec672a5f427edd2bdda8153b1a0c81672beca3edd10396946dda37467c7459625f28d2540affddc77f7e1e2e8091970d4629bc12df90e5825909838031d
+  data.tar.gz: a67cfa892b58da3dfa4dbf16096b4531ebf9eb33979ba2709f3eb4986a038f13b84c314c48b3488b59cff2d2c910eae0ec5328b47f3b3e96b0f55cf7aeaedde8

data/CHANGELOG.md

@@ -1,40 +1,46 @@
-## v0.1.16
+# v0.1.18
+* Make aws file parsing more robust
+* Fix aws config file parsing section name generation (#10)
+* Add support for instance profile credentials
+* Add proxy support for eucalyptus endpoints
+
+# v0.1.16
 * Add new `aws_sts_token` attribute for credentials
 * Automatically include STS token on requests if available
 * Add support for assuming roles via STS
 
-## v0.1.14
+# v0.1.14
 * Fix checksum generation on multi-part uploads
 * Fix paginated fetching of bucket objects
 
-## v0.1.12
+# v0.1.12
 * Update default file paths to use `Dir.home` instead of ~ expansion
 * Fix bug reading .aws/credentials when whitespace is used
 * Add support for .aws/config
 * Auto detect us-east-1 region and do not use custom s3 endpoint
 
-## v0.1.10
+# v0.1.10
 * Fix disable rollback mapping value to on failure
 
-## v0.1.8
+# 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
+# v0.1.6
 * Fix state assignment when undefined within orchestration stacks
 * Fix multi-part S3 uploads
 
-## v0.1.4
+# v0.1.4
 * Fix values set within load balancer reload
 * Ensure state is valid for orchestration stack prior to set
 * Load health status of instances attached to load balancers
 
-## v0.1.2
+# v0.1.2
 * Migrate spec coverage
 * Update storage behavior to use streamable helper
 
-## v0.1.0
+# v0.1.0
 * Initial release

data/README.md

@@ -29,6 +29,10 @@ Miasma.api(
 * `aws_credentials_file` - Specify custom credentials file
 * `aws_config_file` - Specify custom configuration file
 
+### Instance related attributes
+
+* `aws_iam_instance_profile` - Extract and use instance IAM credentials
+
 ### Secure Token Service related:
 
 * `aws_sts_token` - Set STS token to use with current key ID and secret
@@ -42,7 +46,13 @@ Miasma.api(
 
 ### Other attributes
 
-* `aws_host` - Use custom DNS endpoint for API requests
+* `aws_host` - Provide customized full endpoint (without http/https) for API requests
+* `api_endpoint` - Use custom endpoint when constructing (defaults to 'amazonaws.com')
+* `euca_compat`- Enable compatibility mode for eucalyptus. Allowed values:
+  * `path` - Construct using `services/SERVICE_NAME`
+  * `dns` - Construct using DNS subdomains (`SERVICE_NAME.REGION.API_ENDPOINT` by default)
+* `euca_dns_map` - Map services to custom DNS subdomains
+* `ssl_enabled` - Use SSL for API connections
 
 ## Current support matrix
 

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

@@ -9,6 +9,8 @@ module Miasma
 
         # Service name of the API
         API_SERVICE = 's3'
+        # Service name of the API in eucalyptus
+        EUCA_API_SERVICE = 'objectstorage'
         # Supported version of the Storage API
         API_VERSION = '2006-03-01'
 

data/lib/miasma/contrib/aws.rb

@@ -330,7 +330,7 @@ module Miasma
 
         def self.included(klass)
           klass.class_eval do
-            attribute :aws_profile_name, String, :default => 'default'
+            attribute :aws_profile_name, [FalseClass, String], :default => 'default'
             attribute :aws_sts_token, String
             attribute :aws_sts_role_arn, String
             attribute :aws_sts_external_id, String
@@ -339,13 +339,27 @@ module Miasma
             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 => true
             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, [String, Symbol], :allowed_values => [:path, :dns], :coerce => lambda{|v| v.to_sym}
+            attribute :euca_dns_map, Smash, :coerce => lambda{|v| v.to_smash}, :default => Smash.new
+            attribute :ssl_enabled, [TrueClass, FalseClass], :default => true
 
             # @return [Contrib::AwsApiCore::SignatureV4]
             attr_reader :signer
           end
+
+          # AWS config file key remapping
+          klass.const_set(:CONFIG_FILE_REMAP,
+            Smash.new(
+              'region' => 'aws_region'
+            )
+          )
+          klass.const_set(:INSTANCE_PROFILE_HOST, 'http://169.254.169.254')
+          klass.const_set(:INSTANCE_PROFILE_PATH, 'latest/meta-data/iam/security-credentials')
         end
 
         # Build new API for specified type using current provider / creds
@@ -387,6 +401,29 @@ module Miasma
           if(creds[:aws_sts_role_arn])
             sts_assume_role!(creds)
           end
+          if(creds[:aws_iam_instance_profile])
+            load_instance_credentials!(creds)
+          end
+          true
+        end
+
+        # Attempt to load credentials from instance metadata
+        #
+        # @param creds [Hash]
+        # @return [TrueClass]
+        def load_instance_credentials!(creds)
+          role = HTTP.get(self.const_get(:INSTANCE_PROFILE_HOST)).body.to_s.strip
+          data = HTTP.get(
+            [
+              self.const_get(:INSTANCE_PROFILE_HOST),
+              self.const_get(:INSTANCE_PROFILE_PATH),
+              role
+            ].join('/')
+          ).body
+          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'])
           true
         end
 
@@ -422,13 +459,30 @@ module Miasma
           if(File.exists?(file_path))
             l_config = Smash.new.tap do |creds|
               key = nil
-              File.readlines(file_path).each do |line|
+              File.readlines(file_path).each_with_index do |line, idx|
                 line.strip!
-                if(line.start_with?('[') && line.end_with?(']'))
-                  key = line.tr('[]', '').strip
+                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})")
+                  end
+                  key = line.tr('[]', '').strip.sub(/^profile /, '')
                   creds[key] = Smash.new
                 else
-                  creds[key].merge!(Smash[*line.split('=').map(&:strip)])
+                  unless(key)
+                    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(
+                    self.class.const_get(:CONFIG_FILE_REMAP).fetch(
+                      line_args.first, line_args.first
+                    )
+                  )
+                  begin
+                    creds[key].merge!(Smash[*line_args])
+                  rescue => e
+                    raise ArgumentError.new("Failed to parse aws file! (#{file_path} line #{idx + 1})")
+                  end
                 end
               end
             end
@@ -447,11 +501,33 @@ module Miasma
         # Setup for API connections
         def connect
           unless(aws_host)
-            self.aws_host = [
-              self.class::API_SERVICE.downcase,
-              aws_region,
-              'amazonaws.com'
-            ].join('.')
+            if(euca_compat)
+              service_name = (
+                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
+            if(euca_compat == :path)
+              self.aws_host = [
+                api_endpoint,
+                'services',
+                service_name
+              ].join('/')
+            elsif(euca_compat == :dns && euca_dns_map[service_name])
+              self.aws_host = [
+                euca_dns_map[service_name],
+                api_endpoint
+              ].join('.')
+            else
+              self.aws_host = [
+                service_name,
+                aws_region,
+                api_endpoint
+              ].join('.')
+            end
           end
           @signer = Contrib::AwsApiCore::SignatureV4.new(
             aws_access_key_id, aws_secret_access_key, aws_region, self.class::API_SERVICE
@@ -473,7 +549,7 @@ module Miasma
 
         # @return [String] endpoint for request
         def endpoint
-          "https://#{aws_host}"
+          "http#{'s' if ssl_enabled}://#{aws_host}"
         end
 
         # Override to inject signature

data/lib/miasma-aws/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -139,3 +139,4 @@ signing_key:
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
+has_rdoc: