From 4e1ad5c55de4625808e4b52079abae55e9249dea Mon Sep 17 00:00:00 2001
From: Jason Macgowan <1389531+jasonmacgowan@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:18:59 -0500
Subject: [PATCH 1/2] Ignore adding team members that are not in the
 organization.

---
 lib/entitlements/backend/github_team/service.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/entitlements/backend/github_team/service.rb b/lib/entitlements/backend/github_team/service.rb
index 241ef0f..5e2f046 100644
--- a/lib/entitlements/backend/github_team/service.rb
+++ b/lib/entitlements/backend/github_team/service.rb
@@ -459,6 +459,11 @@ def add_user_to_team(user:, team:, role: "member")
           begin
             result = octokit.add_team_membership(team.team_id, user, role:)
             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 GitHub instance #{identifier}, ignoring."
+            false
           rescue Octokit::NotFound => e
             raise e unless ignore_not_found
 

From a16e5b055e3651a79948f7fbe844a95e114d0bba Mon Sep 17 00:00:00 2001
From: Jason Macgowan <1389531+jasonmacgowan@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:24:08 -0500
Subject: [PATCH 2/2] Log organization instead of hostname

---
 lib/entitlements/backend/github_team/service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/entitlements/backend/github_team/service.rb b/lib/entitlements/backend/github_team/service.rb
index 5e2f046..678f015 100644
--- a/lib/entitlements/backend/github_team/service.rb
+++ b/lib/entitlements/backend/github_team/service.rb
@@ -462,7 +462,7 @@ def add_user_to_team(user:, team:, role: "member")
           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 GitHub instance #{identifier}, ignoring."
+            Entitlements.logger.warn "User #{user} not found in organization #{org}, ignoring."
             false
           rescue Octokit::NotFound => e
             raise e unless ignore_not_found