vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: declare google vertex local auth evidence

Browse Source
This commit is contained in:
Shakker
2026-04-29 18:55:02 +01:00
parent 225620a9b3
commit dec5de8a2c
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/google/openclaw.plugin.json
View File

@@ -76,7 +76,18 @@
{ {
"id": "google-vertex", "id": "google-vertex",
"authMethods": ["api-key"], "authMethods": ["api-key"],
"envVars": ["GOOGLE_CLOUD_API_KEY"] "envVars": ["GOOGLE_CLOUD_API_KEY"],
"authEvidence": [
{
"type": "local-file-with-env",
"fileEnvVar": "GOOGLE_APPLICATION_CREDENTIALS",
"fallbackPaths": ["${HOME}/.config/gcloud/application_default_credentials.json"],
"requiresAnyEnv": ["GOOGLE_CLOUD_PROJECT", "GCLOUD_PROJECT"],
"requiresAllEnv": ["GOOGLE_CLOUD_LOCATION"],
"credentialMarker": "gcp-vertex-credentials",
"source": "gcloud adc"
}
]
} }
] ]
}, },

16
src/agents/model-auth.profiles.test.ts
View File

@@ -93,6 +93,7 @@ vi.mock("./model-auth-env-vars.js", () => {
const candidates = { const candidates = {
anthropic: ["ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"], anthropic: ["ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],
google: ["GEMINI_API_KEY", "GOOGLE_API_KEY"], google: ["GEMINI_API_KEY", "GOOGLE_API_KEY"],
"google-vertex": ["GOOGLE_CLOUD_API_KEY"],
"demo-local": ["DEMO_LOCAL_API_KEY"], "demo-local": ["DEMO_LOCAL_API_KEY"],
huggingface: ["HUGGINGFACE_HUB_TOKEN", "HF_TOKEN"], huggingface: ["HUGGINGFACE_HUB_TOKEN", "HF_TOKEN"],
"minimax-portal": ["MINIMAX_OAUTH_TOKEN", "MINIMAX_API_KEY"], "minimax-portal": ["MINIMAX_OAUTH_TOKEN", "MINIMAX_API_KEY"],
@@ -109,6 +110,19 @@ vi.mock("./model-auth-env-vars.js", () => {
PROVIDER_ENV_API_KEY_CANDIDATES: candidates, PROVIDER_ENV_API_KEY_CANDIDATES: candidates,
listKnownProviderEnvApiKeyNames: () => [...new Set(Object.values(candidates).flat())], listKnownProviderEnvApiKeyNames: () => [...new Set(Object.values(candidates).flat())],
resolveProviderEnvApiKeyCandidates: () => candidates, resolveProviderEnvApiKeyCandidates: () => candidates,
resolveProviderEnvAuthEvidence: () => ({
"google-vertex": [
{
type: "local-file-with-env",
fileEnvVar: "GOOGLE_APPLICATION_CREDENTIALS",
fallbackPaths: ["${HOME}/.config/gcloud/application_default_credentials.json"],
requiresAnyEnv: ["GOOGLE_CLOUD_PROJECT", "GCLOUD_PROJECT"],
requiresAllEnv: ["GOOGLE_CLOUD_LOCATION"],
credentialMarker: "gcp-vertex-credentials",
source: "gcloud adc",
},
],
}),
}; };
}); });
@@ -812,7 +826,7 @@ describe("getApiKeyForModel", () => {
} as NodeJS.ProcessEnv); } as NodeJS.ProcessEnv);
expect(resolved?.apiKey).toBe("google-cloud-api-key"); expect(resolved?.apiKey).toBe("google-cloud-api-key");
expect(resolved?.source).toBe("gcloud adc"); expect(resolved?.source).toBe("env: GOOGLE_CLOUD_API_KEY");
}); });
it("resolveEnvApiKey('google-vertex') accepts ADC credentials from the provided env snapshot", async () => { it("resolveEnvApiKey('google-vertex') accepts ADC credentials from the provided env snapshot", async () => {