Merge branch 'master' into ha-json-log-egalitarian

Author: BanzaiMan

lib/travis/api/app.rb

@@ -136,7 +136,7 @@ def initialize
           use Travis::Api::App::Middleware::OpenCensus
         end
 
-        use Rack::SSL if Endpoint.production?
+        use Rack::SSL if Endpoint.production? && !ENV['DOCKER']
         use ActiveRecord::ConnectionAdapters::ConnectionManagement
         use ActiveRecord::QueryCache
 

lib/travis/api/v3/queries/repository.rb

@@ -44,15 +44,15 @@ def find!
     def by_slug
       owner_name, repo_name = slug.split('/')
       Models::Repository.where(
-        "(lower(vcs_slug) = ? "\
+        "(lower(repositories.vcs_slug) = ? "\
         "or (lower(repositories.owner_name) = ? and lower(repositories.name) = ?)) "\
         "and lower(repositories.vcs_type) = ? "\
         "and repositories.invalidated_at is null",
         slug.downcase,
         owner_name.downcase,
         repo_name.downcase,
         provider.downcase + 'repository'
-      ).order("updated_at desc").first
+      ).order("updated_at desc, vcs_slug asc, owner_name asc, name asc, vcs_type asc").first
     end
 
     def provider

lib/travis/api/v3/queries/request_configs.rb renamed to lib/travis/api/v3/queries/request_config.rb

@@ -2,7 +2,7 @@
 require 'faraday'
 
 module Travis::API::V3
-  class Queries::RequestConfigs < Query
+  class Queries::RequestConfig < Query
     attr_reader :user, :repo
 
     def expand(user, repo)

lib/travis/api/v3/routes.rb

@@ -174,7 +174,7 @@ module Routes
       resource :request do
         route '/request/{request.id}'
         get  :find
-        post :configs
+        post :config
 
         resource :messages do
           route '/messages'

lib/travis/api/v3/services/request/configs.rb renamed to lib/travis/api/v3/services/request/config.rb

@@ -1,13 +1,13 @@
 module Travis::API::V3
-  class Services::Request::Configs < Service
+  class Services::Request::Config < Service
     result_type :request_configs
     params :ref, :config, :mode, :data
 
     def run
       repository = check_login_and_find(:repository)
       access_control.permissions(repository).create_request!
       user = access_control.user
-      result query(:request_configs).expand(user, repo)
+      result query(:request_config).expand(user, repo)
     end
 
     private

lib/travis/model/repository.rb

@@ -74,8 +74,9 @@ class Repository < Travis::Model
   scope :by_slug, ->(slug) {
     owner_name, repo_name = slug.split('/')
     without_invalidated.where(
-      "LOWER(repositories.owner_name) = ? AND LOWER(repositories.name) = ?", owner_name.downcase, repo_name.downcase
-    ).order('id DESC')
+      "(LOWER(repositories.owner_name) = ? AND LOWER(repositories.name) = ?) OR LOWER(vcs_slug) = ?",
+      owner_name.downcase, repo_name.downcase, "#{slug.downcase}"
+    ).order('id DESC, owner_name ASC, name ASC, vcs_slug ASC')
   }
   scope :search, ->(query) {
     query = query.gsub('\\', '/')

spec/v3/services/request/configs_spec.rb renamed to spec/v3/services/request/config_spec.rb

@@ -1,4 +1,4 @@
-describe Travis::API::V3::Services::Request::Configs, set_app: true do
+describe Travis::API::V3::Services::Request::Config, set_app: true do
   let(:repo) { FactoryBot.create(:repository_without_last_build, owner_name: 'svenfuchs', name: 'minimal') }
   let(:request) { Travis::API::V3::Models::Request.last }
   let(:env_var) { { id: nil, name: 'ONE', value: Travis::Settings::EncryptedValue.new('one'), public: true, branch: 'foo', repository_id: repo.id } }
@@ -41,7 +41,7 @@ def parse(str)
     let(:headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
 
     before { Travis::API::V3::Models::Permission.create(repository: repo, user: repo.owner, push: true) }
-    before { post("/v3/repo/#{repo.id}/request/configs", params, headers) }
+    before { post("/v3/repo/#{repo.id}/request/config", params, headers) }
 
     it { expect(status).to eq 200 }