Merge pull request #402 from MagicRB/github-app-secret-provider-translate-from-repo-name

Support translating from "repo_name" in GitHub secret provider

Author: MagicRB

buildbot_nix/buildbot_nix/github_projects.py

@@ -418,7 +418,11 @@ def get_repo_token(self, repo_full_name: str) -> RepoToken:
         return self.installation_tokens[installation_id]
 
     def create_secret_providers(self) -> list[SecretProviderBase]:
-        return [GitHubAppSecretService(self.installation_tokens, self.jwt_token)]
+        return [
+            GitHubAppSecretService(
+                self.project_id_map, self.installation_tokens, self.jwt_token
+            )
+        ]
 
     def create_reporter(self) -> ReporterBase:
         def get_github_token(props: Properties) -> str:
@@ -465,12 +469,17 @@ def create_reload_builder_steps(
 
 class GitHubAppSecretService(SecretProviderBase):
     name: str | None = "GitHubAppSecretService"  # type: ignore[assignment]
+    project_id_map: dict[str, int]
     installation_tokens: dict[int, InstallationToken]
     jwt_token: JWTToken
 
     def reconfigService(  # type: ignore[override]
-        self, installation_tokens: dict[int, InstallationToken], jwt_token: JWTToken
+        self,
+        project_id_map: dict[str, int],
+        installation_tokens: dict[int, InstallationToken],
+        jwt_token: JWTToken,
     ) -> None:
+        self.project_id_map = project_id_map
         self.installation_tokens = installation_tokens
         self.jwt_token = jwt_token
 
@@ -479,9 +488,14 @@ def get(self, entry: str) -> str | None:
         get the value from the file identified by 'entry'
         """
         if entry.startswith("github-token-"):
-            return self.installation_tokens[
-                int(entry.removeprefix("github-token-"))
-            ].get()
+            try:
+                return self.installation_tokens[
+                    int(entry.removeprefix("github-token-"))
+                ].get()
+            except ValueError:
+                return self.installation_tokens[
+                    self.project_id_map[entry.removeprefix("github-token-")]
+                ].get()
         if entry == "github-jwt-token":
             return self.jwt_token.get()
         return None