Use GROUPS (plural) for consistency

dependabot · Mar 12, 2024 · 372abcc · 372abcc
1 parent a07aa22
commit 372abcc
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 24 deletions.
diff --git a/common/lib/dependabot/errors.rb b/common/lib/dependabot/errors.rb
@@ -8,14 +8,14 @@ module Dependabot
   extend T::Sig
 
   module ErrorAttributes
-    BACKTRACE        = "error-backtrace"
-    CLASS            = "error-class"
-    DETAILS          = "error-details"
-    MESSAGE          = "error-message"
-    DEPENDENCIES     = "job-dependencies"
-    DEPENDENCY_GROUP = "job-dependency-group"
-    JOB_ID           = "job-id"
-    PACKAGE_MANAGER  = "package-manager"
+    BACKTRACE         = "error-backtrace"
+    CLASS             = "error-class"
+    DETAILS           = "error-details"
+    MESSAGE           = "error-message"
+    DEPENDENCIES      = "job-dependencies"
+    DEPENDENCY_GROUPS = "job-dependency-groups"
+    JOB_ID            = "job-id"
+    PACKAGE_MANAGER   = "package-manager"
   end
 
   # rubocop:disable Metrics/MethodLength

diff --git a/updater/lib/dependabot/base_command.rb b/updater/lib/dependabot/base_command.rb
@@ -64,7 +64,7 @@ def handle_unknown_error(err)
         ErrorAttributes::PACKAGE_MANAGER => job.package_manager,
         ErrorAttributes::JOB_ID => job.id,
         ErrorAttributes::DEPENDENCIES => job.dependencies,
-        ErrorAttributes::DEPENDENCY_GROUP => job.dependency_groups
+        ErrorAttributes::DEPENDENCY_GROUPS => job.dependency_groups
       }.compact
       service.record_update_job_unknown_error(error_type: "updater_error", error_details: error_details)
       service.increment_metric("updater.update_job_unknown_error", tags: {

diff --git a/updater/lib/dependabot/file_fetcher_command.rb b/updater/lib/dependabot/file_fetcher_command.rb
@@ -180,7 +180,7 @@ def handle_file_fetcher_error(error)
           ErrorAttributes::PACKAGE_MANAGER => job.package_manager,
           ErrorAttributes::JOB_ID => job.id,
           ErrorAttributes::DEPENDENCIES => job.dependencies,
-          ErrorAttributes::DEPENDENCY_GROUP => job.dependency_groups
+          ErrorAttributes::DEPENDENCY_GROUPS => job.dependency_groups
         }.compact
 
         error_details = {

diff --git a/updater/lib/dependabot/service.rb b/updater/lib/dependabot/service.rb
@@ -112,7 +112,7 @@ def capture_exception(error:, job: nil, dependency: nil, dependency_group: nil,
         ErrorAttributes::PACKAGE_MANAGER => job&.package_manager,
         ErrorAttributes::JOB_ID => job&.id,
         ErrorAttributes::DEPENDENCIES => dependency&.name || job&.dependencies,
-        ErrorAttributes::DEPENDENCY_GROUP => dependency_group&.name || job&.dependency_groups
+        ErrorAttributes::DEPENDENCY_GROUPS => dependency_group&.name || job&.dependency_groups
       }.compact
       record_update_job_unknown_error(error_type: "unknown_error", error_details: error_details)
     end

diff --git a/updater/lib/dependabot/update_files_command.rb b/updater/lib/dependabot/update_files_command.rb
@@ -89,7 +89,7 @@ def handle_parser_error(error)
             ErrorAttributes::PACKAGE_MANAGER => job.package_manager,
             ErrorAttributes::JOB_ID => job.id,
             ErrorAttributes::DEPENDENCIES => job.dependencies,
-            ErrorAttributes::DEPENDENCY_GROUP => job.dependency_groups
+            ErrorAttributes::DEPENDENCY_GROUPS => job.dependency_groups
           }.compact
 
           service.capture_exception(error: error, job: job)

diff --git a/updater/lib/dependabot/updater/error_handler.rb b/updater/lib/dependabot/updater/error_handler.rb
@@ -160,7 +160,7 @@ def log_unknown_error_with_backtrace(error)
           ErrorAttributes::PACKAGE_MANAGER => job.package_manager,
           ErrorAttributes::JOB_ID => job.id,
           ErrorAttributes::DEPENDENCIES => job.dependencies,
-          ErrorAttributes::DEPENDENCY_GROUP => job.dependency_groups
+          ErrorAttributes::DEPENDENCY_GROUPS => job.dependency_groups
         }.compact
 
         service.increment_metric("updater.update_job_unknown_error", tags: {

diff --git a/updater/spec/dependabot/file_fetcher_command_spec.rb b/updater/spec/dependabot/file_fetcher_command_spec.rb
@@ -145,7 +145,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
         expect(api_client).to receive(:record_update_job_unknown_error)
@@ -163,7 +163,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
         expect(api_client).to receive(:mark_job_as_processed)
@@ -188,7 +188,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
         expect(api_client).to receive(:mark_job_as_processed)

diff --git a/updater/spec/dependabot/service_spec.rb b/updater/spec/dependabot/service_spec.rb
@@ -353,7 +353,7 @@
           error_details: hash_including(
             Dependabot::ErrorAttributes::MESSAGE => "Something went wrong",
             Dependabot::ErrorAttributes::CLASS => "Dependabot::DependabotError",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => "all-the-things"
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => "all-the-things"
           )
         )
     end

diff --git a/updater/spec/dependabot/update_files_command_spec.rb b/updater/spec/dependabot/update_files_command_spec.rb
@@ -135,7 +135,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 
@@ -152,7 +152,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 
@@ -176,7 +176,7 @@
             Dependabot::ErrorAttributes::CLASS => "StandardError",
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 

diff --git a/updater/spec/dependabot/updater/error_handler_spec.rb b/updater/spec/dependabot/updater/error_handler_spec.rb
@@ -89,7 +89,7 @@
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
             Dependabot::ErrorAttributes::DEPENDENCIES => [],
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 
@@ -187,7 +187,7 @@
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
             Dependabot::ErrorAttributes::DEPENDENCIES => [],
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 
@@ -334,7 +334,7 @@
             Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
             Dependabot::ErrorAttributes::JOB_ID => "123123",
             Dependabot::ErrorAttributes::DEPENDENCIES => [],
-            Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+            Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
           }
         )
 

diff --git a/updater/spec/dependabot/updater_spec.rb b/updater/spec/dependabot/updater_spec.rb
@@ -1820,7 +1820,7 @@ def expect_update_checker_with_ignored_versions(versions, dependency_matcher: an
                 Dependabot::ErrorAttributes::CLASS => "Dependabot::SharedHelpers::HelperSubprocessFailed",
                 Dependabot::ErrorAttributes::PACKAGE_MANAGER => "bundler",
                 Dependabot::ErrorAttributes::JOB_ID => "1",
-                Dependabot::ErrorAttributes::DEPENDENCY_GROUP => []
+                Dependabot::ErrorAttributes::DEPENDENCY_GROUPS => []
               }
             )
           updater.run