Skip to content

Commit d4423bb

Browse files
committed
setup inspect respecting env vars
1 parent 69a98dc commit d4423bb

3 files changed

Lines changed: 26 additions & 2 deletions

File tree

.changeset/env-source-inspect.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@salesforce/b2c-tooling-sdk': patch
3+
'@salesforce/b2c-cli': patch
4+
---
5+
6+
Add MRT environment variable support to EnvSource (`MRT_API_KEY`, `MRT_PROJECT`, `MRT_ENVIRONMENT`, `MRT_CLOUD_ORIGIN` and their `SFCC_MRT_*` variants). The `setup inspect` command now shows values from SFCC_* environment variables as a config source.

packages/b2c-cli/src/commands/setup/inspect.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
*/
66
import {Flags, ux} from '@oclif/core';
77
import cliui from 'cliui';
8-
import {BaseCommand} from '@salesforce/b2c-tooling-sdk/cli';
9-
import type {NormalizedConfig, ConfigSourceInfo} from '@salesforce/b2c-tooling-sdk/config';
8+
import {BaseCommand, loadConfig} from '@salesforce/b2c-tooling-sdk/cli';
9+
import type {NormalizedConfig, ConfigSourceInfo, ResolvedB2CConfig} from '@salesforce/b2c-tooling-sdk/config';
10+
import {EnvSource} from '@salesforce/b2c-tooling-sdk/config';
1011
import {withDocs} from '../../i18n/index.js';
1112

1213
/**
@@ -67,6 +68,7 @@ function getDisplayValue(field: string, value: unknown, unmask: boolean): string
6768
*/
6869
export default class SetupInspect extends BaseCommand<typeof SetupInspect> {
6970
static aliases = ['setup:config'];
71+
static hiddenAliases = ['config:show', 'config:inspect'];
7072

7173
static description = withDocs('Display resolved configuration', '/cli/setup.html#b2c-setup-inspect');
7274

@@ -86,6 +88,13 @@ export default class SetupInspect extends BaseCommand<typeof SetupInspect> {
8688
}),
8789
};
8890

91+
protected override loadConfiguration(): ResolvedB2CConfig {
92+
// Include EnvSource so that SFCC_* environment variables are visible in inspect output.
93+
// Other commands handle env vars via oclif flag mappings, but inspect needs to show them
94+
// as a config source since it doesn't have those flags.
95+
return loadConfig({}, this.getBaseConfigOptions(), {before: [new EnvSource()]});
96+
}
97+
8998
async run(): Promise<SetupInspectResponse> {
9099
const {values, sources, warnings} = this.resolvedConfig;
91100
const unmask = this.flags.unmask;

packages/b2c-tooling-sdk/src/config/sources/env-source.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ const ENV_VAR_MAP: Record<string, keyof NormalizedConfig> = {
3636
SFCC_AUTH_METHODS: 'authMethods',
3737
SFCC_ACCOUNT_MANAGER_HOST: 'accountManagerHost',
3838
SFCC_SANDBOX_API_HOST: 'sandboxApiHost',
39+
// MRT env vars — MRT_* listed first as fallback, SFCC_MRT_* listed second to take precedence
40+
MRT_API_KEY: 'mrtApiKey',
41+
SFCC_MRT_API_KEY: 'mrtApiKey',
42+
MRT_PROJECT: 'mrtProject',
43+
SFCC_MRT_PROJECT: 'mrtProject',
44+
MRT_ENVIRONMENT: 'mrtEnvironment',
45+
SFCC_MRT_ENVIRONMENT: 'mrtEnvironment',
46+
MRT_CLOUD_ORIGIN: 'mrtOrigin',
47+
SFCC_MRT_CLOUD_ORIGIN: 'mrtOrigin',
3948
};
4049

4150
/** Fields that should be parsed as comma-separated arrays. */

0 commit comments

Comments
 (0)