Merge branch 'tinglesoftware:main' into latest

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.6",
+      "version": "8.0.7",
       "commands": [
         "dotnet-ef"
       ]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **Categorization**
-- [ ] This is not a permissions issue (We cannot solve permission issues)
+- [ ] This is not a permissions issue (Seek help at https://github.com/tinglesoftware/dependabot-azure-devops/discussions/1245)
 
 **Repository**
 URL: e.g. https://dev.azure.com/tingle/dependabot/_git/repro-684

.github/dependabot.yml

@@ -48,12 +48,17 @@ updates:
     open-pull-requests-limit: 10
     groups:
       azure:
-        patterns: ['Azure.*']
+        patterns:
+          - 'Azure.*'
+          - 'Microsoft.Azure.*'
+          - 'Microsoft.Extensions.Configuration.AzureAppConfiguration'
       event-bus:
         patterns: ["Tingle.EventBus*"]
       microsoft:
         patterns: ["Microsoft*"]
         exclude-patterns:
+          - 'Microsoft.Azure.*'
+          - 'Microsoft.Extensions.Configuration.AzureAppConfiguration'
           - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets"
       system:
         patterns: ["System*"]

.github/workflows/extension.yml

@@ -36,13 +36,13 @@ jobs:
         fetch-depth: 0 # Required for GitVersion
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1
+      uses: gittools/actions/gitversion/setup@v2
       with:
         versionSpec: '5.x'
 
     - name: Determine Version
       id: gitversion
-      uses: gittools/actions/gitversion/execute@v1
+      uses: gittools/actions/gitversion/execute@v2
       with:
         useConfigFile: true
 

.github/workflows/server.yml

@@ -40,12 +40,12 @@ jobs:
         fetch-depth: 0 # Required for GitVersion
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1
+      uses: gittools/actions/gitversion/setup@v2
       with:
         versionSpec: '5.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v1
+      uses: gittools/actions/gitversion/execute@v2
       id: gitversion
       with:
         useConfigFile: true

.github/workflows/updater.yml

@@ -14,6 +14,9 @@ on:
     - main
     paths:
     - "updater/**"
+    - '.rubocop*.yml'
+    - '.ruby-version'
+    - 'Rakefile'
     - ".github/workflows/updater.yml"
     - "!docs/**"
 
@@ -60,12 +63,12 @@ jobs:
         fetch-depth: 0 # Required for GitVersion
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v1
+      uses: gittools/actions/gitversion/setup@v2
       with:
         versionSpec: '5.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v1
+      uses: gittools/actions/gitversion/execute@v2
       id: gitversion
       with:
         useConfigFile: true
@@ -88,12 +91,22 @@ jobs:
       # remove this after at least one release tagged 'latest'
       continue-on-error: true
 
+    - name: Get dependabot-updater image tag version
+      id: docker-base-version
+      run: |
+        tag_name=$(grep -oP "(?<=gem \"dependabot-omnibus\", \"~>).*(?=\")" updater/Gemfile)
+        tag_sha=$(curl --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --url "https://api.github.com/repos/dependabot/dependabot-core/tags" | jq -r "[.[]|select(.name==\"v$tag_name\")][0].commit.sha")
+        echo "Using dependabot-updater image tag '$tag_sha' (v$tag_name)"
+        echo "version=$tag_sha" >> $GITHUB_OUTPUT
+
     - name: Build image
       run: |
         docker build \
         -f updater/Dockerfile \
         --build-arg BUILDKIT_INLINE_CACHE=1 \
         --build-arg ECOSYSTEM=${{ matrix.suite.ecosystem }} \
+        --build-arg BASE_VERSION=${{ steps.docker-base-version.outputs.version }} \
+        --build-arg DEPENDABOT_UPDATER_VERSION=${{ steps.gitversion.outputs.nuGetVersionV2 }} \
         --label com.github.image.run.id=${{ github.run_id }} \
         --label com.github.image.run.number=${{ github.run_number }} \
         --label com.github.image.job.id=${{ github.job }} \

.rubocop.yml

@@ -1,6 +1,9 @@
 ---
+inherit_from: .rubocop_todo.yml
+
 require:
   - rubocop-performance
+  - rubocop-rspec
   - rubocop-sorbet
 
 AllCops:
@@ -11,7 +14,10 @@ AllCops:
     - "*/spec/fixtures/**/*"
     - "vendor/**/*"
     - "dry-run/**/*"
+    - "bundler/helpers/v1/patched_bundler"
+    - "bundler/helpers/spec_helpers/*"
   NewCops: enable
+  TargetRubyVersion: 3.1
   SuggestExtensions: false
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
@@ -225,10 +231,12 @@ Performance/UnfreezeString:
   Enabled: true
 Performance/UriDefaultParser:
   Enabled: true
-Style/AccessorGrouping:
+RSpec/IndexedLet:
   Enabled: false
+Style/AccessorGrouping:
+  EnforcedStyle: 'separated'
 Style/ArgumentsForwarding:
-  Enabled: true
+  Enabled: false
 Style/ArrayCoercion:
   Enabled: false
 Style/BisectedAttrAccessor:
@@ -333,6 +341,7 @@ Style/SpecialGlobalVars:
 Style/SelectByRegexp:
   Enabled: false
 Sorbet/TrueSigil:
+  Enabled: true
   Exclude:
     - "**/spec/**/*"
 Sorbet/StrictSigil:
@@ -341,6 +350,9 @@ Sorbet/StrictSigil:
 Sorbet/StrongSigil:
   Exclude:
     - "**/spec/**/*"
+RSpec:
+  Include:
+    - "**/spec/**/*"
 
 # TODO these were temporarily disabled during the Ruby 2.7 -> 3.1 upgrade
 # in order to keep the upgrade diff small, they will be enabled/fixed in

.rubocop_todo.yml

@@ -0,0 +1,192 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-05-17 06:52:32 UTC using RuboCop version 1.63.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 39
+RSpec/AnyInstance:
+  Exclude:
+    - 'bundler/helpers/v1/spec/shared_contexts.rb'
+    - 'bundler/spec/dependabot/bundler/update_checker_spec.rb'
+    - 'common/spec/dependabot/clients/codecommit_spec.rb'
+    - 'common/spec/dependabot/file_fetchers/base_spec.rb'
+    - 'common/spec/dependabot/git_commit_checker_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator/message_builder_spec.rb'
+    - 'gradle/spec/dependabot/gradle/metadata_finder_spec.rb'
+    - 'maven/spec/dependabot/maven/metadata_finder_spec.rb'
+    - 'npm_and_yarn/spec/dependabot/npm_and_yarn/update_checker_spec.rb'
+    - 'python/spec/dependabot/python/file_updater_spec.rb'
+    - 'updater/spec/dependabot/dependency_change_builder_spec.rb'
+    - 'updater/spec/dependabot/file_fetcher_command_spec.rb'
+
+# Offense count: 1286
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 98
+
+# Offense count: 10
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'bundler/helpers/v2/spec/ruby_version_spec.rb'
+    - 'bundler/spec/dependabot/bundler/helper_spec.rb'
+    - 'common/spec/dependabot/clients/codecommit_spec.rb'
+    - 'elm/spec/dependabot/elm/update_checker/elm_19_version_resolver_spec.rb'
+    - 'nuget/spec/dependabot/nuget/nuget_config_credential_helpers_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/compatibility_checker_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/nupkg_fetcher_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/nuspec_fetcher_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/repository_finder_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/tfm_finder_spec.rb'
+
+# Offense count: 29
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'go_modules/spec/dependabot/go_modules/file_updater_spec.rb'
+
+# Offense count: 22
+RSpec/IteratedExpectation:
+  Exclude:
+    - 'bundler/spec/dependabot/bundler/file_updater_spec.rb'
+    - 'cargo/spec/dependabot/cargo/file_updater_spec.rb'
+    - 'composer/spec/dependabot/composer/file_updater_spec.rb'
+    - 'docker/spec/dependabot/docker/file_updater_spec.rb'
+    - 'elm/spec/dependabot/elm/file_updater_spec.rb'
+    - 'git_submodules/spec/dependabot/git_submodules/file_updater_spec.rb'
+    - 'github_actions/spec/dependabot/github_actions/file_updater_spec.rb'
+    - 'go_modules/spec/dependabot/go_modules/file_updater_spec.rb'
+    - 'gradle/spec/dependabot/gradle/file_updater_spec.rb'
+    - 'hex/spec/dependabot/hex/file_updater_spec.rb'
+    - 'maven/spec/dependabot/maven/file_updater_spec.rb'
+    - 'npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb'
+    - 'python/spec/dependabot/python/file_updater/requirement_file_updater_spec.rb'
+    - 'python/spec/dependabot/python/file_updater_spec.rb'
+
+
+# Offense count: 3
+RSpec/MessageChain:
+  Exclude:
+    - 'updater/spec/dependabot/api_client_spec.rb'
+    - 'updater/spec/dependabot/sentry/exception_sanitizer_processor_spec.rb'
+    - 'updater/spec/dependabot/service_spec.rb'
+
+# Offense count: 395
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Enabled: false
+
+# Offense count: 1380
+RSpec/MultipleExpectations:
+  Max: 17
+
+# Offense count: 5339
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 30
+
+# Offense count: 3871
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 8
+
+# Offense count: 16
+RSpec/OverwritingSetup:
+  Exclude:
+    - 'bundler/spec/dependabot/bundler/update_checker_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator/message_builder_spec.rb'
+    - 'docker/spec/dependabot/docker/file_updater_spec.rb'
+    - 'gradle/spec/dependabot/gradle/update_checker/version_finder_spec.rb'
+    - 'maven/spec/dependabot/maven/update_checker/version_finder_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/repository_finder_spec.rb'
+    - 'python/spec/dependabot/python/update_checker/pip_version_resolver_spec.rb'
+    - 'python/spec/dependabot/python/update_checker_spec.rb'
+    - 'terraform/spec/dependabot/terraform/file_parser_spec.rb'
+    - 'updater/spec/dependabot/dependency_snapshot_spec.rb'
+
+# Offense count: 4
+RSpec/RepeatedExample:
+  Exclude:
+    - 'nuget/spec/dependabot/nuget/update_checker/repository_finder_spec.rb'
+    - 'terraform/spec/dependabot/terraform/registry_client_spec.rb'
+
+# Offense count: 8
+RSpec/RepeatedExampleGroupBody:
+  Exclude:
+    - 'cargo/spec/dependabot/cargo/file_fetcher_spec.rb'
+    - 'composer/spec/dependabot/composer/update_checker/latest_version_finder_spec.rb'
+    - 'maven/spec/dependabot/maven_spec.rb'
+    - 'pub/spec/dependabot/pub/requirements_spec.rb'
+
+# Offense count: 45
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false
+
+# Offense count: 10
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - 'bundler/helpers/v2/spec/ruby_version_spec.rb'
+    - 'bundler/spec/dependabot/bundler/helper_spec.rb'
+    - 'common/spec/dependabot/clients/codecommit_spec.rb'
+    - 'elm/spec/dependabot/elm/update_checker/elm_19_version_resolver_spec.rb'
+    - 'nuget/spec/dependabot/nuget/nuget_config_credential_helpers_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/compatibility_checker_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/nupkg_fetcher_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/nuspec_fetcher_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/repository_finder_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker/tfm_finder_spec.rb'
+
+# Offense count: 50
+RSpec/StubbedMock:
+  Exclude:
+    - 'bundler/spec/dependabot/bundler/update_checker_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator/branch_namer_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator_spec.rb'
+    - 'common/spec/dependabot/pull_request_updater_spec.rb'
+    - 'docker/spec/dependabot/docker/utils/credentials_finder_spec.rb'
+    - 'go_modules/spec/dependabot/go_modules/file_updater_spec.rb'
+    - 'npm_and_yarn/spec/dependabot/npm_and_yarn/update_checker_spec.rb'
+    - 'nuget/spec/dependabot/nuget/update_checker_spec.rb'
+    - 'python/spec/dependabot/python/file_updater_spec.rb'
+    - 'python/spec/dependabot/python/update_checker_spec.rb'
+    - 'updater/spec/dependabot/update_files_command_spec.rb'
+    - 'updater/spec/dependabot/updater_spec.rb'
+
+# Offense count: 28
+RSpec/SubjectStub:
+  Exclude:
+    - 'common/spec/dependabot/metadata_finders/base/commits_finder_spec.rb'
+    - 'common/spec/dependabot/metadata_finders/base_spec.rb'
+    - 'common/spec/dependabot/pull_request_updater/azure_spec.rb'
+    - 'updater/spec/dependabot/environment_spec.rb'
+    - 'updater/spec/dependabot/sentry/exception_sanitizer_processor_spec.rb'
+    - 'updater/spec/dependabot/sentry/sentry_context_processor_spec.rb'
+
+# Offense count: 2
+RSpec/UnspecifiedException:
+  Exclude:
+    - 'updater/spec/dependabot/job_spec.rb'
+
+# Offense count: 26
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'common/spec/dependabot/git_commit_checker_spec.rb'
+    - 'common/spec/dependabot/git_metadata_fetcher_spec.rb'
+    - 'common/spec/dependabot/metadata_finders/base/commits_finder_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator/branch_namer_spec.rb'
+    - 'common/spec/dependabot/pull_request_creator/github_spec.rb'
+    - 'github_actions/spec/dependabot/github_actions/update_checker_spec.rb'
+    - 'go_modules/spec/dependabot/go_modules/file_updater/go_mod_updater_spec.rb'
+    - 'go_modules/spec/dependabot/go_modules/file_updater_spec.rb'
+    - 'python/spec/dependabot/python/file_updater_spec.rb'
+    - 'updater/spec/dependabot/file_fetcher_command_spec.rb'
+    - 'updater/spec/dependabot/sentry/sentry_context_processor_spec.rb'
+    - 'updater/spec/dependabot/update_files_command_spec.rb'

.ruby-version

@@ -1 +1 @@
-3.1.4
+3.3.1