diff options
Diffstat (limited to 'packages/cli/src')
| -rw-r--r-- | packages/cli/src/config/auth.ts | 18 | ||||
| -rw-r--r-- | packages/cli/src/ui/components/AuthDialog.tsx | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts index 6153044e..da4234e0 100644 --- a/packages/cli/src/config/auth.ts +++ b/packages/cli/src/config/auth.ts @@ -28,14 +28,16 @@ export const validateAuthMethod = (authMethod: string): string | null => { } if (authMethod === AuthType.USE_VERTEX_AI) { - if (!process.env.GOOGLE_API_KEY) { - return 'GOOGLE_API_KEY environment variable not found. Add that to your .env and try again, no reload needed!'; - } - if (!process.env.GOOGLE_CLOUD_PROJECT) { - return 'GOOGLE_CLOUD_PROJECT environment variable not found. Add that to your .env and try again, no reload needed!'; - } - if (!process.env.GOOGLE_CLOUD_LOCATION) { - return 'GOOGLE_CLOUD_LOCATION environment variable not found. Add that to your .env and try again, no reload needed!'; + const hasVertexProjectLocationConfig = + !!process.env.GOOGLE_CLOUD_PROJECT && !!process.env.GOOGLE_CLOUD_LOCATION; + const hasGoogleApiKey = !!process.env.GOOGLE_API_KEY; + if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) { + return ( + 'Must specify GOOGLE_GENAI_USE_VERTEXAI=true and either:\n' + + '• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n' + + '• GOOGLE_API_KEY environment variable (if using express mode).\n' + + 'Update your .env and try again, no reload needed!' + ); } return null; } diff --git a/packages/cli/src/ui/components/AuthDialog.tsx b/packages/cli/src/ui/components/AuthDialog.tsx index be36da8a..7ae8b7ee 100644 --- a/packages/cli/src/ui/components/AuthDialog.tsx +++ b/packages/cli/src/ui/components/AuthDialog.tsx @@ -38,7 +38,7 @@ export function AuthDialog({ label: 'Login with Google Work', value: AuthType.LOGIN_WITH_GOOGLE_ENTERPRISE, }, - { label: 'Vertex API Key', value: AuthType.USE_VERTEX_AI }, + { label: 'Vertex AI', value: AuthType.USE_VERTEX_AI }, ]; const isSelectedAuthInMore = allAuthItems |