Enterprise to master.

.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+group: edge
 
 import:
   - travis-ci/build-configs:db-setup.yml
@@ -19,12 +20,11 @@ env:
     - CI_NODE_INDEX=1
     - CI_NODE_INDEX=2
 
-cache: bundler
-
 services:
   - redis-server
 
 before_install:
+  - 'gem install rubygems-update -v 3.4.22'
   - 'gem update --system'
 
 jobs:

Dockerfile

@@ -2,13 +2,17 @@ FROM ruby:3.2.2-slim
 
 LABEL maintainer Travis CI GmbH <[email protected]>
 
-# packages required for bundle install
 RUN ( \
+   mkdir -p /app/vendor /app/cache; \
+   groupadd -r travis -g 1000 && \
+   useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\
+   chown -R travis:travis /app; \
    apt-get update ; \
    apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev libcurl4\
    && rm -rf /var/lib/apt/lists/* \
 )
 
+USER travis
 ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
 
 # throw errors if Gemfile has been modified since Gemfile.lock
@@ -28,4 +32,4 @@ RUN gem install --user-install executable-hooks
 
 COPY . /app
 
-CMD ./script/server-buildpacks
+CMD ["./script/server-buildpacks"]

Dockerfile.tcie

@@ -0,0 +1,44 @@
+FROM ruby:3.2.2-slim
+
+LABEL maintainer Travis CI GmbH <[email protected]>
+
+RUN ( \
+   mkdir -p /app/vendor /app/cache; \
+   groupadd -r travis -g 1000 && \
+   useradd -u 1000 -r -g travis -s /bin/sh -c "travis user" -d "/app" travis;\
+   chown -R travis:travis /app; \
+   apt-get update ; \
+   apt-get upgrade -y ; \
+   apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libjemalloc-dev xz-utils \
+   && rm -rf /var/lib/apt/lists/*; \
+   gem update --system; \
+   bundle config set app_config /app; \
+   bundle config set cache_path /app; \
+   bundle config --global frozen 1; \
+   bundle config set deployment 'true'; \
+   chown -R travis:travis /usr/local/bundle; \
+)
+
+
+
+WORKDIR /app
+
+USER travis
+COPY Gemfile*      /app/
+RUN ( \
+   bundle config set without 'development test'; \
+   bundler install --verbose --retry=3; \
+   bundle config set frozen true; \
+   )
+USER root
+RUN ( apt-get remove -y gcc g++ make git perl xz-utils && apt-get -y autoremove; \
+   bundle clean && rm -rf /app/vendor/bundle/ruby/2.7.0/cache/*; \
+   for i in `find /app/vendor/ -name \*.o -o -name \*.c -o -name \*.h`; do rm -f $i; done; \
+)
+
+USER travis
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
+
+COPY . /app
+
+CMD ["./script/server-buildpacks"]

Makefile

@@ -27,7 +27,7 @@ DOCKER ?= docker
 
 .PHONY: docker-build
 docker-build:
-	$(DOCKER) build -t $(DOCKER_DEST) .
+	$(DOCKER) build --no-cache --pull -t $(DOCKER_DEST) . -f Dockerfile.tcie
 
 .PHONY: docker-login
 docker-login:

lib/travis.rb

@@ -1,6 +1,6 @@
 require 'pusher'
 require 'travis/support'
-require 'travis/support/database'
+#require 'travis/support/database'
 require 'travis/errors'
 
 module Travis

lib/travis/api/app.rb

@@ -75,10 +75,6 @@ def self.setup(options = {})
       FileUtils.touch('/tmp/app-initialized') if ENV['DYNO'] # Heroku
     end
 
-    def self.new(options = {})
-      setup(options)
-      super()
-    end
 
     def self.deploy_sha
       @deploy_sha ||= ENV['HEROKU_SLUG_COMMIT'] || SecureRandom.hex(5)
@@ -186,6 +182,7 @@ def initialize(options = {})
 
     # Rack protocol
     def call(env)
+      #app.after { ActiveRecord::Base.clear_active_connections! }
       app.call(env)
     rescue
       if Endpoint.production?

lib/travis/api/enqueue/services/restart_model.rb

@@ -34,6 +34,9 @@ def billing?
           # there is no billing for .org
           return true if Travis.config.org?
 
+          # there is no billing for .enterprise
+          return true if !!Travis.config.enterprise
+
           @_billing_ok ||= begin
             jobs = target.is_a?(Job) ? [target] : target.matrix
 

lib/travis/api/v3/billing_client.rb

@@ -96,12 +96,6 @@ def get_invoices_for_subscription(id)
       end
     end
 
-    def get_invoices_for_v2_subscription(id)
-      body(connection.get("/v2/subscriptions/#{id}/invoices")).map do |invoice_data|
-        Travis::API::V3::Models::Invoice.new(invoice_data)
-      end
-    end
-
     def trials
       body(connection.get('/trials')).map do | trial_data |
         Travis::API::V3::Models::Trial.new(trial_data)

lib/travis/api/v3/extensions/preferences.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module Travis::API::V3
   module Extensions
     module Preferences

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

@@ -13,6 +13,8 @@ def calculate(source)
       rsa_key = OpenSSL::PKey::RSA.new(source)
       public_ssh_rsa = "\x00\x00\x00\x07ssh-rsa" + rsa_key.e.to_s(0) + rsa_key.n.to_s(0)
       OpenSSL::Digest::MD5.new(public_ssh_rsa).hexdigest.scan(/../).join(':')
+    rescue OpenSSL::PKey::RSAError
+      nil
     end
 
     module_function :calculate

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

@@ -18,6 +18,8 @@ def fingerprint_source
     def public_key
       return unless value.decrypt
       OpenSSL::PKey::RSA.new(value.decrypt).public_key.to_s
+    rescue OpenSSL::PKey::RSAError
+      nil
     end
 
     def to_h

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

@@ -1,3 +1,5 @@
+require 'json'
+
 module Travis::API::V3
   class Models::UserSettings < Models::JsonSlice
     child Models::UserSetting

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

@@ -11,7 +11,6 @@ def create(repository, from_admin = false)
       env_vars.user = repository.user_settings.user
       env_vars.change_source = 'travis-api' unless from_admin
       env_var = env_vars.create(env_var_params)
-
       unless env_var.valid?
         repository.env_vars.destroy(env_var.id)
         handle_errors(env_var)
@@ -34,5 +33,9 @@ def handle_errors(env_var)
 
         raise ServerError
       end
+
+      def errors_(env_var, what)
+        env_var.errors.errors.any? { |e| e.type.to_s  == what}
+      end
   end
 end

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

@@ -34,7 +34,14 @@ def for_owner(relation)
 
     def for_user(user)
       set_custom_timeout(host_timeout)
-      jobs = V3::Models::Job.where("jobs.id in (select id from most_recent_job_ids_for_user_repositories_by_states(#{user.id}, ?))", states)
+      if ENV['TCIE_BETA_MOST_RECENT_JOBS_LW'] == 'true'
+        puts "USING LW JOBS!!\n\n"
+        jobs = V3::Models::Job.where("jobs.id in (select id from most_recent_job_ids_for_user_repositories_by_states_lw(#{user.id}, ?))", states)
+      else
+        puts "USING REGULAR JOBS!!!\n\n"
+        jobs = V3::Models::Job.where("jobs.id in (select id from most_recent_job_ids_for_user_repositories_by_states(#{user.id}, ?))", states)
+      end
+      puts jobs.inspect
 
       sort filter(jobs)
     end

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

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Queries::Request < Query
-    params :id, :message, :branch, :sha, :merge_mode, :config, :configs, :token, prefix: :request
+    params :id, :message, :branch, :sha, :tag_name, :merge_mode, :config, :configs, :token, prefix: :request
 
     def find
       raise WrongParams, 'missing request.id'.freeze unless id
@@ -36,6 +36,7 @@ def schedule(repository, user)
         id: request.id,
         message: message,
         branch: branch || repository.default_branch.name,
+        tag_name: tag_name,
         sha: sha,
         configs: request_configs,
         # BC, remove once everyone is on yml/configs, coordinate with Gatekeeper

lib/travis/api/v3/renderer/user_settings.rb

@@ -12,6 +12,8 @@ def render
     end
 
     def allow?(setting)
+      return unless setting
+
       case setting[:name]
       when :allow_config_imports then repo.private?
       else true

lib/travis/api/v3/routes.rb

@@ -470,9 +470,5 @@ module Routes
       get :stats, '/stats'
     end
 
-    hidden_resource :leads do
-      route '/leads'
-      post :create
-    end
   end
 end

lib/travis/api/v3/services.rb

@@ -37,7 +37,6 @@ module Services
     Job                   = Module.new { extend Services }
     Jobs                  = Module.new { extend Services }
     KeyPair               = Module.new { extend Services }
-    Leads                 = Module.new { extend Services }
     Lint                  = Module.new { extend Services }
     Log                   = Module.new { extend Services }
     ScanResult            = Module.new { extend Services }

lib/travis/api/v3/services/user_setting/update.rb

@@ -6,11 +6,11 @@ class Services::UserSetting::Update < Service
     def run!
       repository = check_login_and_find(:repository)
       return repo_migrated if migrated?(repository)
-      
+
       user_setting = query.find(repository)
-      access_control.permissions(user_setting).write!
+      access_control.permissions(user_setting).write! if user_setting
       app_id = Travis::Api::App::AccessToken.find_by_token(access_control.token).app_id
-      
+
       user_setting = query.update(repository, access_control.user, app_id == 2)
       result user_setting
     end

lib/travis/api/v3/services/v2_subscriptions/create.rb

@@ -7,7 +7,6 @@ class Services::V2Subscriptions::Create < Service
 
     def run!
       raise LoginRequired unless access_control.full_access_or_logged_in?
-
       result query(:v2_subscriptions).create(access_control.user.id), status: 201
     end
   end

lib/travis/config/defaults.rb

@@ -43,8 +43,8 @@ def fallback_logs_api_auth_token
             amqp:                 { username: 'guest', password: 'guest', host: 'localhost', prefetch: 1 },
             closeio:              { key: 'key' },
             gdpr:                 {},
-            database:             { adapter: 'postgresql', database: "travis_#{Travis.env}", encoding: 'unicode', min_messages: 'warning', variables: { statement_timeout: 10_000 } },
-            db:                   { max_statement_timeout_in_seconds: 15, slow_host_max_statement_timeout_in_seconds: 60},
+            database:             { adapter: 'postgresql', database: "travis_#{Travis.env}", encoding: 'unicode', min_messages: 'warning', variables: { statement_timeout: ENV['TRAVIS_DB_STATEMENT_TIMEOUT'] || 10000 } },
+            db:                   { max_statement_timeout_in_seconds: 15, slow_host_max_statement_timeout_in_seconds: ENV['TRAVIS_MAX_DB_STATEMENT_TIMEOUT'] || 15},
             log_options:          { s3: { access_key_id: '', secret_access_key: ''}},
             s3:                   { access_key_id: '', secret_access_key: ''},
             pusher:               { app_id: 'app-id', key: 'key', secret: 'secret' },

lib/travis/event/handler/metrics.rb

@@ -1,4 +1,5 @@
 require 'metriks'
+require 'travis/support'
 
 module Travis
   module Event

lib/travis/model/build.rb

@@ -147,6 +147,10 @@ def per_page
     end
   end
 
+  def state
+    (super || :created).to_sym
+  end
+
   def matrix_ids
     matrix.map(&:id)
   end