From 5888466e7933460733ac965be60c7e42cff1234d Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Wed, 2 Apr 2025 13:16:10 -0700 Subject: [PATCH 1/3] Silence warning message when ADC is detected by data connect emulator --- src/emulator/dataconnectEmulator.ts | 1 + src/emulator/env.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/emulator/dataconnectEmulator.ts b/src/emulator/dataconnectEmulator.ts index 4189f214d4e..9851aed5bd7 100644 --- a/src/emulator/dataconnectEmulator.ts +++ b/src/emulator/dataconnectEmulator.ts @@ -362,6 +362,7 @@ export class DataConnectEmulator implements EmulatorInstance { account, EmulatorLogger.forEmulator(Emulators.DATACONNECT), "dataconnect", + true, ); return { ...process.env, ...extraEnv, ...credsEnv }; } diff --git a/src/emulator/env.ts b/src/emulator/env.ts index 29da9506d38..61b66137f0d 100644 --- a/src/emulator/env.ts +++ b/src/emulator/env.ts @@ -65,11 +65,12 @@ export async function getCredentialsEnvironment( account: Account | undefined, logger: EmulatorLogger, logLabel: string, + silent: boolean = false, ): Promise> { // Provide default application credentials when appropriate const credentialEnv: Record = {}; if (await hasDefaultCredentials()) { - logger.logLabeled( + !silent || logger.logLabeled( "WARN", logLabel, `Application Default Credentials detected. Non-emulated services will access production using these credentials. Be careful!`, From 9a6c0158756e3093014dd27b811c08319bfd4ccf Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Wed, 2 Apr 2025 13:20:39 -0700 Subject: [PATCH 2/3] Format --- src/emulator/env.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/emulator/env.ts b/src/emulator/env.ts index 61b66137f0d..3cea311c491 100644 --- a/src/emulator/env.ts +++ b/src/emulator/env.ts @@ -70,11 +70,12 @@ export async function getCredentialsEnvironment( // Provide default application credentials when appropriate const credentialEnv: Record = {}; if (await hasDefaultCredentials()) { - !silent || logger.logLabeled( - "WARN", - logLabel, - `Application Default Credentials detected. Non-emulated services will access production using these credentials. Be careful!`, - ); + !silent || + logger.logLabeled( + "WARN", + logLabel, + `Application Default Credentials detected. Non-emulated services will access production using these credentials. Be careful!`, + ); } else if (account) { const defaultCredPath = await getCredentialPathAsync(account); if (defaultCredPath) { From 003588a1497fcd1c0d9a3478cbdaa7d592a33a4c Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Wed, 2 Apr 2025 13:28:55 -0700 Subject: [PATCH 3/3] no im fried --- src/emulator/env.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emulator/env.ts b/src/emulator/env.ts index 3cea311c491..ded2e2cf750 100644 --- a/src/emulator/env.ts +++ b/src/emulator/env.ts @@ -70,7 +70,7 @@ export async function getCredentialsEnvironment( // Provide default application credentials when appropriate const credentialEnv: Record = {}; if (await hasDefaultCredentials()) { - !silent || + !silent && logger.logLabeled( "WARN", logLabel,