scalingo 3.0.0.beta.2 → 3.1.0

data/lib/scalingo/regional/environment.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :variables)
+      unpack(:variables) { response }
     end
 
     def create(app_id, payload = {}, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :variable)
+      unpack(:variable) { response }
     end
 
     def update(app_id, variable_id, value, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :variable)
+      unpack(:variable) { response }
     end
 
     def destroy(app_id, variable_id, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def bulk_update(app_id, variables, headers = nil, &block)
@@ -64,7 +64,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :variables)
+      unpack(:variables) { response }
     end
 
     def bulk_destroy(app_id, variable_ids, headers = nil, &block)
@@ -77,7 +77,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
   end
 end

data/lib/scalingo/regional/events.rb

@@ -10,7 +10,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :events)
+      unpack(:events) { response }
     end
 
     def for(app_id, payload = {}, headers = nil, &block)
@@ -23,7 +23,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :events)
+      unpack(:events) { response }
     end
 
     def types(headers = nil, &block)
@@ -36,7 +36,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :event_types)
+      unpack(:event_types) { response }
     end
 
     def categories(headers = nil, &block)
@@ -49,7 +49,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :event_categories)
+      unpack(:event_categories) { response }
     end
   end
 end

data/lib/scalingo/regional/logs.rb

@@ -10,7 +10,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def archives(app_id, headers = nil, &block)
@@ -23,7 +23,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :archives)
+      unpack(:archives) { response }
     end
 
     ## Helper method to avoid having to manually chain two operations

data/lib/scalingo/regional/metrics.rb

@@ -1,4 +1,5 @@
 require "scalingo/api/endpoint"
+require "active_support"
 require "active_support/core_ext/hash/indifferent_access"
 
 module Scalingo
@@ -22,7 +23,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def types(headers = nil, &block)
@@ -35,7 +36,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :metrics)
+      unpack(:metrics) { response }
     end
   end
 end

data/lib/scalingo/regional/notifiers.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :notifiers)
+      unpack(:notifiers) { response }
     end
 
     def find(app_id, notifier_id, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :notifier)
+      unpack(:notifier) { response }
     end
 
     def create(app_id, payload = {}, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :notifier)
+      unpack(:notifier) { response }
     end
 
     def update(app_id, notifier_id, payload = {}, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :notifier)
+      unpack(:notifier) { response }
     end
 
     def destroy(app_id, notifier_id, headers = nil, &block)
@@ -64,7 +64,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def test(app_id, notifier_id, headers = nil, &block)
@@ -77,7 +77,7 @@ module Scalingo
         &block
       )
 
-      unpack(response)
+      unpack { response }
     end
 
     def platforms(headers = nil, &block)
@@ -90,7 +90,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :notification_platforms)
+      unpack(:notification_platforms) { response }
     end
   end
 end

data/lib/scalingo/regional/operations.rb

@@ -20,7 +20,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :operation)
+      unpack(:operation) { response }
     end
   end
 end

data/lib/scalingo/regional/scm_repo_links.rb

@@ -12,7 +12,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :scm_repo_link)
+      unpack(:scm_repo_link) { response }
     end
 
     def create(app_id, payload = {}, headers = nil, &block)
@@ -25,7 +25,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :scm_repo_link)
+      unpack(:scm_repo_link) { response }
     end
 
     def update(app_id, payload = {}, headers = nil, &block)
@@ -38,7 +38,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :scm_repo_link)
+      unpack(:scm_repo_link) { response }
     end
 
     def destroy(app_id, headers = nil, &block)
@@ -51,7 +51,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :scm_repo_link)
+      unpack(:scm_repo_link) { response }
     end
 
     def deploy(app_id, branch, headers = nil, &block)
@@ -64,7 +64,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :deployment)
+      unpack(:deployment) { response }
     end
 
     def review_app(review_app, pull_request_id, headers = nil, &block)
@@ -77,7 +77,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :review_app)
+      unpack(:review_app) { response }
     end
 
     def branches(app_id, headers = nil, &block)
@@ -90,7 +90,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :branches)
+      unpack(:branches) { response }
     end
 
     def pulls(app_id, headers = nil, &block)
@@ -103,7 +103,7 @@ module Scalingo
         &block
       )
 
-      unpack(response, key: :pulls)
+      unpack(:pulls) { response }
     end
   end
 end

data/lib/scalingo/regional.rb

@@ -4,6 +4,7 @@ module Scalingo
   class Regional < API::Client
     require "scalingo/regional/addons"
     require "scalingo/regional/apps"
+    require "scalingo/regional/autoscalers"
     require "scalingo/regional/collaborators"
     require "scalingo/regional/containers"
     require "scalingo/regional/deployments"
@@ -19,6 +20,7 @@ module Scalingo
     register_handlers!(
       addons: Addons,
       apps: Apps,
+      autoscalers: Autoscalers,
       collaborators: Collaborators,
       containers: Containers,
       deployments: Deployments,

data/lib/scalingo/token_holder.rb

@@ -0,0 +1,31 @@
+require "scalingo/bearer_token"
+
+module Scalingo
+  module TokenHolder
+    def self.included(base)
+      base.attr_reader :token
+    end
+
+    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_bearer_token(bearer_token, expires_at:, raise_on_expired_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: raise_on_expired_token,
+        )
+      else
+        bearer_token
+      end
+    end
+  end
+end

data/lib/scalingo/version.rb

@@ -1,3 +1,3 @@
 module Scalingo
-  VERSION = "3.0.0.beta.2"
+  VERSION = "3.1.0"
 end

data/samples/auth/user/stop-free-trial.json

@@ -0,0 +1,24 @@
+{
+  "path": "/users/stop_free_trial",
+  "method": "post",
+  "request": {
+    "headers": {
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Date": "Thu, 27 Aug 2020 10:46:32 GMT",
+      "Etag": "W/\"08bf4adf1520d417f7f03783353a3b5d\"",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "max-age=0, private, must-revalidate",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "message": "ok"
+    }
+  }
+}

data/samples/regional/addons/token-200.json

@@ -0,0 +1,49 @@
+{
+  "path": "/apps/5ed10967884fef000f5e4fff/addons/ad-6733873b-1628-4b8e-8e74-c30f1c3f3b63/token",
+  "method": "post",
+  "request": {
+    "headers": {
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Date": "Fri, 29 May 2020 13:09:00 GMT",
+      "Etag": "W/\"ece1ff1263aad47584f356e20127cf3b\"",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "max-age=0, private, must-revalidate",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "addon": {
+        "id": "ad-6733873b-1628-4b8e-8e74-c30f1c3f3b63",
+        "app_id": "5ed10967884fef000f5e4fff",
+        "resource_id": "some_example_5629",
+        "addon_provider": {
+          "id": "postgresql",
+          "name": "PostgreSQL",
+          "logo_url": "//cdn.scalingo.com/addons/Scalingo_Postgresql.svg"
+        },
+        "plan": {
+          "id": "5d1e03873e6b3b000eefa827",
+          "name": "postgresql-sandbox",
+          "display_name": "Sandbox",
+          "price": 0.0,
+          "description": "<p>Pouet</p>\n",
+          "position": null,
+          "on_demand": false,
+          "disabled": false,
+          "disabled_alternative_plan_id": null,
+          "sku": "ovh-st-fr1-postgresql-sandbox"
+        },
+        "provisioned_at": "2020-05-29T13:08:58.103Z",
+        "deprovisioned_at": null,
+        "status": "provisioning",
+        "token": "eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJTY2FsaW5nbyIsImlhdCI6MTU5Mjg0MjQ3OSwidXVpZCI6InVzLTY3NmJiMGMxLTFjYTktNDY4Mi04ZWUxLTI1NzQyMmU5ZWFiNSIsInJuZCI6IjlhZGZlMzNlNDUxNzNmZTBiNjg4ZjQxZTY4OTg1OWQ0IiwiZXhwIjoxNTkyODQ2MDc5LCJhZGRvbl91dWlkIjoiYWQtNTRlYzczMzItYjViOS00MGUyLTg2NWQtYmNkYTg1Yzc2Y2I2In0.-rYijDhFRWcycSFLcCbdQD3tg9rh1MhXE_rTvlOtQt-48BJcPmxH9Wpazzp7tkspYrx8jfIrWrALoujvW33WVw"
+      }
+    }
+  }
+}

data/samples/regional/addons/token-404.json

@@ -0,0 +1,24 @@
+{
+  "path": "/apps/5ed10967884fef000f5e4fff/addons/wrong-addon-id/token",
+  "method": "post",
+  "request": {
+    "headers": {
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 404,
+    "headers": {
+      "Date": "Fri, 29 May 2020 13:08:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "resource": "addon",
+      "error": "not found"
+    }
+  }
+}

data/samples/regional/autoscalers/_meta.json

@@ -0,0 +1,27 @@
+{
+  "app_id": "example-running-application",
+  "id": "sc-5418fe67-885d-4e50-8cbe-9a9a2d2d690a",
+  "not_found_id": "wrong-autoscaler-id",
+  "create": {
+    "invalid": {
+      "container_type": "web",
+      "min_containers": 3,
+      "metric": "rpm_per_container"
+    },
+    "valid": {
+      "container_type": "web",
+      "min_containers": 3,
+      "max_containers": 7,
+      "metric": "rpm_per_container",
+      "target": 150
+    }
+  },
+  "update": {
+    "invalid": {
+      "metric": "unknown"
+    },
+    "valid": {
+      "target": 200
+    }
+  }
+}

data/samples/regional/autoscalers/create-201.json

@@ -0,0 +1,49 @@
+{
+  "path": "/apps/example-running-application/autoscalers",
+  "method": "post",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token",
+      "Content-Type": "application/json"
+    },
+    "json_body": {
+      "autoscaler": {
+        "container_type": "web",
+        "min_containers": 3,
+        "max_containers": 7,
+        "metric": "rpm_per_container",
+        "target": 150
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:29 GMT",
+      "Etag": "W/\"90db16192d022937f3968d284f6e4f77\"",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "max-age=0, private, must-revalidate",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "autoscaler": {
+        "created_at": "2020-08-28T11:48:29.963295861Z",
+        "updated_at": "2020-08-28T11:48:29.963296084Z",
+        "id": "sc-5418fe67-885d-4e50-8cbe-9a9a2d2d690a",
+        "app_id": "5f48ecb6f112e2000ef34f14",
+        "container_type": "web",
+        "alert_id_scale_up": "al-ecf1cff6-c415-4e7b-8a86-e0ef697b2d87",
+        "alert_id_scale_down": "al-6ef726e8-d69b-44e1-8d67-3acef2a4802d",
+        "min_containers": 3,
+        "max_containers": 7,
+        "last_scale": "0001-01-01T00:00:00Z",
+        "disabled": false,
+        "metric": "rpm_per_container",
+        "target": 150
+      }
+    }
+  }
+}

data/samples/regional/autoscalers/create-500.json

@@ -0,0 +1,32 @@
+{
+  "path": "/apps/example-running-application/autoscalers",
+  "method": "post",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token",
+      "Content-Type": "application/json"
+    },
+    "json_body": {
+      "autoscaler": {
+        "container_type": "web",
+        "min_containers": 3,
+        "metric": "rpm_per_container"
+      }
+    }
+  },
+  "response": {
+    "status": 500,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "error": "Internal error occured, we're on it!"
+    }
+  }
+}

data/samples/regional/autoscalers/destroy-204.json

@@ -0,0 +1,20 @@
+{
+  "path": "/apps/example-running-application/autoscalers/sc-5418fe67-885d-4e50-8cbe-9a9a2d2d690a",
+  "method": "delete",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 204,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:32 GMT",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "body": ""
+  }
+}

data/samples/regional/autoscalers/destroy-404.json

@@ -0,0 +1,25 @@
+{
+  "path": "/apps/example-running-application/autoscalers/wrong-autoscaler-id",
+  "method": "delete",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 404,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "resource": "autoscaler",
+      "error": "not found"
+    }
+  }
+}

data/samples/regional/autoscalers/find-200.json

@@ -0,0 +1,39 @@
+{
+  "path": "/apps/example-running-application/autoscalers/sc-5418fe67-885d-4e50-8cbe-9a9a2d2d690a",
+  "method": "get",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:30 GMT",
+      "Etag": "W/\"c870c2f312d82030bde9ae13625f746d\"",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "max-age=0, private, must-revalidate",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "autoscaler": {
+        "created_at": "2020-08-28T11:48:29.963Z",
+        "updated_at": "2020-08-28T11:48:29.963Z",
+        "id": "sc-5418fe67-885d-4e50-8cbe-9a9a2d2d690a",
+        "app_id": "5f48ecb6f112e2000ef34f14",
+        "container_type": "web",
+        "alert_id_scale_up": "al-ecf1cff6-c415-4e7b-8a86-e0ef697b2d87",
+        "alert_id_scale_down": "al-6ef726e8-d69b-44e1-8d67-3acef2a4802d",
+        "min_containers": 3,
+        "max_containers": 7,
+        "last_scale": "0001-01-01T00:00:00Z",
+        "disabled": false,
+        "metric": "rpm_per_container",
+        "target": 150
+      }
+    }
+  }
+}

data/samples/regional/autoscalers/find-404.json

@@ -0,0 +1,25 @@
+{
+  "path": "/apps/example-running-application/autoscalers/wrong-autoscaler-id",
+  "method": "get",
+  "request": {
+    "headers": {
+      "Accept": "application/json",
+      "Authorization": "Bearer the-bearer-token"
+    }
+  },
+  "response": {
+    "status": 404,
+    "headers": {
+      "Date": "Fri, 28 Aug 2020 11:48:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache",
+      "Referrer-Policy": "strict-origin-when-cross-origin"
+    },
+    "json_body": {
+      "resource": "autoscaler",
+      "error": "not found"
+    }
+  }
+}