From 1c4d48696456bd81ea79ebda8db44791c4d34570 Mon Sep 17 00:00:00 2001 From: Codex Date: Wed, 15 Jul 2026 07:16:29 +0200 Subject: [PATCH] =?UTF-8?q?fix(pikaoa):=20=E5=88=86=E7=A6=BB=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=B8=8E=E7=94=9F=E4=BA=A7=20Gitea=20=E5=87=AD?= =?UTF-8?q?=E6=8D=AE=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/platform-infra/gitea.yaml | 2 +- scripts/src/platform-infra-gitea-config.test.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/config/platform-infra/gitea.yaml b/config/platform-infra/gitea.yaml index 25e15eba..6d6c1f72 100644 --- a/config/platform-infra/gitea.yaml +++ b/config/platform-infra/gitea.yaml @@ -519,7 +519,7 @@ sourceAuthority: secretRef: namespace: devops-infra name: gitea-github-sync-secrets - key: github-token-pikainc-pikaoa + key: github-token-pikainc-pikaoa-release upstream: repository: pikainc/pikaoa cloneUrl: https://github.com/pikainc/pikaoa.git diff --git a/scripts/src/platform-infra-gitea-config.test.ts b/scripts/src/platform-infra-gitea-config.test.ts index be9f6171..bce72fc8 100644 --- a/scripts/src/platform-infra-gitea-config.test.ts +++ b/scripts/src/platform-infra-gitea-config.test.ts @@ -47,6 +47,22 @@ describe("platform-infra Gitea repository GitHub credentials", () => { .not.toBe(githubTokenEnvNameForSecretKey(globalCredential.gitFetchCredential.secretRef.key)); }); + test("keeps PikaOA master and release authorities on distinct Secret keys", () => { + const config = readGiteaConfig(); + const testAuthority = config.sourceAuthority.repositories.find((repo) => repo.key === "pikaoa-test-nc01"); + const productionAuthority = config.sourceAuthority.repositories.find((repo) => repo.key === "pikaoa-nc01"); + const testKey = testAuthority?.credentialOverride?.github.gitFetchCredential.secretRef.key; + const productionKey = productionAuthority?.credentialOverride?.github.gitFetchCredential.secretRef.key; + + expect(testAuthority?.upstream.branch).toBe("master"); + expect(productionAuthority?.upstream.branch).toBe("release"); + expect(testKey).toBe("github-token-pikainc-pikaoa"); + expect(productionKey).toBe("github-token-pikainc-pikaoa-release"); + expect(productionKey).not.toBe(testKey); + expect(githubTokenEnvNameForSecretKey(productionKey ?? "")) + .not.toBe(githubTokenEnvNameForSecretKey(testKey ?? "")); + }); + test("normalizes Secret keys to bounded environment variable names", () => { expect(githubTokenEnvNameForSecretKey("github-token-pikainc-selfmedia")) .toBe("UNIDESK_GITEA_GITHUB_TOKEN_GITHUB_TOKEN_PIKAINC_SELFMEDIA");