shipit-engine 0.21.0 → 0.22.0

data/app/jobs/shipit/destroy_job.rb

@@ -0,0 +1,9 @@
+module Shipit
+  class DestroyJob < BackgroundJob
+    queue_as :default
+
+    def perform(instance)
+      instance.destroy
+    end
+  end
+end

data/app/jobs/shipit/github_sync_job.rb

@@ -15,7 +15,7 @@ module Shipit
         new_commits, shared_parent = fetch_missing_commits { @stack.github_commits }
 
         @stack.transaction do
-          shared_parent.try!(:detach_children!)
+          shared_parent&.detach_children!
           appended_commits = new_commits.map do |gh_commit|
             append_commit(gh_commit)
           end

data/app/jobs/shipit/setup_github_hook_job.rb

@@ -1,11 +1,9 @@
 module Shipit
   class SetupGithubHookJob < BackgroundJob
-    include BackgroundJob::Unique
-
     queue_as :default
 
     def perform(hook)
-      hook.setup!
+      # TODO: app-migration, delete this job
     end
   end
 end

data/app/models/shipit/anonymous_user.rb

@@ -23,6 +23,9 @@ module Shipit
     def id
     end
 
+    def github_id
+    end
+
     def logged_in?
       false
     end
@@ -49,7 +52,7 @@ module Shipit
     end
 
     def github_api
-      Shipit.github_api
+      Shipit.github.api
     end
   end
 end

data/app/models/shipit/commit.rb

@@ -6,7 +6,7 @@ module Shipit
 
     belongs_to :stack
     has_many :deploys
-    has_many :statuses, -> { order(created_at: :desc) }, dependent: :destroy
+    has_many :statuses, -> { order(created_at: :desc) }, dependent: :destroy, inverse_of: :commit
     has_many :commit_deployments, dependent: :destroy
     belongs_to :pull_request, inverse_of: :merge_commit, optional: true
 
@@ -71,8 +71,8 @@ module Shipit
         committer: User.find_or_create_from_github(commit.committer || commit.commit.committer),
         committed_at: commit.commit.committer.date,
         authored_at: commit.commit.author.date,
-        additions: commit.stats.try!(:additions),
-        deletions: commit.stats.try!(:deletions),
+        additions: commit.stats&.additions,
+        deletions: commit.stats&.deletions,
       )
     end
 
@@ -92,7 +92,7 @@ module Shipit
     end
 
     def refresh_statuses!
-      github_statuses = stack.handle_github_redirections { Shipit.github_api.statuses(github_repo_name, sha) }
+      github_statuses = stack.handle_github_redirections { Shipit.github.api.statuses(github_repo_name, sha) }
       github_statuses.each do |status|
         create_status_from_github!(status)
       end
@@ -170,7 +170,7 @@ module Shipit
     end
 
     def github_commit
-      @github_commit ||= Shipit.github_api.commit(github_repo_name, sha)
+      @github_commit ||= Shipit.github.api.commit(github_repo_name, sha)
     end
 
     def schedule_fetch_stats!
@@ -179,8 +179,8 @@ module Shipit
 
     def fetch_stats!
       update!(
-        additions: github_commit.stats.try!(:additions),
-        deletions: github_commit.stats.try!(:deletions),
+        additions: github_commit.stats&.additions,
+        deletions: github_commit.stats&.deletions,
       )
     end
 
@@ -210,7 +210,7 @@ module Shipit
     end
 
     def deploy_requested_at
-      if pull_request.try!(:merged?)
+      if pull_request&.merged?
         pull_request.merge_requested_at
       else
         created_at

data/app/models/shipit/commit_deployment.rb

@@ -23,19 +23,19 @@ module Shipit
       response = begin
         create_deployment_on_github(author.github_api)
       rescue Octokit::ClientError
-        raise if Shipit.github_api == author.github_api
+        raise if Shipit.github.api == author.github_api
         # If the deploy author didn't gave us the permission to create the deployment we falback the the main shipit
         # user.
         #
         # Octokit currently raise NotFound, but I'm convinced it should be Forbidden if the user can see the repository.
         # So to be future proof I catch boths.
-        create_deployment_on_github(Shipit.github_api)
+        create_deployment_on_github(Shipit.github.api)
       end
       update!(github_id: response.id, api_url: response.url)
     end
 
     def pull_request_head
-      pull_request = Shipit.github_api.pull_request(stack.github_repo_name, commit.pull_request_number)
+      pull_request = Shipit.github.api.pull_request(stack.github_repo_name, commit.pull_request_number)
       pull_request.head.sha
     end
 

data/app/models/shipit/commit_deployment_status.rb

@@ -11,13 +11,13 @@ module Shipit
       response = begin
         create_status_on_github(author.github_api)
       rescue Octokit::ClientError
-        raise if Shipit.github_api == author.github_api
+        raise if Shipit.github.api == author.github_api
         # If the deploy author didn't gave us the permission to create the deployment we falback the the main shipit
         # user.
         #
         # Octokit currently raise NotFound, but I'm convinced it should be Forbidden if the user can see the repository.
         # So to be future proof I catch boths.
-        create_status_on_github(Shipit.github_api)
+        create_status_on_github(Shipit.github.api)
       end
       update!(github_id: response.id, api_url: response.url)
     end

data/app/models/shipit/deploy.rb

@@ -39,12 +39,12 @@ module Shipit
 
     def build_rollback(user = nil, env: nil, force: false)
       Rollback.new(
-        user_id: user.try!(:id),
+        user_id: user&.id,
         stack_id: stack_id,
         parent_id: id,
         since_commit: stack.last_deployed_commit,
         until_commit: until_commit,
-        env: env.try!(:to_h) || {},
+        env: env&.to_h || {},
         allow_concurrency: force,
         ignored_safeties: force,
       )
@@ -159,7 +159,7 @@ module Shipit
 
     def default_since_commit_id
       return unless stack
-      @default_since_commit_id ||= last_successful_deploy.try!(:until_commit_id)
+      @default_since_commit_id ||= last_successful_deploy&.until_commit_id
     end
 
     def denormalize_commit_stats

data/app/models/shipit/deploy_spec/file_system.rb

@@ -33,10 +33,10 @@ module Shipit
           'merge' => {
             'require' => pull_request_required_statuses,
             'ignore' => pull_request_ignored_statuses,
-            'revalidate_after' => revalidate_pull_requests_after.try!(:to_i),
+            'revalidate_after' => revalidate_pull_requests_after&.to_i,
             'max_divergence' => {
-              'commits' => max_divergence_commits.try!(:to_i),
-              'age' => max_divergence_age.try!(:to_i),
+              'commits' => max_divergence_commits&.to_i,
+              'age' => max_divergence_age&.to_i,
             },
           },
           'ci' => {

data/app/models/shipit/deploy_spec/kubernetes_discovery.rb

@@ -25,10 +25,16 @@ module Shipit
 
       private
 
+      def timeout_duration
+        duration = kube_config.fetch('timeout', '900s')
+        Duration.parse(duration).to_i if duration.present?
+      end
+
       def discover_kubernetes
         return if kube_config.blank?
 
         cmd = ["kubernetes-deploy"]
+        cmd += ["--max-watch-seconds", timeout_duration] if timeout_duration
         if kube_config['template_dir']
           cmd << '--template-dir'
           cmd << kube_config['template_dir']
@@ -45,11 +51,13 @@ module Shipit
       end
 
       def kubernetes_restart_cmd
-        Shellwords.join([
+        cmd = [
           "kubernetes-restart",
           kube_config.fetch('namespace'),
           kube_config.fetch('context'),
-        ])
+        ]
+        cmd += ["--max-watch-seconds", timeout_duration] if timeout_duration
+        Shellwords.join(cmd)
       end
     end
   end

data/app/models/shipit/github_hook.rb

@@ -1,28 +1,11 @@
 module Shipit
   class GithubHook < ActiveRecord::Base
-    include SecureCompare
-
+    # TODO: app-migration, delete class
     belongs_to :stack, required: false # Required for fixtures
 
-    before_create :generate_secret
     before_destroy :teardown!
 
-    def verify_signature(signature, message)
-      algorithm, signature = signature.split("=", 2)
-      return false unless algorithm == 'sha1'
-
-      secure_compare(signature, OpenSSL::HMAC.hexdigest(algorithm, secret, message))
-    end
-
     delegate :github_repo_name, to: :stack
-    def setup!
-      hook = already_setup? ? update_hook! : create_hook!
-      update!(github_id: hook.id, api_url: hook.rels[:self].href)
-    end
-
-    def schedule_setup!
-      SetupGithubHookJob.perform_later(self)
-    end
 
     def teardown!
       destroy_hook! if already_setup?
@@ -37,36 +20,8 @@ module Shipit
       github_id?
     end
 
-    private
-
-    def update_hook!
-      edit_hook!
-    rescue Octokit::NotFound
-      create_hook!
-    end
-
-    def endpoint_url
-      raise NotImplementedError.new('Subclasses must implement a `endpoint_url` method')
-    end
-
-    def hook_properties
-      {url: endpoint_url, content_type: 'json', secret: secret}
-    end
-
-    def generate_secret
-      self.secret = SecureRandom.hex
-    end
-
-    def url_helpers
-      Shipit::Engine.routes.url_helpers
-    end
-
-    def host
-      Shipit.host
-    end
-
     def api
-      Shipit.github_api
+      Shipit.legacy_github_api
     end
 
     class Repo < GithubHook
@@ -74,37 +29,10 @@ module Shipit
 
       private
 
-      def create_hook!
-        api.create_hook(github_repo_name, 'web', properties, events: [event], active: true)
-      end
-
-      def edit_hook!
-        api.edit_hook(github_repo_name, github_id, 'web', properties, events: [event], active: true)
-      end
-
       def destroy_hook!
         api.remove_hook(github_repo_name, github_id)
       rescue Octokit::NotFound
       end
-
-      def properties
-        {
-          url: endpoint_url,
-          content_type: 'json',
-          secret: secret,
-        }
-      end
-
-      def endpoint_url
-        case event
-        when 'push'
-          url_helpers.push_stack_webhooks_url(stack_id, host: host)
-        when 'status'
-          url_helpers.state_stack_webhooks_url(stack_id, host: host)
-        else
-          raise ArgumentError, "Unknown GithubHook::Repo event: `#{event.inspect}`"
-        end
-      end
     end
 
     class Organization < GithubHook
@@ -112,35 +40,10 @@ module Shipit
 
       private
 
-      def create_hook!
-        api.create_org_hook(organization, properties, events: [event], active: true)
-      end
-
-      def edit_hook!
-        api.edit_org_hook(organization, github_id, properties, events: [event], active: true)
-      end
-
       def destroy_hook!
         api.remove_org_hook(organization, github_id)
       rescue Octokit::NotFound
       end
-
-      def properties
-        {
-          url: endpoint_url,
-          content_type: 'json',
-          secret: secret,
-        }
-      end
-
-      def endpoint_url
-        case event
-        when 'membership'
-          url_helpers.membership_webhooks_url(host: host)
-        else
-          raise ArgumentError, "Unknown GithubHook::Organization event: `#{event.inspect}`"
-        end
-      end
     end
   end
 end

data/app/models/shipit/github_status.rb

@@ -8,7 +8,7 @@ module Shipit
       end
 
       def refresh_status
-        Rails.cache.write(CACHE_KEY, Shipit.github_api.github_status)
+        Rails.cache.write(CACHE_KEY, Shipit.github.api.github_status)
       rescue Faraday::Error, Octokit::ServerError
       end
     end

data/app/models/shipit/hook.rb

@@ -39,7 +39,7 @@ module Shipit
         raise "#{event} is not declared in Shipit::Hook::EVENTS" unless EVENTS.include?(event.to_s)
         Shipit::EmitEventJob.perform_later(
           event: event.to_s,
-          stack_id: stack.try!(:id),
+          stack_id: stack&.id,
           payload: coerce_payload(payload),
         )
       end

data/app/models/shipit/pull_request.rb

@@ -27,11 +27,11 @@ module Shipit
       end
 
       def ignored_statuses
-        deploy_spec.try!(:pull_request_ignored_statuses) || []
+        deploy_spec&.pull_request_ignored_statuses || []
       end
 
       def required_statuses
-        deploy_spec.try!(:pull_request_required_statuses) || []
+        deploy_spec&.pull_request_required_statuses || []
       end
     end
 
@@ -110,7 +110,7 @@ module Shipit
       case number_or_url
       when /\A#?(\d+)\z/
         $1.to_i
-      when %r{\Ahttps://#{Regexp.escape(Shipit.github_domain)}/([^/]+)/([^/]+)/pull/(\d+)}
+      when %r{\Ahttps://#{Regexp.escape(Shipit.github.domain)}/([^/]+)/([^/]+)/pull/(\d+)}
         return unless $1.downcase == stack.repo_owner.downcase
         return unless $2.downcase == stack.repo_name.downcase
         $3.to_i
@@ -157,7 +157,7 @@ module Shipit
 
       raise NotReady if not_mergeable_yet?
 
-      Shipit.github_api.merge_pull_request(
+      Shipit.github.api.merge_pull_request(
         stack.github_repo_name,
         number,
         merge_message,
@@ -166,8 +166,8 @@ module Shipit
         merge_method: 'merge',
       )
       begin
-        if Shipit.github_api.pull_requests(stack.github_repo_name, base: branch).empty?
-          Shipit.github_api.delete_branch(stack.github_repo_name, branch)
+        if Shipit.github.api.pull_requests(stack.github_repo_name, base: branch).empty?
+          Shipit.github.api.delete_branch(stack.github_repo_name, branch)
         end
       rescue Octokit::UnprocessableEntity
         # branch was already deleted somehow
@@ -196,7 +196,7 @@ module Shipit
     end
 
     def need_revalidation?
-      timeout = stack.cached_deploy_spec.try!(:revalidate_pull_requests_after)
+      timeout = stack.cached_deploy_spec&.revalidate_pull_requests_after
       return false unless timeout
       (revalidated_at + timeout).past?
     end
@@ -222,7 +222,7 @@ module Shipit
     end
 
     def refresh!
-      update!(github_pull_request: Shipit.github_api.pull_request(stack.github_repo_name, number))
+      update!(github_pull_request: Shipit.github.api.pull_request(stack.github_repo_name, number))
       head.refresh_statuses!
       fetched! if fetching?
       @comparison = nil
@@ -261,7 +261,7 @@ module Shipit
     end
 
     def comparison
-      @comparison ||= Shipit.github_api.compare(
+      @comparison ||= Shipit.github.api.compare(
         stack.github_repo_name,
         base_ref,
         head.sha,
@@ -284,7 +284,7 @@ module Shipit
       if commit = stack.commits.by_sha(sha)
         return commit
       else
-        github_commit = Shipit.github_api.commit(stack.github_repo_name, sha)
+        github_commit = Shipit.github.api.commit(stack.github_repo_name, sha)
         stack.commits.create_from_github!(github_commit, attributes)
       end
     rescue ActiveRecord::RecordNotUnique