sitefull-cloud 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b6fc6e52b164bef61970c1427f7641654e266c
-  data.tar.gz: aadc4bf61e815ca87873783d72294598e37fab4c
+  metadata.gz: be24ed92a5fe9baf164ba46e248e09d59574259b
+  data.tar.gz: f0b7a997bc7ee41a8790f41cc40a73d9bd41ddc3
 SHA512:
-  metadata.gz: b453a253eec3a9803db43094b3359516a5c693312b7b585e4b172d8e2bdd7fe1d8c9c590d7792458fa3af2a24d40696e069d6d8a06f3025457342b8a7df812d3
-  data.tar.gz: 21343f61467fd59da9f602c35937a25f8560c7cc69bf0bd8db30554b5dbdc476457402655c00efdea7f7fea8b5756652186717521c118f7b65bf38c798b8048e
+  metadata.gz: 553ff09a15f609be220e4d87c5baeb738154cff16238eb32a9642d9580cfd9a567847b76b50d1336443beec83f38743560a1116424beed1c9ac86d99b4777750
+  data.tar.gz: 7977afba97ec37cf6968ba4c7a1a4d91b743fb07bd97e080dd859197113a27c92b965758a75835ec2189a3da6515ef313101aab9ec786b1ff7284ede259bbe16

data/README.md

@@ -51,7 +51,7 @@ options = {
   role_arn: "IAM Role ARN",
   redirect_uri: "One of the Allowed Return URLs for the Amazon Application"
 }
-provider = Sitefull::Cloud::Provider.new('amazon', options) ;
+provider = Sitefull::Cloud::Auth.new('amazon', options) ;
 ```
   * Generate the authorization URL and open it in a web browser
 ```
@@ -83,7 +83,7 @@ options = {
   client_secret: "Azure Application Client Secret",
   redirect_uri: "One of the Reply URLs for the Azure Application"
 }
-provider = Sitefull::Cloud::Provider.new('azure', options) ;
+provider = Sitefull::Cloud::Auth.new('azure', options) ;
 ```
   * Generate the authorization URL and open it in a web browser
 ```
@@ -118,7 +118,7 @@ options = {
   client_secret: "Google OAuth Client Secret",
   redirect_uri: "One of the Authorized redirect URIs"
 }
-provider = Sitefull::Cloud::Provider.new('google', options) ;
+provider = Sitefull::Cloud::Auth.new('google', options) ;
 ```
   * Generate the authorization URL and open it in a web browser
 ```
@@ -140,12 +140,29 @@ client.authorization = credentials
 client.list_images('A project the authenticated user can access')
 ```
 
+### Providers
+
+If you already have obtained a token for one of the providers you can use `Sitefull::Cloud::Provider` to perform basic operations.
+```
+provider = Sitefull::Cloud::Provider.new(:amazon, token: token, region: 'us-east-1')
+provider.regions # Returns a list of regions
+provider.machine_types(region) # Returns a list of regions
+....
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Testing
+
+To mock the provider APIs just add the following to your `rails_helper.rb` or `spec_helper.rb` file:
+```
+Sitefull::Cloud.mock!
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/stanchino/sitefull-cloud. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/sitefull-cloud/auth/amazon.rb

@@ -12,14 +12,15 @@ module Sitefull
       PROVIDER_ID = 'www.amazon.com'.freeze
 
       MISSING_ROLE_ARN = 'Missing Role ARN'.freeze
-
-      def initialize(options = {}, skip_validation = false)
-        @options = skip_validation ? options : validate(options)
-      end
+      MISSING_REGION = 'Missing Region'.freeze
+      MISSING_SESSION_NAME = 'Missing session name'.freeze
 
       def credentials(token)
         fail MISSING_ROLE_ARN if @options[:role_arn].to_s.empty?
-        sts = Aws::STS::Client.new(region: 'us-east-1')
+        fail MISSING_REGION if @options[:region].to_s.empty?
+        fail MISSING_SESSION_NAME if @options[:session_name].to_s.empty?
+
+        sts = Aws::STS::Client.new(region: @options[:region])
         response = sts.assume_role_with_web_identity(role_arn: @options[:role_arn],
                                                      role_session_name: @options[:session_name],
                                                      provider_id: 'www.amazon.com',
@@ -27,25 +28,20 @@ module Sitefull
         Aws::Credentials.new(*response.credentials.to_h.values_at(:access_key_id, :secret_access_key, :session_token))
       end
 
-      def validate(options = {})
-        options = super(options)
-        options[:authorization_uri] ||= AUTHORIZATION_URI
-        options[:scope] ||= Array(SCOPE)
-        options[:token_credential_uri] ||= TOKEN_CREDENTIALS_URI
-        options[:session_name] ||= 'web-user-session'
-        options
+      def callback_uri
+        CALLBACK_URI
       end
 
-      def token_options
-        @options.select { |k| [:authorization_uri, :client_id, :client_secret, :scope, :token_credential_uri, :redirect_uri].include? k.to_sym }
+      def authorization_uri(_)
+        AUTHORIZATION_URI
       end
 
-      def authorization_url_options
-        @options.select { |k| [:state, :login_hint, :redirect_uri].include? k.to_sym }
+      def scope
+        SCOPE
       end
 
-      def callback_uri
-        CALLBACK_URI
+      def token_credentials_uri(_)
+        TOKEN_CREDENTIALS_URI
       end
     end
   end

data/lib/sitefull-cloud/auth/azure.rb

@@ -15,25 +15,13 @@ module Sitefull
 
       MISSING_TENANT_ID = 'Missing Tenant ID'.freeze
 
-      def initialize(options = {}, skip_validation = false)
-        @options = skip_validation ? options : validate(options)
-      end
-
       def validate(options = {})
         fail MISSING_TENANT_ID if options[:tenant_id].nil? || options[:tenant_id].to_s.empty?
-        options = super(options)
-        options[:authorization_uri] ||= sprintf(AUTHORIZATION_URI, options[:tenant_id])
-        options[:scope] ||= Array(SCOPE)
-        options[:token_credential_uri] ||= sprintf(TOKEN_CREDENTIALS_URI, options[:tenant_id])
-        options
-      end
-
-      def token_options
-        @options.select { |k| [:authorization_uri, :client_id, :client_secret, :scope, :token_credential_uri, :redirect_uri].include? k.to_sym }
+        super(options)
       end
 
       def authorization_url_options
-        @options.select { |k| [:state, :login_hint, :redirect_uri].include? k.to_sym }.merge({ resource: 'https://management.core.windows.net/'})
+        super.merge({ resource: 'https://management.core.windows.net/'})
       end
 
       def credentials(token)
@@ -44,6 +32,18 @@ module Sitefull
       def callback_uri
         CALLBACK_URI
       end
+
+      def authorization_uri(options)
+        sprintf(AUTHORIZATION_URI, options[:tenant_id])
+      end
+
+      def scope
+        SCOPE
+      end
+
+      def token_credentials_uri(options)
+        sprintf(TOKEN_CREDENTIALS_URI, options[:tenant_id])
+      end
     end
   end
 end

data/lib/sitefull-cloud/auth/base.rb

@@ -2,27 +2,61 @@ module Sitefull
   module Auth
     class Base
 
+      MISSING_AUTHORIZATION_URI = 'Missing Authorization URL'.freeze
       MISSING_BASE_URI = 'Missing base URL and redirect URL'.freeze
       MISSING_BASE_URI_SCHEME = 'Base URL must be an absolute URL'.freeze
       MISSING_CALLBACK_URI = 'No callback URI specified'.freeze
       MISSING_CLIENT_ID = 'Missing Client ID'.freeze
       MISSING_CLIENT_SECRET = 'Missing Client Secret'.freeze
       MISSING_REDIRECT_URI_SCHEME = 'Redirect URL must be an absolute URL'.freeze
+      MISSING_SCOPE = 'Missing scope'.freeze
+      MISSING_TOKEN_CREDENTIALS_URI = 'Missing Token Credentials URL'.freeze
+
+      def initialize(options = {})
+        @options = validate(options)
+      end
 
       def validate(options = {})
         fail MISSING_CLIENT_ID if options[:client_id].to_s.empty?
         fail MISSING_CLIENT_SECRET if options[:client_secret].to_s.empty?
         fail MISSING_REDIRECT_URI_SCHEME if !options[:redirect_uri].to_s.empty? && URI(options[:redirect_uri].to_s).scheme.to_s.empty?
-        options[:redirect_uri] ||= default_redirect_uri(options)
-        options
+        process(options)
+      end
+
+      def token_options
+        @options.select { |k| [:authorization_uri, :client_id, :client_secret, :scope, :token_credential_uri, :redirect_uri].include? k.to_sym }.merge(@options[:token] || {})
+      end
+
+      def authorization_url_options
+        @options.select { |k| [:state, :login_hint, :redirect_uri].include? k.to_sym }
       end
 
       def callback_uri
         fail MISSING_CALLBACK_URI
       end
 
+      def authorization_uri(_)
+        fail MISSING_AUTHORIZATION_URI
+      end
+
+      def scope
+        fail MISSING_SCOPE
+      end
+
+      def token_credentials_uri(_)
+        fail MISSING_TOKEN_CREDENTIALS_URI
+      end
       private
 
+      def process(options = {})
+        options[:redirect_uri] ||= default_redirect_uri(options) if options[:token].to_s.empty?
+        options[:token] = JSON.parse options[:token] unless options[:token].to_s.empty?
+        options[:authorization_uri] ||= authorization_uri(options)
+        options[:scope] ||= Array(scope)
+        options[:token_credential_uri] ||= token_credentials_uri(options)
+        options
+      end
+
       def default_redirect_uri(options)
         fail MISSING_BASE_URI if options[:base_uri].to_s.empty?
         fail MISSING_BASE_URI_SCHEME if URI(options[:base_uri].to_s).scheme.to_s.empty?

data/lib/sitefull-cloud/auth/google.rb

@@ -9,32 +9,28 @@ module Sitefull
       SCOPE = %w(https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/compute).freeze
       TOKEN_CREDENTIALS_URI = 'https://www.googleapis.com/oauth2/v3/token'.freeze
 
-      def initialize(options = {}, skip_validation = false)
-        @options = skip_validation ? options : validate(options)
+      def authorization_url_options
+        super.merge({ access_type: 'offline', approval_prompt: 'force', include_granted_scopes: true })
       end
 
-      def validate(options = {})
-        options = super(options)
-        options[:authorization_uri] ||= AUTHORIZATION_URI
-        options[:scope] ||= Array(SCOPE)
-        options[:token_credential_uri] ||= TOKEN_CREDENTIALS_URI
-        options
+      def credentials(token)
+        token
       end
 
-      def token_options
-        @options.select { |k| [:authorization_uri, :client_id, :client_secret, :scope, :token_credential_uri, :redirect_uri].include? k.to_sym }
+      def callback_uri
+        CALLBACK_URI
       end
 
-      def authorization_url_options
-        @options.select { |k| [:state, :login_hint, :redirect_uri].include? k.to_sym }.merge({ access_type: 'offline', approval_prompt: 'force', include_granted_scopes: true })
+      def authorization_uri(_)
+        AUTHORIZATION_URI
       end
 
-      def credentials(token)
-        token
+      def scope
+        SCOPE
       end
 
-      def callback_uri
-        CALLBACK_URI
+      def token_credentials_uri(_)
+        TOKEN_CREDENTIALS_URI
       end
     end
   end

data/lib/sitefull-cloud/auth.rb

@@ -1,15 +1,14 @@
+require 'signet/oauth_2/client'
 require 'forwardable'
 
 module Sitefull
   module Cloud
     class Auth
       extend Forwardable
-      def_delegators :@provider, :token_options, :authorization_url_options
+      def_delegators :@auth, :token_options, :authorization_url_options
 
-      def initialize(provider_type, options = {})
-        token_set = !options[:token].to_s.empty?
-        token(JSON.parse options[:token]) if token_set
-        @provider = provider_class(provider_type).new(options, token_set)
+      def initialize(auth_type, options = {})
+        @auth = auth_class(auth_type).new(options)
       end
 
       def authorization_url
@@ -21,20 +20,21 @@ module Sitefull
         token.fetch_access_token!
       end
 
-      def token(token_data = nil)
-        @token ||= Signet::OAuth2::Client.new(token_data.nil? ? token_options : token_data)
+      def token
+        @token ||= Signet::OAuth2::Client.new(token_options)
       end
 
       def credentials
+        return @credentials unless @credentials.nil?
         token.refresh!
-        @credentials ||= @provider.credentials(token)
+        @credentials = @auth.credentials(token)
       end
 
       private
 
-      def provider_class(provider_type)
-        require "sitefull-cloud/auth/#{provider_type}"
-        Kernel.const_get "Sitefull::Auth::#{provider_type.capitalize}"
+      def auth_class(auth_type)
+        require "sitefull-cloud/auth/#{auth_type}"
+        Kernel.const_get "Sitefull::Auth::#{auth_type.capitalize}"
       end
     end
   end

data/lib/sitefull-cloud/provider/amazon.rb

@@ -1,3 +1,4 @@
+require 'aws-sdk'
 require 'sitefull-cloud/provider/amazon/networking'
 
 module Sitefull
@@ -5,13 +6,18 @@ module Sitefull
     module Amazon
       include Networking
 
-      REQUIRED_OPTIONS = [:role_arn].freeze
+      REQUIRED_OPTIONS = %w(role_arn region session_name).freeze
       MACHINE_TYPES = %w(t2.nano t2.micro t2.small t2.medium t2.large m4.large m4.xlarge m4.2xlarge m4.4xlarge m4.10xlarge m3.medium m3.large m3.xlarge m3.2xlarge).freeze
 
       DEFAULT_REGION = 'us-east-1'.freeze
 
+      def process(options = {})
+        options[:region] ||= DEFAULT_REGION
+        options
+      end
+
       def connection
-        @connection ||= ::Aws::EC2::Client.new(region: options[:region] || DEFAULT_REGION, credentials: credentials)
+        @connection ||= Aws::EC2::Client.new(region: options[:region], credentials: credentials)
       end
 
       def regions
@@ -50,9 +56,7 @@ module Sitefull
       end
 
       def valid?
-        connection.describe_regions(dry_run: true)
-      rescue ::Aws::EC2::Errors::DryRunOperation
-        true
+        !connection.nil?
       rescue StandardError
         false
       end

data/lib/sitefull-cloud/provider/azure.rb

@@ -1,3 +1,7 @@
+require 'azure_mgmt_compute'
+require 'azure_mgmt_network'
+require 'azure_mgmt_resources'
+
 module Sitefull
   module Provider
     module Azure

data/lib/sitefull-cloud/provider/google.rb

@@ -18,17 +18,17 @@ module Sitefull
       end
 
       def regions
-        @regions ||= connection.list_zones(project_name).items
+        @regions ||= connection.list_zones(project_name).items.map { |r| OpenStruct.new(id: r.name, name: r.name) }
       end
 
       def machine_types(zone)
-        @machine_types ||= connection.list_machine_types(project_name, zone).items
+        @machine_types ||= connection.list_machine_types(project_name, zone).items.map { |m| OpenStruct.new(id: m.self_link, name: m.name) }
       rescue ::Google::Apis::ClientError
         []
       end
 
       def images(os)
-        @images ||= project_images(project_name) + project_images("#{os}-cloud")
+        @images ||= (project_images(project_name) + project_images("#{os}-cloud")).map { |i| OpenStruct.new(id: i.self_link, name: i.name) }
       end
 
       def create_network

data/lib/sitefull-cloud/provider.rb

@@ -7,9 +7,9 @@ module Sitefull
       attr_reader :type, :options
 
       def initialize(type, options = {})
-        @options = options unless options.nil?
         @type = type || 'base'
         extend(provider_module)
+        @options = respond_to?(:process) ? process(options) : options
       end
 
       class << self
@@ -27,10 +27,14 @@ module Sitefull
         end
       end
 
+      def auth
+        @auth ||= Sitefull::Cloud::Auth.new(type, options)
+      end
+
       protected
 
       def credentials
-        @credentials ||= Sitefull::Cloud::Auth.new(type, options).credentials
+        @credentials ||= auth.credentials
       end
 
       private

data/lib/sitefull-cloud/version.rb

@@ -1,5 +1,5 @@
 module Sitefull
   module Cloud
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitefull-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stanimir Dimitrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json