miasma 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 039c6245899398e6105945fa52ea6b60a6f8b496
-  data.tar.gz: a50c93103661c9d7919ea9453b095d13d7cbe272
+  metadata.gz: b7396d4fda42e875b71624a0eca9ab303a606140
+  data.tar.gz: dc2d67fa4c59fdb2a0d0411bfbb099f91bc753dc
 SHA512:
-  metadata.gz: 30654c515d23a58a58355b7b61ba4fc15179b0cb212dbeaa17bf27879bbba0494516efb1570bb45df29d5d157a6c7f243fdc57c02a0537847524ac651b734528
-  data.tar.gz: e609e7a4a63d73df54f783ee6d33854b1dee23506a25aeaeeac66e14cf2e85a5d4e2ccae0918be602825511c55f12e1b7951e113585dafe7c059c6c6393874eb
+  metadata.gz: 4c58428f59a25b11576541387304375e4d7232c0016fbcef9fbaa5dfb746eda92a85cad33d7fc474e808c11ded50425b4699618fb6cec67c6a81be5728346a4c
+  data.tar.gz: 361b96d5a94c44335cc68f34b4cb7b36006cd85c270189aedb4356480dd17c5064d1da12a1702c20158a5ca87457681b3aca5a6d3f26a317309135ed11a83f2d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.12
+* Extract provider implementations to standalone libraries
+* Add test helper executable
+* Update API body extraction to retype Array contents
+* Add streamable helper for consistent storage file read
+
 # V0.2.10
 * Add auto-follow to paginated results on aws
 * Speed up stack list building on aws

data/README.md

@@ -141,54 +141,17 @@ model completions.
 
 ### Currently Supported Providers
 
-* AWS
-* Rackspace
-* OpenStack
-
-### Models
-
-#### AWS
-
-|Model         |Create|Read|Update|Delete|
-|--------------|------|----|------|------|
-|AutoScale     |  X   | X  |      |      |
-|BlockStorage  |      |    |      |      |
-|Compute       |  X   | X  |      |  X   |
-|DNS           |      |    |      |      |
-|LoadBalancer  |  X   | X  |  X   |  X   |
-|Network       |      |    |      |      |
-|Orchestration |  X   | X  |  X   |  X   |
-|Queues        |      |    |      |      |
-|Storage       |  X   | X  |  X   |  X   |
-
-#### Rackspace
-
-|Model         |Create|Read|Update|Delete|
-|--------------|------|----|------|------|
-|AutoScale     |  X   | X  |      |      |
-|BlockStorage  |      |    |      |      |
-|Compute       |  X   | X  |      |  X   |
-|DNS           |      |    |      |      |
-|LoadBalancer  |      | X  |      |      |
-|Network       |      |    |      |      |
-|Orchestration |  X   | X  |  X   |  X   |
-|Queues        |      |    |      |      |
-|Storage       |      |    |      |      |
-
-#### OpenStack
-
-|Model         |Create|Read|Update|Delete|
-|--------------|------|----|------|------|
-|AutoScale     |      |    |      |      |
-|BlockStorage  |      |    |      |      |
-|Compute       |  X   | X  |      |  X   |
-|DNS           |      |    |      |      |
-|LoadBalancer  |      |    |      |      |
-|Network       |      |    |      |      |
-|Orchestration |  X   | X  |  X   |  X   |
-|Queues        |      |    |      |      |
-|Storage       |      |    |      |      |
+Coverage currently varies from provider to provider
+based on functionality restrictions and in progress
+implementation goals. The README on each library
+should provide a simple feature matrix for a quick
+check on support availability:
+
+* [AWS](https://github.com/miasma-rb/miasma-aws)
+* [Rackspace](https://github.com/miasma-rb/miasma-rackspace)
+* [OpenStack](https://github.com/miasma-rb/miasma-open-stack)
+* [Local](https://github.com/miasma-rb/miasma-local)
 
 ## Info
 
-* Repository: https://github.com/chrisroberts/miasma
+* Repository: https://github.com/miasma-rb/miasma

data/bin/miasma-test

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+require 'vcr'
+require 'fileutils'
+require 'webmock/minitest'
+require 'minitest/autorun'
+
+require 'miasma'
+
+miasma_spec_dir = File.join(File.dirname(File.dirname(__FILE__)), 'test', 'specs')
+
+# Always load in generic model specs
+Dir.glob(File.join(miasma_spec_dir, 'models', '*.rb')).each do |path|
+  require File.expand_path(path)
+end
+
+library_spec_dir = File.join(Dir.pwd, 'test', 'specs')
+
+unless(File.directory?(library_spec_dir))
+  $stderr.puts "ERROR: Failed to locate expected spec directory! (#{library_spec_dir})"
+  exit -1
+end
+
+if(ARGV.empty?)
+  cassette_directory = File.join(library_spec_dir, 'cassettes')
+
+  Dir.glob(File.join(library_spec_dir, '**/**/*_spec.rb')).each do |path|
+    require File.expand_path(path)
+  end
+
+else
+  cassette_directory = File.join(library_spec_dir, 'cassettes')
+
+  ARGV.each do |path|
+    full_path = File.expand_path(path)
+    if(File.exists?(full_path))
+      require full_path
+    else
+      $stderr.puts "ERROR: Failed to locate specified path! (#{full_path})"
+      exit -1
+    end
+  end
+
+end
+
+FileUtils.mkdir_p(cassette_directory)
+
+VCR.configure do |c|
+  c.cassette_library_dir = cassette_directory
+  c.hook_into :webmock
+end

data/lib/miasma/models/storage/file.rb

@@ -8,6 +8,42 @@ module Miasma
       # Abstract file
       class File < Types::Model
 
+        # Simple wrapper to keep consistent reading behavior
+        class Streamable
+
+          # @return [Object] IO-ish thing
+          attr_reader :io
+
+          def initialize(io_item)
+            unless(io_item.respond_to?(:readpartial))
+              raise TypeError.new 'Instance must respond to `#readpartial`'
+            end
+            @io = io_item
+          end
+
+          # Proxy missing methods to io
+          def method_missing(method_name, *args, &block)
+            if(io.respond_to?(method_name))
+              io.send(method_name, *args, &block)
+            else
+              raise
+            end
+          end
+
+          # Customized readpartial to automatically hand EOF
+          #
+          # @param length [Integer] length to read
+          # @return [String]
+          def readpartial(length=nil)
+            begin
+              io.readpartial(length)
+            rescue EOFError
+              nil
+            end
+          end
+
+        end
+
         attribute :name, String, :required => true
         attribute :content_type, String
         attribute :content_disposition, String

data/lib/miasma/types/api.rb

@@ -123,13 +123,27 @@ module Miasma
         if(extract_body)
           if(extracted_headers[:content_type].to_s.include?('json'))
             begin
-              extracted_body = MultiJson.load(result.body.to_s).to_smash
+              extracted_body = MultiJson.load(result.body.to_s)
+              if(extracted_body.respond_to?(:to_smash))
+                extracted_body = extracted_body.to_smash
+              elsif(extracted_body.respond_to?(:map!))
+                extracted_body.map! do |i|
+                  i.respond_to?(:to_smash) ? i.to_smash : i
+                end
+              end
             rescue MultiJson::ParseError
               extracted_body = result.body.to_s
             end
           elsif(extracted_headers[:content_type].to_s.include?('xml'))
             begin
-              extracted_body = MultiXml.parse(result.body.to_s).to_smash
+              extracted_body = MultiXml.parse(result.body.to_s)
+              if(extracted_body.respond_to?(:to_smash))
+                extracted_body = extracted_body.to_smash
+              elsif(extracted_body.respond_to?(:map!))
+                extracted_body.map! do |i|
+                  i.respond_to?(:to_smash) ? i.to_smash : i
+                end
+              end
             rescue MultiXml::ParseError
               extracted_body = result.body.to_s
             end

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.10')
+  VERSION = Gem::Version.new('0.2.12')
 end

data/miasma.gemspec

@@ -6,14 +6,24 @@ Gem::Specification.new do |s|
   s.summary = 'Smoggy API'
   s.author = 'Chris Roberts'
   s.email = 'code@chrisroberts.org'
-  s.homepage = 'https://github.com/chrisroberts/miasma'
+  s.homepage = 'https://github.com/miasma-rb/miasma'
   s.description = 'Smoggy API'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'hashie'
-  s.add_dependency 'http'
-  s.add_dependency 'multi_json'
-  s.add_dependency 'multi_xml'
-  s.add_dependency 'xml-simple'
+  s.add_runtime_dependency 'hashie'
+  s.add_runtime_dependency 'http'
+  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'multi_xml'
+  s.add_runtime_dependency 'xml-simple'
+  # Include provider libs that do not have outside deps
+  s.add_runtime_dependency 'miasma-aws'
+  s.add_runtime_dependency 'miasma-open-stack'
+  s.add_runtime_dependency 'miasma-rackspace'
+  s.executables << 'miasma-test'
+  # Include development dependencies for running tests
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
   s.files = Dir['lib/**/*'] + %w(miasma.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -80,30 +80,116 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: miasma-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: miasma-open-stack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: miasma-rackspace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smoggy API
 email: code@chrisroberts.org
-executables: []
+executables:
+- miasma-test
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/miasma-test
 - lib/miasma.rb
-- lib/miasma/contrib/aws.rb
-- lib/miasma/contrib/aws/auto_scale.rb
-- lib/miasma/contrib/aws/compute.rb
-- lib/miasma/contrib/aws/load_balancer.rb
-- lib/miasma/contrib/aws/orchestration.rb
-- lib/miasma/contrib/aws/storage.rb
-- lib/miasma/contrib/open_stack.rb
-- lib/miasma/contrib/open_stack/compute.rb
-- lib/miasma/contrib/open_stack/orchestration.rb
-- lib/miasma/contrib/rackspace.rb
-- lib/miasma/contrib/rackspace/auto_scale.rb
-- lib/miasma/contrib/rackspace/compute.rb
-- lib/miasma/contrib/rackspace/load_balancer.rb
-- lib/miasma/contrib/rackspace/orchestration.rb
 - lib/miasma/error.rb
 - lib/miasma/models.rb
 - lib/miasma/models/auto_scale.rb
@@ -145,7 +231,7 @@ files:
 - lib/miasma/utils/smash.rb
 - lib/miasma/version.rb
 - miasma.gemspec
-homepage: https://github.com/chrisroberts/miasma
+homepage: https://github.com/miasma-rb/miasma
 licenses:
 - Apache 2.0
 metadata: {}

data/lib/miasma/contrib/aws.rb

@@ -1,444 +0,0 @@
-require 'miasma'
-require 'miasma/utils/smash'
-
-require 'time'
-require 'openssl'
-
-module Miasma
-  module Contrib
-    # Core API for AWS access
-    class AwsApiCore
-
-      module RequestUtils
-
-        # Fetch all results when tokens are being used
-        # for paging results
-        #
-        # @param next_token [String]
-        # @param result_key [Array<String, Symbol>] path to result
-        # @yield block to perform request
-        # @yieldparam options [Hash] request parameters (token information)
-        # @return [Array]
-        def all_result_pages(next_token, *result_key, &block)
-          list = []
-          options = next_token ? Smash.new('NextToken' => next_token) : Smash.new
-          result = block.call(options)
-          content = result.get(*result_key.dup)
-          if(content.is_a?(Array))
-            list += content
-          else
-            list << content
-          end
-          set = result.get(*result_key.slice(0, 3))
-          if(set && set['NextToken'])
-            list += all_result_pages(set['NextToken'], *result_key, &block)
-          end
-          list.compact
-        end
-
-      end
-
-      # @return [String] current time ISO8601 format
-      def self.time_iso8601
-        Time.now.utc.strftime('%Y%m%dT%H%M%SZ')
-      end
-
-      # HMAC helper class
-      class Hmac
-
-        # @return [OpenSSL::Digest]
-        attr_reader :digest
-        # @return [String] secret key
-        attr_reader :key
-
-        # Create new HMAC helper
-        #
-        # @param kind [String] digest type (sha1, sha256, sha512, etc)
-        # @param key [String] secret key
-        # @return [self]
-        def initialize(kind, key)
-          @digest = OpenSSL::Digest.new(kind)
-          @key = key
-        end
-
-        # @return [String]
-        def to_s
-          "Hmac#{digest.name}"
-        end
-
-        # Generate the hexdigest of the content
-        #
-        # @param content [String] content to digest
-        # @return [String] hashed result
-        def hexdigest_of(content)
-          digest << content
-          hash = digest.hexdigest
-          digest.reset
-          hash
-        end
-
-        # Sign the given data
-        #
-        # @param data [String]
-        # @param key_override [Object]
-        # @return [Object] signature
-        def sign(data, key_override=nil)
-          result = OpenSSL::HMAC.digest(digest, key_override || key, data)
-          digest.reset
-          result
-        end
-
-        # Sign the given data and return hexdigest
-        #
-        # @param data [String]
-        # @param key_override [Object]
-        # @return [String] hex encoded signature
-        def hex_sign(data, key_override=nil)
-          result = OpenSSL::HMAC.hexdigest(digest, key_override || key, data)
-          digest.reset
-          result
-        end
-
-      end
-
-      # Base signature class
-      class Signature
-
-        # Create new instance
-        def initialize(*args)
-          raise NotImplementedError.new 'This class should not be used directly!'
-        end
-
-        # Generate the signature
-        #
-        # @param http_method [Symbol] HTTP request method
-        # @param path [String] request path
-        # @param opts [Hash] request options
-        # @return [String] signature
-        def generate(http_method, path, opts={})
-          raise NotImplementedError
-        end
-
-        # URL string escape compatible with AWS requirements
-        #
-        # @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
-          end
-        end
-
-      end
-
-      # AWS signature version 4
-      class SignatureV4 < Signature
-
-        # @return [Hmac]
-        attr_reader :hmac
-        # @return [String] access key
-        attr_reader :access_key
-        # @return [String] region
-        attr_reader :region
-        # @return [String] service
-        attr_reader :service
-
-        # Create new signature generator
-        #
-        # @param access_key [String]
-        # @param secret_key [String]
-        # @param region [String]
-        # @param service [String]
-        # @return [self]
-        def initialize(access_key, secret_key, region, service)
-          @hmac = Hmac.new('sha256', secret_key)
-          @access_key = access_key
-          @region = region
-          @service = service
-        end
-
-        # Generate the signature string for AUTH
-        #
-        # @param http_method [Symbol] HTTP request method
-        # @param path [String] request path
-        # @param opts [Hash] request options
-        # @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}"
-        end
-
-        # Generate URL with signed params
-        #
-        # @param http_method [Symbol] HTTP request method
-        # @param path [String] request path
-        # @param opts [Hash] request options
-        # @return [String] signature
-        def generate_url(http_method, path, opts)
-          opts[:params].merge!(
-            Smash.new(
-              'X-Amz-SignedHeaders' => signed_headers(opts[:headers]),
-              'X-Amz-Algorithm' => algorithm,
-              'X-Amz-Credential' => "#{access_key}/#{credential_scope}"
-            )
-          )
-          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
-
-        # Generate the signature
-        #
-        # @param http_method [Symbol] HTTP request method
-        # @param path [String] request path
-        # @param opts [Hash] request options
-        # @return [String] signature
-        def generate_signature(http_method, path, opts)
-          to_sign = [
-            algorithm,
-            AwsApiCore.time_iso8601,
-            credential_scope,
-            hashed_canonical_request(
-              can_req = build_canonical_request(http_method, path, opts)
-            )
-          ].join("\n")
-          signature = sign_request(to_sign)
-        end
-
-        # Sign the request
-        #
-        # @param request [String] request to sign
-        # @return [String] signature
-        def sign_request(request)
-          key = hmac.sign(
-            'aws4_request',
-            hmac.sign(
-              service,
-              hmac.sign(
-                region,
-                hmac.sign(
-                  Time.now.utc.strftime('%Y%m%d'),
-                  "AWS4#{hmac.key}"
-                )
-              )
-            )
-          )
-          hmac.hex_sign(request, key)
-        end
-
-        # @return [String] signature algorithm
-        def algorithm
-          'AWS4-HMAC-SHA256'
-        end
-
-        # @return [String] credential scope for request
-        def credential_scope
-          [
-            Time.now.utc.strftime('%Y%m%d'),
-            region,
-            service,
-            'aws4_request'
-          ].join('/')
-        end
-
-        # Generate the hash of the canonical request
-        #
-        # @param request [String] canonical request string
-        # @return [String] hashed canonical request
-        def hashed_canonical_request(request)
-          hmac.hexdigest_of(request)
-        end
-
-        # Build the canonical request string used for signing
-        #
-        # @param http_method [Symbol] HTTP request method
-        # @param path [String] request path
-        # @param opts [Hash] request options
-        # @return [String] canonical request string
-        def build_canonical_request(http_method, path, opts)
-          unless(path.start_with?('/'))
-            path = "/#{path}"
-          end
-          [
-            http_method.to_s.upcase,
-            path,
-            canonical_query(opts[:params]),
-            canonical_headers(opts[:headers]),
-            signed_headers(opts[:headers]),
-            canonical_payload(opts)
-          ].join("\n")
-        end
-
-        # Build the canonical query string used for signing
-        #
-        # @param params [Hash] query params
-        # @return [String] canonical query string
-        def canonical_query(params)
-          params ||= {}
-          params = Hash[params.sort_by(&:first)]
-          query = params.map do |key, value|
-            "#{safe_escape(key)}=#{safe_escape(value)}"
-          end.join('&')
-        end
-
-        # Build the canonical header string used for signing
-        #
-        # @param headers [Hash] request headers
-        # @return [String] canonical headers string
-        def canonical_headers(headers)
-          headers ||= {}
-          headers = Hash[headers.sort_by(&:first)]
-          headers.map do |key, value|
-            [key.downcase, value.chomp].join(':')
-          end.join("\n") << "\n"
-        end
-
-        # List of headers included in signature
-        #
-        # @param headers [Hash] request headers
-        # @return [String] header list
-        def signed_headers(headers)
-          headers ||= {}
-          headers.sort_by(&:first).map(&:first).
-            map(&:downcase).join(';')
-        end
-
-        # Build the canonical payload string used for signing
-        #
-        # @param options [Hash] request options
-        # @return [String] body checksum
-        def canonical_payload(options)
-          body = options.fetch(:body, '')
-          if(options[:json])
-            body = MultiJson.dump(options[:json])
-          elsif(options[:form])
-            body = URI.encode_www_form(options[:form])
-          end
-          if(body == 'UNSIGNED-PAYLOAD')
-            body
-          else
-            hmac.hexdigest_of(body)
-          end
-        end
-
-      end
-
-      module ApiCommon
-
-        def self.included(klass)
-          klass.class_eval do
-            attribute :aws_access_key_id, String, :required => true
-            attribute :aws_secret_access_key, String, :required => true
-            attribute :aws_region, String, :required => true
-            attribute :aws_host, String
-            attribute :aws_bucket_region, String
-
-            # @return [Contrib::AwsApiCore::SignatureV4]
-            attr_reader :signer
-          end
-        end
-
-        # Build new API for specified type using current provider / creds
-        #
-        # @param type [Symbol] api type
-        # @return [Api]
-        def api_for(type)
-          memoize(type) do
-            creds = attributes.dup
-            creds.delete(:aws_host)
-            Miasma.api(
-              Smash.new(
-                :type => type,
-                :provider => provider,
-                :credentials => creds
-              )
-            )
-          end
-        end
-
-        # Setup for API connections
-        def connect
-          unless(aws_host)
-            self.aws_host = [
-              self.class::API_SERVICE.downcase,
-              aws_region,
-              'amazonaws.com'
-            ].join('.')
-          end
-          @signer = Contrib::AwsApiCore::SignatureV4.new(
-            aws_access_key_id, aws_secret_access_key, aws_region, self.class::API_SERVICE
-          )
-        end
-
-        # @return [String] custom escape for aws compat
-        def uri_escape(string)
-          signer.safe_escape(string)
-        end
-
-        # @return [HTTP] connection for requests (forces headers)
-        def connection
-          super.with_headers(
-            'Host' => aws_host,
-            'X-Amz-Date' => Contrib::AwsApiCore.time_iso8601
-          )
-        end
-
-        # @return [String] endpoint for request
-        def endpoint
-          "https://#{aws_host}"
-        end
-
-        # Override to inject signature
-        #
-        # @param connection [HTTP]
-        # @param http_method [Symbol]
-        # @param request_args [Array]
-        # @return [HTTP::Response]
-        # @note if http_method is :post, params will be automatically
-        #  removed and placed into :form
-        def make_request(connection, http_method, request_args)
-          dest, options = request_args
-          path = URI.parse(dest).path
-          options = options ? options.to_smash : Smash.new
-          options[:params] = options.fetch(:params, Smash.new).to_smash.deep_merge('Version' => self.class::API_VERSION)
-          if(http_method.to_sym == :post)
-            if(options[:form])
-              options[:form].merge(options.delete(:params))
-            else
-              options[:form] = options.delete(:params)
-            end
-          end
-          update_request(connection, options)
-          signature = signer.generate(
-            http_method, path, options.merge(
-              Smash.new(
-                :headers => Smash[
-                  connection.default_headers.to_a
-                ]
-              )
-            )
-          )
-          options = Hash[options.map{|k,v|[k.to_sym,v]}]
-          connection.auth(signature).send(http_method, dest, options)
-        end
-
-        # Simple callback to allow request option adjustments prior to
-        # signature calculation
-        #
-        # @param opts [Smash] request options
-        # @return [TrueClass]
-        def update_request(con, opts)
-          true
-        end
-
-      end
-
-    end
-  end
-
-  Models::Compute.autoload :Aws, 'miasma/contrib/aws/compute'
-  Models::LoadBalancer.autoload :Aws, 'miasma/contrib/aws/load_balancer'
-  Models::AutoScale.autoload :Aws, 'miasma/contrib/aws/auto_scale'
-  Models::Orchestration.autoload :Aws, 'miasma/contrib/aws/orchestration'
-  Models::Storage.autoload :Aws, 'miasma/contrib/aws/storage'
-end