apisonator 2.100.1 → 2.100.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f262e191bc80bc8d4b9aaf5390fd81a900118907924d5fb50b29ac3cd7970637
-  data.tar.gz: d957ec874ea752c7d9ff6fe21dcd9fc3a7298fd4b86c7a22ee27c98aadf5ce24
+  metadata.gz: b94cc75d6c390281dd0bd610708dd395dbff74275cead465ca59d9742cb3cedf
+  data.tar.gz: 499e2bdb91ee859d20857b1ab863a4b722e9a578a781e71617f4364b9a0b0c7a
 SHA512:
-  metadata.gz: c6729a8a0a54c4b1436b7c6fa2abc1c6975ae0ade1bdce7b251d4e25126e94928860a298da95eee67eeb83e11fa19c24a8a42993c9073f1042c8ec05fd6f55f2
-  data.tar.gz: 48aaf4b44fd387ffede2633d2164ea3b320a2229b5b38ade563bf127529b42db264d210c4f41461e992bd28c7e845816ae82fae96aa693eb8090a51726702106
+  metadata.gz: '005718b444db78ebd7cf83b6e3892353af4fbf2d36dca6cc37e8bd5573d62290ad25dc2219cdf666018cfb5b71584a58ad77988e98ec64069ea3619191de6532'
+  data.tar.gz: e5f4c817c100e83aa8daeee63250dde6940fe96efe5820ba454df47ee55aef67cb575f7e40e133f8db79a9f289f36dff05df6061a4cd8258dacb32324ccf1cdf

data/Gemfile.lock

@@ -35,7 +35,7 @@ GIT
 PATH
   remote: .
   specs:
-    apisonator (2.100.1)
+    apisonator (2.100.2.pre1)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile.on_prem.lock

@@ -35,7 +35,7 @@ GIT
 PATH
   remote: .
   specs:
-    apisonator (2.100.1)
+    apisonator (2.100.2.pre1)
 
 GEM
   remote: https://rubygems.org/

data/lib/3scale/backend/listener.rb

@@ -12,9 +12,9 @@ module ThreeScale
       include Logging
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
-      ##~ sapi.basePath = "https://su1.3scale.net"
+      ##~ sapi.basePath = ""
       ##~ sapi.swaggerVersion = "0.1a"
       ##~ sapi.apiVersion = "1.0"
       ##
@@ -190,7 +190,7 @@ module ThreeScale
       private :do_api_method
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
       ##~ a = sapi.apis.add
       ##~ a.set "path" => "/transactions/authorize.xml", "format" => "xml"
@@ -243,7 +243,7 @@ module ThreeScale
       end
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
       ##~ a = sapi.apis.add
       ##~ a.set "path" => "/transactions/oauth_authorize.xml", "format" => "xml"
@@ -276,7 +276,7 @@ module ThreeScale
       end
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
       ##~ a = sapi.apis.add
       ##~ a.set "path" => "/transactions/authrep.xml", "format" => "xml"
@@ -323,7 +323,7 @@ module ThreeScale
       end
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
       ##~ a = sapi.apis.add
       ##~ a.set "path" => "/transactions/oauth_authrep.xml", "format" => "xml"
@@ -351,7 +351,7 @@ module ThreeScale
       end
 
       ## ------------ DOCS --------------
-      ##~ namespace = ENV['SAAS_SWAGGER'] == "1" ? "Service Management API" : "Service Management API (on-premises)"
+      ##~ namespace = "Service Management API"
       ##~ sapi = source2swagger.namespace(namespace)
       ##~ a = sapi.apis.add
       ##~ a.set "path" => "/transactions.xml", "format" => "xml"
@@ -432,54 +432,58 @@ module ThreeScale
 
       ## OAUTH ACCESS TOKENS
 
-      post '/services/:service_id/oauth_access_tokens.xml' do
-        check_post_content_type!
-        require_params! :service_id, :token
+      # These endpoints are deprecated and are going to be removed. For now,
+      # let's disable them.
+      if Backend.test?
+        post '/services/:service_id/oauth_access_tokens.xml' do
+          check_post_content_type!
+          require_params! :service_id, :token
 
-        service_id = params[:service_id]
-        ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
+          service_id = params[:service_id]
+          ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
 
-        app_id = params[:app_id]
-        raise ApplicationNotFound, app_id unless Application.exists?(service_id, app_id)
+          app_id = params[:app_id]
+          raise ApplicationNotFound, app_id unless Application.exists?(service_id, app_id)
 
-        OAuth::Token::Storage.create(params[:token], service_id, app_id, params[:ttl])
-      end
+          OAuth::Token::Storage.create(params[:token], service_id, app_id, params[:ttl])
+        end
 
-      delete '/services/:service_id/oauth_access_tokens/:token.xml' do
-        require_params! :service_id, :token
+        delete '/services/:service_id/oauth_access_tokens/:token.xml' do
+          require_params! :service_id, :token
 
-        service_id = params[:service_id]
-        ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
+          service_id = params[:service_id]
+          ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
 
-        token = params[:token]
+          token = params[:token]
 
-        # TODO: perhaps improve this to list the deleted tokens?
-        raise AccessTokenInvalid, token unless OAuth::Token::Storage.delete(token, service_id)
-      end
+          # TODO: perhaps improve this to list the deleted tokens?
+          raise AccessTokenInvalid, token unless OAuth::Token::Storage.delete(token, service_id)
+        end
 
-      get '/services/:service_id/applications/:app_id/oauth_access_tokens.xml' do
-        require_params! :service_id, :app_id
+        get '/services/:service_id/applications/:app_id/oauth_access_tokens.xml' do
+          require_params! :service_id, :app_id
 
-        service_id = params[:service_id]
-        ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
+          service_id = params[:service_id]
+          ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
 
-        app_id = params[:app_id]
+          app_id = params[:app_id]
 
-        raise ApplicationNotFound, app_id unless Application.exists?(service_id, app_id)
+          raise ApplicationNotFound, app_id unless Application.exists?(service_id, app_id)
 
-        @tokens = OAuth::Token::Storage.all_by_service_and_app service_id, app_id
-        builder :oauth_access_tokens
-      end
+          @tokens = OAuth::Token::Storage.all_by_service_and_app service_id, app_id
+          builder :oauth_access_tokens
+        end
 
-      get '/services/:service_id/oauth_access_tokens/:token.xml' do
-        require_params! :service_id, :token
+        get '/services/:service_id/oauth_access_tokens/:token.xml' do
+          require_params! :service_id, :token
 
-        service_id = params[:service_id]
-        ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
+          service_id = params[:service_id]
+          ensure_authenticated!(params[:provider_key], params[:service_token], service_id)
 
-        @token_to_app_id = OAuth::Token::Storage.get_credentials(params[:token], service_id)
+          @token_to_app_id = OAuth::Token::Storage.get_credentials(params[:token], service_id)
 
-        builder :oauth_app_id_by_token
+          builder :oauth_app_id_by_token
+        end
       end
 
       get '/check.txt' do

data/lib/3scale/backend/version.rb

@@ -1,5 +1,5 @@
 module ThreeScale
   module Backend
-    VERSION = '2.100.1'
+    VERSION = '2.100.2.pre1'
   end
 end

data/lib/3scale/backend/worker_metrics.rb

@@ -11,7 +11,8 @@ Yabeda.configure do
       comment "How long jobs take to run"
       unit :seconds
       tags %i[type]
-      buckets [0.005, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1]
+      # Most requests will be under 100ms, so use a higher granularity from there
+      buckets [0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.25, 0.5, 0.75, 1]
     end
   end
 end

data/lib/3scale/tasks/swagger.rake

@@ -1,46 +1,28 @@
+SPEC_FILE = 'docs/active_docs/Service Management API.json'
+
 def run_command cmd
   puts "--> executing: #{cmd}"
   puts "--> Remember to commit the resulting specs to the Porta repo."
   system cmd
 end
 
-# The file name depends on the 'namespace' defined in the Listener.
-def spec_file(type)
-  res = 'docs/active_docs/Service Management API'
-  res << ' (on-premises)' if type == :on_prem
-  "#{res}.json"
-end
-
-def generate_docs(type)
-  spec = spec_file(type)
-  cmd = type == :saas ? 'SAAS_SWAGGER=1' : 'SAAS_SWAGGER=0'
-  cmd << ' bundle exec source2swagger -f lib/3scale/backend/listener.rb -c "##~" -o docs/active_docs/.'
+def generate_docs
+  cmd = 'bundle exec source2swagger -f lib/3scale/backend/listener.rb -c "##~" -o docs/active_docs/.'
   run_command cmd
   # source2swagger is really bad at generating readable JSON
   require 'json'
-  File.write(spec, JSON.pretty_generate(JSON.parse(File.read(spec))) << "\n")
+  File.write(SPEC_FILE, JSON.pretty_generate(JSON.parse(File.read(SPEC_FILE))) << "\n")
 end
 
 namespace :docs do
   namespace :swagger do
-    namespace :generate do
-      # The swagger specs generated by these tasks need to be committed to the
-      # Porta repo: https://github.com/3scale/porta/tree/master/doc/active_docs
-      # (Service Management API (on-premises).json and Service Management
-      # API.json)
-
-      desc "Generates all swagger docs"
-      task all: [:saas, :on_prem]
-
-      desc "Generates swagger docs for SaaS"
-      task :saas do
-        generate_docs(:saas)
-      end
+    # The swagger specs generated by these tasks need to be committed to the
+    # Porta repo: https://github.com/3scale/porta/tree/master/doc/active_docs
+    # (Service Management API.json)
 
-      desc "Generates swagger docs for on-prem"
-      task :on_prem do
-        generate_docs(:on_prem)
-      end
+    desc "Generates swagger docs"
+    task :generate do
+      generate_docs
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apisonator
 version: !ruby/object:Gem::Version
-  version: 2.100.1
+  version: 2.100.2.pre1
 platform: ruby
 authors:
 - Adam Ciganek
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides a daemon that handles authorization and reporting of
   web services managed by 3scale.