Only warn when there are no authentications (#671)

This fixes an issue where a warning message would be printed on systems using ADC from the metadata server. Fixes #670
google-github-actions · Dec 21, 2023 · fd83cd9 · fd83cd9
1 parent f14c440
commit fd83cd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -21,6 +21,7 @@ import {
   bestVersion,
   installComponent,
   installGcloudSDK,
+  isAuthenticated,
   setProject,
 } from '@google-github-actions/setup-cloud-sdk';
 import {
@@ -102,9 +103,10 @@ export async function run(): Promise<void> {
     if (credFile) {
       await authenticateGcloudSDK(credFile);
       core.info('Successfully authenticated');
-    } else {
+    } else if (!(await isAuthenticated())) {
       core.warning(
-        'No authentication found for gcloud, authenticate with `google-github-actions/auth`.',
+        `The gcloud CLI is not authenticated. Authenticate by adding the ` +
+          `"google-github-actions/auth" step prior this one.`,
       );
     }
 

diff --git a/tests/setup-gcloud.test.ts b/tests/setup-gcloud.test.ts
@@ -64,6 +64,7 @@ const defaultMocks = (
     }),
 
     authenticateGcloudSDK: m.method(setupGcloud, 'authenticateGcloudSDK', () => {}),
+    isAuthenticated: m.method(setupGcloud, 'isAuthenticated', () => {}),
     isInstalled: m.method(setupGcloud, 'isInstalled', () => {
       return true;
     }),