Merge remote-tracking branch 'origin/master' into ha-updates

Author: BanzaiMan

.travis.yml

@@ -1,14 +1,20 @@
 language: ruby
 
 import:
-  - travis-ci/build-configs:db-setup.yml
+  - travis-ci/build-configs:db-setup.yml@bionic
 
 rvm: 2.6.5
 
 script: "bundle exec rake knapsack:rspec"
 
+addons:
+  - snaps:
+    - name: docker
+      channel: latest/beta
+
 env:
   global:
+    - PATH=/snap/bin:$PATH
     - RUBY_GC_MALLOC_LIMIT=90000000
     - RUBY_GC_HEAP_FREE_SLOTS=200000
     - CI_NODE_TOTAL=3
@@ -32,4 +38,4 @@ jobs:
       install: echo skip
       before_script: echo skip
       script: make ship
-      if: type = cron OR commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true
+      if: commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true or branch = master

Gemfile.lock

@@ -61,9 +61,9 @@ GIT
 
 GIT
   remote: https://github.com/travis-ci/travis-github_apps
-  revision: fb865ee510534006f15553f4ef3746c2610a4668
+  revision: c96dc9330849ff3e2ccd7c9d00005a1a96c1a4b6
   specs:
-    travis-github_apps (0.2.0)
+    travis-github_apps (0.2.1)
       activesupport (>= 3.2)
       faraday
       faraday_middleware
@@ -399,7 +399,7 @@ GEM
     timecop (0.9.1)
     tool (0.2.3)
     travis-rollout (0.0.2)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.0.15)
     unf (0.1.4)

Makefile

@@ -48,7 +48,7 @@ docker-push-branch:
 .PHONY: ship
 ship: docker-build docker-login
 
-ifeq ($(BRANCH),master)
+ifeq ($(TRAVIS_BRANCH),master)
 ifeq ($(TRAVIS_PULL_REQUEST),false)
 ship: docker-push-latest-master
 endif

README.md

@@ -149,3 +149,4 @@ Start with the find/get spec (for example: spec/v3/services/caches/find_spec.rb)
  Re-run the test at this point. Depending on what objects you are returning you may also need to add:
  - Add a model (either pulls from the DB or a wrapper for the class of the objects returned from another source (s3 for example), or that structures the result you will be passing back to the client)
  - Add a renderer (if needed to display your new model/object/collection).
+ 

lib/travis/api/app/endpoint/authorization.rb

@@ -104,7 +104,7 @@ class Authorization < Endpoint
       #
       # * **redirect_uri**: URI to redirect to after handshake.
       get '/handshake/?:provider?' do
-        method = Travis::Features.enabled_for_all?(:vcs_login) ? :vcs_handshake : :handshake
+        method = org? ? :handshake : :vcs_handshake
         params[:provider] ||= 'github'
 
         send(method) do |user, token, redirect_uri|

lib/travis/api/app/middleware/user_agent_tracker.rb

@@ -11,15 +11,33 @@ class UserAgentTracker < Middleware
         "Opera", "Mozilla"
       ]
 
+      PATHS_IGNORED = [
+        '/uptime'
+      ]
+
+      attr_reader :metrik_prefix
+
+      before do
+        @metrik_prefix = if version = request.env['HTTP_TRAVIS_API_VERSION'].to_s.match(/^\d+(\.\d+)*/)
+          "api.v#{version}"
+        else
+          "api.v2"
+        end
+      end
+
       before(agent: /^$/) do
-        ::Metriks.meter("api.v2.user_agent.missing").mark
+        return if PATHS_IGNORED.include?(request.path)
+        ::Metriks.meter("#{metrik_prefix}.user_agent.missing").mark
         halt(400, "error" => "missing User-Agent header") if Travis::Features.feature_active?(:require_user_agent)
       end
 
       before(agent: /^.+$/) do
+        return if PATHS_IGNORED.include?(request.path)
         agent = UserAgent.parse(request.user_agent)
         case agent.browser
-        when *WEB_BROWSERS                   then mark_browser
+        when *WEB_BROWSERS
+          # if X-User-Agent header is set, honor that instead
+          mark :browser, UserAgent.parse(env['HTTP_X_USER_AGENT'] || request.user_agent).browser
         when "curl", "Wget"                  then mark(:console, agent.browser)
         when "travis-api-wrapper"            then mark(:script, :node_js, agent.browser)
         when "TravisPy"                      then mark(:script, :python,  agent.browser)
@@ -30,12 +48,6 @@ class UserAgentTracker < Middleware
         end
       end
 
-      def mark_browser
-        # allows a JavaScript Client to set X-User-Agent, for instance to "travis-web" in travis-web
-        x_agent = UserAgent.parse(env['HTTP_X_USER_AGENT'] || 'unknown').browser
-        mark(:browser, x_agent)
-      end
-
       def mark_travis(agent)
         command = agent.application.comment.detect { |c| c.start_with? "command " } if agent.application.comment
 
@@ -54,7 +66,7 @@ def mark_unknown
       end
 
       def mark(*keys)
-        key = "api.v2.user_agent." << keys.map { |k| k.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_') }.join('.')
+        key = "#{metrik_prefix}.user_agent." << keys.map { |k| k.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_') }.join('.')
         ::Metriks.meter(key).mark
       end
     end

lib/travis/api/sidekiq.rb

@@ -27,7 +27,8 @@ def gatekeeper_client
       def gatekeeper_pool
         ::Sidekiq::RedisConnection.create(
           url: config.redis_gatekeeper.url,
-          namespace: config.sidekiq.namespace
+          namespace: config.sidekiq.namespace,
+          id: nil
         )
       end
 

lib/travis/api/v3/billing_client.rb

@@ -90,6 +90,11 @@ def get_coupon(code)
       handle_coupon_response(response)
     end
 
+    def update_organization_billing_permission(organization_id, billing_admin_only)
+      response = connection.patch("/organization/permission_update/#{organization_id}", billing_admin_only)
+      handle_subscription_response(response)
+    end
+
     private
 
     def handle_subscription_response(response)

lib/travis/api/v3/github.rb

@@ -88,7 +88,7 @@ def deactivate_service_hook(repo)
     end
 
     def service_hook(repo)
-      hooks(repo).detect { |h| h['name'] == 'travis' && h.dig('config', 'domain') == service_hook_url.host }
+      hooks(repo).detect { |h| h['name'] == 'travis' && h.dig('config', 'domain') == service_hook_url.to_s }
     end
 
     def service_hook_url?(repo)

lib/travis/api/v3/models/build.rb

@@ -3,6 +3,9 @@ class Models::BuildConfig < Model
   end
 
   class Models::Build < Model
+
+    HIGH_PRIORITY = 5
+    
     belongs_to :commit
     belongs_to :tag
     belongs_to :pull_request
@@ -30,6 +33,8 @@ class Models::Build < Model
       primary_key: [:repository_id, :branch],
       class_name:  'Travis::API::V3::Models::Branch'.freeze
 
+    scope :running_builds, -> { where.not(state: ['passed', 'failed', 'errored', 'cancelled']) }
+
     def created_by
       return unless sender
       sender.becomes(created_by_class)
@@ -88,5 +93,9 @@ def clear_debug_options!
     def log_complete
       jobs.all?(&:log_complete)
     end
+
+    def high_priority?
+      jobs.where(priority: HIGH_PRIORITY).present?
+    end
   end
 end