Merge pull request #1466 from Shopify/handle-github-org-unknown-in-sync-job

v0.44.3: Handle GithubOrganizationUnknown in GithubSyncJob

Author: tdickers

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 0.44.3
+* Handle GithubOrganizationUnknown in GithubSyncJob by logging a warning and marking the stack as inaccessible.
+
 # 0.44.2
 * Add dry-run flag for testing environments
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shipit-engine (0.44.2)
+    shipit-engine (0.44.3)
       active_model_serializers (~> 0.9.3)
       ansi_stream (~> 0.0.6)
       autoprefixer-rails (~> 6.4.1)

app/jobs/shipit/github_sync_job.rb

@@ -67,6 +67,9 @@ def handle_github_errors
       yield
     rescue Octokit::NotFound
       stack.mark_as_inaccessible!
+    rescue Shipit::GithubOrganizationUnknown => e
+      Rails.logger.warn("GithubSyncJob: unknown GitHub organization #{e.message} for stack #{stack.id}")
+      stack.mark_as_inaccessible!
     else
       stack.mark_as_accessible!
     end

lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.44.2'
+  VERSION = '0.44.3'
 end

test/jobs/github_sync_job_test.rb

@@ -119,6 +119,14 @@ class GithubSyncJobTest < ActiveSupport::TestCase
       assert_equal true, @stack.reload.inaccessible_since?
     end
 
+    test "if the GitHub organization is unknown, the stack is marked as inaccessible and a warning is logged" do
+      @job.expects(:fetch_missing_commits).raises(Shipit::GithubOrganizationUnknown.new("shopify-playgrounds"))
+      Rails.logger.expects(:warn).with("GithubSyncJob: unknown GitHub organization shopify-playgrounds for stack #{@stack.id}")
+      @job.perform(stack_id: @stack.id)
+
+      assert_equal true, @stack.reload.inaccessible_since?
+    end
+
     test "#perform retries when expected_head_sha is not found in the github response" do
       expected_sha = "abcd1234"
       Stack.any_instance.expects(:github_commits).returns(@github_commits)