Merge branch 'main' into nishnha/defer-opening-duplicate-grouped-prs

sungam3r · May 8, 2023 · dcd24cc · dcd24cc
2 parents 6546516 + 5adef00
commit dcd24cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/updater/lib/dependabot/job.rb b/updater/lib/dependabot/job.rb
@@ -41,6 +41,7 @@ class Job
       vendor_dependencies
       dependency_groups
       dependency_group_to_refresh
+      repo_private
     )
 
     attr_reader :allowed_updates,
@@ -80,7 +81,7 @@ def self.standardise_keys(hash)
 
     # NOTE: "attributes" are fetched and injected at run time from
     # dependabot-api using the UpdateJobPrivateSerializer
-    def initialize(attributes)
+    def initialize(attributes) # rubocop:disable Metrics/AbcSize
       @id                             = attributes.fetch(:id)
       @allowed_updates                = attributes.fetch(:allowed_updates)
       @commit_message_options         = attributes.fetch(:commit_message_options, {})
@@ -111,6 +112,7 @@ def initialize(attributes)
       @vendor_dependencies            = attributes.fetch(:vendor_dependencies, false)
       @dependency_groups              = attributes.fetch(:dependency_groups, [])
       @dependency_group_to_refresh    = attributes.fetch(:dependency_group_to_refresh, nil)
+      @repo_private                   = attributes.fetch(:repo_private, nil)
 
       register_experiments
       register_dependency_groups
@@ -130,6 +132,10 @@ def repo_contents_path
       @repo_contents_path
     end
 
+    def repo_private?
+      @repo_private
+    end
+
     def updating_a_pull_request?
       @updating_a_pull_request
     end

diff --git a/updater/lib/dependabot/service.rb b/updater/lib/dependabot/service.rb
@@ -72,7 +72,8 @@ def capture_exception(error:, job: nil, dependency: nil, tags: {}, extra: {})
         {
           tags: tags.merge({
             update_job_id: job&.id,
-            package_manager: job&.package_manager
+            package_manager: job&.package_manager,
+            repo_private: job&.repo_private?
           }.compact),
           extra: extra.merge({
             dependency_name: dependency&.name

diff --git a/updater/spec/dependabot/job_spec.rb b/updater/spec/dependabot/job_spec.rb
@@ -40,7 +40,8 @@
       experiments: experiments,
       commit_message_options: commit_message_options,
       security_updates_only: security_updates_only,
-      dependency_groups: dependency_groups
+      dependency_groups: dependency_groups,
+      repo_private: repo_private
     }
   end
 
@@ -65,6 +66,7 @@
   let(:commit_message_options) { nil }
   let(:vendor_dependencies) { false }
   let(:dependency_groups) { [] }
+  let(:repo_private) { false }
 
   describe "::new_update_job" do
     let(:job_json) { fixture("jobs/job_with_credentials.json") }