Merge branch 'main' into auto-action-ln

Author: nobe4

.github/workflows/acceptance.yml

@@ -17,7 +17,7 @@ jobs:
       has_change: ${{ steps.diff.outputs.has_change}}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
 
       - id: fetch-base
         if: github.event_name == 'pull_request'
@@ -68,7 +68,7 @@ jobs:
 
       - name: checkout
         if: ${{ needs.changes.outputs.has_change == 'true' }}
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       # Use Docker layer caching for 'docker build' and 'docker-compose build' commands.
       # https://github.com/satackey/action-docker-layer-caching/releases/tag/v0.0.11

.github/workflows/build.yml

@@ -23,9 +23,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
-      - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # pin@v1.263.0
+      - uses: ruby/setup-ruby@8e41b362d2589a22a44c1cfa214b3c83052c195b # pin@v1.318.0
         with:
           bundler-cache: true
 

.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/lint.yml

@@ -16,9 +16,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
-      - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # pin@v1.263.0
+      - uses: ruby/setup-ruby@8e41b362d2589a22a44c1cfa214b3c83052c195b # pin@v1.318.0
         with:
           bundler-cache: true
 

.github/workflows/release.yml

@@ -18,9 +18,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
-      - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # pin@v1.263.0
+      - uses: ruby/setup-ruby@8e41b362d2589a22a44c1cfa214b3c83052c195b # pin@v1.318.0
         with:
           bundler-cache: true
 
@@ -46,7 +46,7 @@ jobs:
           GEM_HOST_API_KEY=${{ secrets.GITHUB_TOKEN }} gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} ${{ env.GEM_NAME }}-${{ env.GEM_VERSION }}.gem
 
       - name: release
-        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # pin@v1.20.0
+        uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd # pin@v1.21.0
         with:
           artifacts: "${{ env.GEM_NAME }}-${{ env.GEM_VERSION }}.gem"
           tag: "v${{ env.GEM_VERSION }}"

.github/workflows/test.yml

@@ -20,9 +20,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
-      - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # pin@v1.263.0
+      - uses: ruby/setup-ruby@8e41b362d2589a22a44c1cfa214b3c83052c195b # pin@v1.318.0
         with:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    entitlements-github-plugin (1.2.0)
+    entitlements-github-plugin (1.2.3)
       contracts (~> 0.17.0)
       faraday (~> 2.0)
       faraday-retry (~> 2.0)
@@ -24,117 +24,119 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2)
-    concurrent-ruby (1.3.5)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.7)
     connection_pool (2.5.3)
-    contracts (0.17.2)
-    crack (1.0.0)
+    contracts (0.17.3)
+    crack (1.0.1)
       bigdecimal
       rexml
     diff-lcs (1.6.2)
     docile (1.4.0)
     drb (2.2.3)
-    entitlements-app (1.2.0)
+    entitlements-app (1.2.1)
       concurrent-ruby (~> 1.3, >= 1.3.1)
       faraday (~> 2.0)
       logger (~> 1.6)
       net-ldap (~> 0.19)
       octokit (~> 4.18)
       optimist (~> 3.1)
       ostruct (~> 0.6.0)
-    faraday (2.13.4)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    faraday-retry (2.3.2)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.13.2)
-    language_server-protocol (3.17.0.5)
+    json (2.21.1)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (5.25.5)
     mutex_m (0.3.0)
-    net-http (0.6.0)
-      uri
-    net-ldap (0.19.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-ldap (0.20.0)
+      base64
+      ostruct
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     optimist (3.2.1)
-    ostruct (0.6.2)
-    parallel (1.27.0)
-    parser (3.3.9.0)
+    ostruct (0.6.3)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.9.0)
     public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.1.17)
+    rack (3.2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.4.2)
     rbs (3.6.1)
       logger
-    regexp_parser (2.11.2)
+    regexp_parser (2.12.0)
     retryable (3.0.5)
-    rexml (3.4.2)
-    rspec (3.13.1)
+    rexml (3.4.4)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    rubocop (1.80.2)
+    rspec-support (3.13.6)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-github (0.23.0)
       rubocop (>= 1.72)
       rubocop-performance (>= 1.24)
       rubocop-rails (>= 2.23)
-    rubocop-performance (1.26.0)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    ruby-lsp (0.26.1)
+    ruby-lsp (0.26.10)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 5)
     ruby-progressbar (1.13.0)
-    rugged (1.9.0)
-    sawyer (0.9.2)
+    rugged (1.9.6)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.3.2)
@@ -148,13 +150,12 @@ GEM
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.5)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
-    vcr (6.3.1)
-      base64
-    webmock (3.25.1)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    vcr (6.4.0)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -167,7 +168,7 @@ DEPENDENCIES
   entitlements-app (~> 1.0)
   entitlements-github-plugin!
   rake (~> 13.2, >= 13.2.1)
-  rspec (= 3.13.1)
+  rspec (= 3.13.2)
   rubocop (~> 1.64)
   rubocop-github (~> 0.20)
   rubocop-performance (~> 1.21)

entitlements-github-plugin.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "entitlements-app", "~> 1.0"
   s.add_development_dependency "rake", "~> 13.2", ">= 13.2.1"
-  s.add_development_dependency "rspec", "= 3.13.1"
+  s.add_development_dependency "rspec", "= 3.13.2"
   s.add_development_dependency "rubocop", "~> 1.64"
   s.add_development_dependency "rubocop-github", "~> 0.20"
   s.add_development_dependency "rubocop-performance", "~> 1.21"

lib/entitlements/backend/github_org/service.rb

@@ -54,6 +54,9 @@ def add_user_to_organization(user, role)
 
             Entitlements.logger.warn "User #{user} not found in GitHub instance #{identifier}, ignoring."
             return false
+          rescue Octokit::UnprocessableEntity => e
+            Entitlements.logger.warn "Unprocessable entity when adding #{user} to organization #{org} with role #{role}: #{e.message}. This likely means the user blocked the invite, so we're ignoring them, but someone should check it."
+            return false
           end
 
           # Happy path

lib/entitlements/backend/github_team/service.rb

@@ -477,8 +477,6 @@ def add_user_to_team(user:, team:, role: "member")
 
             result[:state] == "active" || result[:state] == "pending"
           rescue Octokit::UnprocessableEntity => e
-            raise e unless ignore_not_found && e.message =~ /Enterprise Managed Users must be part of the organization to be assigned to the team/
-
             Entitlements.logger.warn "User #{user} not found in organization #{org}, ignoring."
             false
           rescue Octokit::NotFound => e