From aaca12dc0a3b41394a8227759aaecfcd2317420c Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Fri, 25 Sep 2026 09:45:16 -0500 Subject: [PATCH] fix: hide SF_TEMP_SHOW_SECRETS suggestion, add eol date --- messages/secrets-redacted.md | 6 +----- src/commands/org/display/user.ts | 2 -- src/commands/org/list/users.ts | 8 ++------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/messages/secrets-redacted.md b/messages/secrets-redacted.md index 80c0fa1c..0519d7d4 100644 --- a/messages/secrets-redacted.md +++ b/messages/secrets-redacted.md @@ -6,13 +6,9 @@ [REDACTED] Use 'sf org auth show-user-password' to view -# temp.envVarWorkaround - -Secrets are now hidden from '%s' command output. Use the 'sf org auth' commands instead. As a temporary workaround, you can set SF_TEMP_SHOW_SECRETS=true to render these secrets. This workaround will be removed in an upcoming release. - # temp.envVarIsSet -The SF_TEMP_SHOW_SECRETS env var is set. This is a temporary env var to continue to show secrets in the '%s' command output. This workaround will be removed in an upcoming CLI release. Switch to use the 'sf org auth' commands to avoid future disruption. +The SF_TEMP_SHOW_SECRETS env var is set. This is a temporary env var to continue to show secrets in the '%s' command output. This workaround will be removed on January 13, 2027. Switch to use the 'sf org auth' commands to avoid future disruption. # warning.passwordGenerated diff --git a/src/commands/org/display/user.ts b/src/commands/org/display/user.ts index 05fccc8e..fb590537 100644 --- a/src/commands/org/display/user.ts +++ b/src/commands/org/display/user.ts @@ -124,8 +124,6 @@ export class DisplayUserCommand extends SfCommand { if (showSecretsEnvVarIsSet) { this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org display user'])); this.warn(messages.getMessage('securityWarning')); - } else { - this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org display user'])); } this.log(''); diff --git a/src/commands/org/list/users.ts b/src/commands/org/list/users.ts index 7fd57afa..7c9634ba 100644 --- a/src/commands/org/list/users.ts +++ b/src/commands/org/list/users.ts @@ -103,12 +103,8 @@ export class ListUsersCommand extends SfCommand { }); // TODO: Remove after env var workaround is removed - if (this.jsonEnabled()) { - if (showSecretsEnvVarIsSet) { - this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org list users'])); - } else { - this.warn(secretsMessages.getMessage('temp.envVarWorkaround', ['sf org list users'])); - } + if (this.jsonEnabled() && showSecretsEnvVarIsSet) { + this.warn(secretsMessages.getMessage('temp.envVarIsSet', ['sf org list users'])); } return authList;