scalingo 3.0.0.beta.2 → 3.1.0

data/lib/scalingo/client.rb

@@ -1,131 +1,44 @@
-require "forwardable"
-require "faraday"
-require "faraday_middleware"
-require "scalingo/bearer_token"
-require "scalingo/errors"
+require "scalingo/core_client"
 require "scalingo/auth"
 require "scalingo/billing"
 require "scalingo/regional"
 
 module Scalingo
-  class Client
-    extend Forwardable
-
-    attr_reader :config
-
-    def initialize(attributes = {})
-      @config = Configuration.new(attributes, Scalingo.config)
-
-      define_regions!
-    end
-
-    ## Authentication helpers / Token management
-    attr_reader :token
-
-    def token=(input)
-      @token = input.is_a?(BearerToken) ? input : BearerToken.new(input.to_s, raise_on_expired: config.raise_on_expired_token)
-    end
-
-    def authenticated?
-      token.present? && !token.expired?
-    end
-
-    def authenticate_with(access_token: nil, bearer_token: nil, expires_at: nil)
-      if !access_token && !bearer_token
-        raise ArgumentError, "You must supply one of `access_token` or `bearer_token`"
-      end
-
-      if access_token && bearer_token
-        raise ArgumentError, "You cannot supply both `access_token` and `bearer_token`"
-      end
-
-      if expires_at && !bearer_token
-        raise ArgumentError, "`expires_at` can only be used with `bearer_token`. `access_token` have a 1 hour expiration."
-      end
-
-      if access_token
-        expiration = Time.now + config.exchanged_token_validity
-        response = auth.tokens.exchange(access_token)
-
-        if response.successful?
-          self.token = BearerToken.new(
-            response.data[:token],
-            expires_at: expiration,
-            raise_on_expired: config.raise_on_expired_token,
-          )
-        end
-
-        return response.successful?
-      end
-
-      if bearer_token
-        self.token = if expires_at
-          token = bearer_token.is_a?(BearerToken) ? bearer_token.value : bearer_token.to_s
-
-          BearerToken.new(
-            token,
-            expires_at: expires_at,
-            raise_on_expired: config.raise_on_expired_token,
-          )
-        else
-          bearer_token
-        end
-
-        true
-      end
-    end
-
+  class Client < CoreClient
     ## API clients
     def auth
-      @auth ||= Auth.new(self, config.auth)
+      @auth ||= Auth.new(
+        "https://auth.scalingo.com/v1",
+        scalingo: self,
+      )
     end
 
     def billing
-      @billing ||= Billing.new(self, config.billing)
+      @billing ||= Billing.new(
+        "https://cashmachine.scalingo.com",
+        scalingo: self,
+      )
     end
 
-    def region(name = nil)
-      public_send(name || config.default_region)
+    def agora_fr1
+      @agora_fr1 ||= Regional.new(
+        "https://api.agora-fr1.scalingo.com/v1",
+        scalingo: self,
+      )
     end
 
-    ## Delegations
-    def_delegator :auth, :keys
-    def_delegator :auth, :scm_integrations
-    def_delegator :auth, :tokens
-    def_delegator :auth, :two_factor_auth
-    def_delegator :auth, :tfa
-    def_delegator :auth, :user
-
-    def_delegator :region, :addons
-    def_delegator :region, :apps
-    def_delegator :region, :collaborators
-    def_delegator :region, :containers
-    def_delegator :region, :deployments
-    def_delegator :region, :domains
-    def_delegator :region, :environment
-    def_delegator :region, :events
-    def_delegator :region, :logs
-    def_delegator :region, :metrics
-    def_delegator :region, :notifiers
-    def_delegator :region, :operations
-    def_delegator :region, :scm_repo_links
-
-    private
-
-    def define_regions!
-      config.regions.each_pair do |region, _|
-        define_singleton_method(region) do
-          region_client = instance_variable_get :"@#{region}"
-
-          unless region_client
-            region_client = Regional.new(self, config.regions.public_send(region))
-
-            instance_variable_set :"@#{region}", region_client
-          end
+    def osc_fr1
+      @osc_fr1 ||= Regional.new(
+        "https://api.osc-fr1.scalingo.com/v1",
+        scalingo: self,
+      )
+    end
 
-          region_client
-        end
-      end
+    def osc_secnum_fr1
+      @osc_secnum_fr1 ||= Regional.new(
+        "https://api.osc-secnum-fr1.scalingo.com/v1",
+        scalingo: self,
+      )
     end
   end
 end

data/lib/scalingo/configuration.rb

@@ -1,3 +1,4 @@
+require "active_support"
 require "active_support/core_ext/numeric/time"
 require "scalingo/version"
 require "ostruct"
@@ -6,20 +7,17 @@ module Scalingo
   class Configuration
     ATTRIBUTES = [
       # URL to the authentication API
-      :auth,
+      # :auth,
 
       # URL to the billing API
-      :billing,
+      # :billing,
 
       # List of regions under the form {"region_id": root_url}
-      :regions,
+      # :regions,
 
       # Default region. Must match a key in `regions`
       :default_region,
 
-      # Wether to use https or http
-      :https,
-
       # Configure the User Agent header
       :user_agent,
 
@@ -36,20 +34,16 @@ module Scalingo
 
       # These headers will be added to every request. Individual methods may override them.
       # This should be a hash or a callable object that returns a hash.
-      :additional_headers
+      :additional_headers,
+
+      # Specify an adapter for faraday. Leave nil for the default one (Net::HTTP)
+      :faraday_adapter,
     ]
 
     ATTRIBUTES.each { |attr| attr_accessor(attr) }
 
     def self.default
       new(
-        auth: "https://auth.scalingo.com/v1",
-        billing: "https://cashmachine.scalingo.com",
-        regions: {
-          agora_fr1: "https://api.agora-fr1.scalingo.com/v1",
-          osc_fr1: "https://api.osc-fr1.scalingo.com/v1",
-          osc_secnum_fr1: "https://api.osc-secnum-fr1.scalingo.com/v1"
-        },
         default_region: :osc_fr1,
         user_agent: "Scalingo Ruby Client v#{Scalingo::VERSION}",
         exchanged_token_validity: 1.hour,
@@ -64,28 +58,6 @@ module Scalingo
         public_send("#{name}=", attributes.fetch(name, parent&.public_send(name)))
       end
     end
-
-    def regions=(input)
-      if input.is_a?(OpenStruct)
-        @regions = input
-        return
-      end
-
-      if input.is_a?(Hash)
-        @regions = OpenStruct.new(input)
-        return
-      end
-
-      raise ArgumentError, "wrong type for argument"
-    end
-
-    def default_region=(input)
-      input = input.to_sym
-
-      raise ArgumentError, "No regions named `#{input}`" unless regions.respond_to?(input)
-
-      @default_region = input
-    end
   end
 
   def self.config

data/lib/scalingo/core_client.rb

@@ -0,0 +1,106 @@
+require "forwardable"
+require "faraday"
+require "faraday_middleware"
+require "scalingo/token_holder"
+require "scalingo/errors"
+
+module Scalingo
+  class CoreClient
+    extend Forwardable
+    include TokenHolder
+
+    attr_reader :config
+
+    def initialize(attributes = {})
+      @config = Configuration.new(attributes, Scalingo.config)
+    end
+
+    def inspect
+      str = %(<#{self.class}:0x#{object_id.to_s(16)} version:"#{Scalingo::VERSION}" authenticated:)
+
+      str << if token.present?
+        (token.expired? ? "expired" : "true")
+      else
+        "false"
+      end
+
+      str << ">"
+      str
+    end
+
+    ## Sub-clients accessors
+    def auth
+      raise NotImplementedError
+    end
+
+    def billing
+      raise NotImplementedError
+    end
+
+    def region(name = nil)
+      public_send(name || config.default_region)
+    end
+
+    ## Authentication helpers / Token management
+    def authenticate_with(access_token: nil, bearer_token: nil, expires_at: nil)
+      if !access_token && !bearer_token
+        raise ArgumentError, "You must supply one of `access_token` or `bearer_token`"
+      end
+
+      if access_token && bearer_token
+        raise ArgumentError, "You cannot supply both `access_token` and `bearer_token`"
+      end
+
+      if expires_at && !bearer_token
+        raise ArgumentError, "`expires_at` can only be used with `bearer_token`. `access_token` have a 1 hour expiration."
+      end
+
+      if access_token
+        expiration = Time.now + config.exchanged_token_validity
+        response = auth.tokens.exchange(access_token)
+
+        if response.successful?
+          self.token = BearerToken.new(
+            response.data[:token],
+            expires_at: expiration,
+            raise_on_expired: config.raise_on_expired_token,
+          )
+        end
+
+        return response.successful?
+      end
+
+      if bearer_token
+        authenticate_with_bearer_token(
+          bearer_token,
+          expires_at: expires_at,
+          raise_on_expired_token: config.raise_on_expired_token,
+        )
+
+        true
+      end
+    end
+
+    ## Delegations
+    def_delegator :auth, :keys
+    def_delegator :auth, :scm_integrations
+    def_delegator :auth, :tokens
+    def_delegator :auth, :two_factor_auth
+    def_delegator :auth, :tfa
+    def_delegator :auth, :user
+
+    def_delegator :region, :addons
+    def_delegator :region, :apps
+    def_delegator :region, :collaborators
+    def_delegator :region, :containers
+    def_delegator :region, :deployments
+    def_delegator :region, :domains
+    def_delegator :region, :environment
+    def_delegator :region, :events
+    def_delegator :region, :logs
+    def_delegator :region, :metrics
+    def_delegator :region, :notifiers
+    def_delegator :region, :operations
+    def_delegator :region, :scm_repo_links
+  end
+end

data/lib/scalingo/regional/addons.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addons)
+      unpack(:addons) { response }
     end
 
     def find(app_id, addon_id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon)
+      unpack(:addon) { response }
     end
 
     def provision(app_id, payload = {}, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon)
+      unpack(:addon) { response }
     end
 
     def update(app_id, addon_id, payload = {}, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon)
+      unpack(:addon) { response }
     end
 
     def destroy(app_id, addon_id, headers = nil, &block)
@@ -64,7 +64,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def sso(app_id, addon_id, headers = nil, &block)
@@ -77,7 +77,20 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon)
+      unpack(:addon) { response }
+    end
+
+    def token(app_id, addon_id, headers = nil, &block)
+      data = nil
+
+      response = connection.post(
+        "apps/#{app_id}/addons/#{addon_id}/token",
+        data,
+        headers,
+        &block
+      )
+
+      unpack(:addon) { response }
     end
 
     def categories(headers = nil, &block)
@@ -90,7 +103,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon_categories)
+      unpack(:addon_categories) { response }
     end
 
     def providers(headers = nil, &block)
@@ -103,7 +116,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :addon_providers)
+      unpack(:addon_providers) { response }
     end
   end
 end

data/lib/scalingo/regional/apps.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :apps)
+      unpack(:apps) { response }
     end
 
     def find(id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :app)
+      unpack(:app) { response }
     end
 
     def create(payload = {}, headers = nil, &block)
@@ -44,7 +44,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :app)
+      unpack(:app) { response }
     end
 
     def update(id, payload = {}, headers = nil, &block)
@@ -57,7 +57,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :app)
+      unpack(:app) { response }
     end
 
     def logs_url(id, headers = nil, &block)
@@ -70,7 +70,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :logs_url)
+      unpack(:logs_url) { response }
     end
 
     def destroy(id, payload = {}, headers = nil, &block)
@@ -81,7 +81,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def rename(id, payload = {}, headers = nil, &block)
@@ -92,7 +92,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :app)
+      unpack(:app) { response }
     end
 
     def transfer(id, payload = {}, headers = nil, &block)
@@ -103,7 +103,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :app)
+      unpack(:app) { response }
     end
   end
 end

data/lib/scalingo/regional/autoscalers.rb

@@ -0,0 +1,70 @@
+require "scalingo/api/endpoint"
+
+module Scalingo
+  class Regional::Autoscalers < API::Endpoint
+    def for(app_id, headers = nil, &block)
+      data = nil
+
+      response = connection.get(
+        "apps/#{app_id}/autoscalers",
+        data,
+        headers,
+        &block
+      )
+
+      unpack(:autoscalers) { response }
+    end
+
+    def find(app_id, autoscaler_id, headers = nil, &block)
+      data = nil
+
+      response = connection.get(
+        "apps/#{app_id}/autoscalers/#{autoscaler_id}",
+        data,
+        headers,
+        &block
+      )
+
+      unpack(:autoscaler) { response }
+    end
+
+    def create(app_id, payload = {}, headers = nil, &block)
+      data = {autoscaler: payload}
+
+      response = connection.post(
+        "apps/#{app_id}/autoscalers",
+        data,
+        headers,
+        &block
+      )
+
+      unpack(:autoscaler) { response }
+    end
+
+    def update(app_id, autoscaler_id, payload = {}, headers = nil, &block)
+      data = {autoscaler: payload}
+
+      response = connection.patch(
+        "apps/#{app_id}/autoscalers/#{autoscaler_id}",
+        data,
+        headers,
+        &block
+      )
+
+      unpack(:autoscaler) { response }
+    end
+
+    def destroy(app_id, autoscaler_id, headers = nil, &block)
+      data = nil
+
+      response = connection.delete(
+        "apps/#{app_id}/autoscalers/#{autoscaler_id}",
+        data,
+        headers,
+        &block
+      )
+
+      unpack { response }
+    end
+  end
+end

data/lib/scalingo/regional/collaborators.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :collaborators)
+      unpack(:collaborators) { response }
     end
 
     def destroy(app_id, collaborator_id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def invite(app_id, payload = {}, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :collaborator)
+      unpack(:collaborator) { response }
     end
 
     def accept(token, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
   end
 end

data/lib/scalingo/regional/containers.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :containers)
+      unpack(:containers) { response }
     end
 
     def scale(app_id, formation, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :containers)
+      unpack(:containers) { response }
     end
 
     def restart(app_id, scope = [], headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def sizes(headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :container_sizes)
+      unpack(:container_sizes) { response }
     end
   end
 end

data/lib/scalingo/regional/deployments.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :deployments)
+      unpack(:deployments) { response }
     end
 
     def find(app_id, deployment_id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :deployment)
+      unpack(:deployment) { response }
     end
 
     def logs(app_id, deployment_id, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :deployment)
+      unpack(:deployment) { response }
     end
   end
 end

data/lib/scalingo/regional/domains.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :domains)
+      unpack(:domains) { response }
     end
 
     def find(app_id, domain_id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :domain)
+      unpack(:domain) { response }
     end
 
     def create(app_id, payload = {}, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :domain)
+      unpack(:domain) { response }
     end
 
     def update(app_id, domain_id, payload = {}, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :domain)
+      unpack(:domain) { response }
     end
 
     def destroy(app_id, domain_id, headers = nil, &block)
@@ -64,7 +64,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
   end
 end