@salesforce/b2c-cli 1.23.2 → 2.1.0

package/dist/commands/mrt/env/var/push.js

@@ -6,10 +6,10 @@
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { parseEnv } from 'node:util';
-import { Flags, ux } from '@oclif/core';
+import { Flags } from '@oclif/core';
 import { confirm } from '@salesforce/b2c-tooling-sdk/ux';
 import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { listEnvVars, setEnvVar, setEnvVars } from '@salesforce/b2c-tooling-sdk/operations/mrt';
+import { listEnvVarsWithBackend, setEnvVarWithBackend, setEnvVarsWithBackend, } from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import { t, withDocs } from '../../../../i18n/index.js';
 import { filterByPrefix, computeEnvVarDiff, formatEnvVarDiffSummary } from '../../../../utils/mrt/env-var-diff.js';
 /**
@@ -26,6 +26,7 @@ export default class MrtEnvVarPush extends MrtCommand {
         '<%= config.bin %> <%= command.id %> --project acme-storefront --environment production',
         '<%= config.bin %> <%= command.id %> -p my-project -e staging --yes',
         '<%= config.bin %> <%= command.id %> --file config/.env --exclude-prefix INTERNAL_ -p my-project -e staging',
+        '<%= config.bin %> <%= command.id %> -p my-project -e staging --mrt-backend scapi --yes',
     ];
     static flags = {
         ...MrtCommand.baseFlags,
@@ -46,9 +47,9 @@ export default class MrtEnvVarPush extends MrtCommand {
         }),
     };
     operations = {
-        listEnvVars,
-        setEnvVar,
-        setEnvVars,
+        listEnvVarsWithBackend,
+        setEnvVarWithBackend,
+        setEnvVarsWithBackend,
         readEnvFile: (path) => readFileSync(path, 'utf8'),
     };
     async run() {
@@ -72,32 +73,51 @@ export default class MrtEnvVarPush extends MrtCommand {
         // Step 3: Validate MRT target
         const { mrtProject: project, mrtEnvironment: environment } = this.resolvedConfig.values;
         if (!project) {
-            this.error(t('commands.mrt.env.var.push.missingProject', 'MRT project is required. Provide --project flag, set MRT_PROJECT, or set mrtProject in dw.json.'));
+            this.error(t('commands.mrt.env.var.push.missingProject', 'MRT project is required. Provide --project/--storefront (-p/-s), set MRT_PROJECT, or set mrtProject in dw.json.'));
         }
         if (!environment) {
             this.error(t('commands.mrt.env.var.push.missingEnvironment', 'MRT environment is required. Provide --environment flag, set MRT_ENVIRONMENT, or set mrtEnvironment in dw.json.'));
         }
-        // Step 4: Fetch current remote env vars
-        this.requireMrtCredentials();
+        // Step 4: Resolve the backend and fetch current remote env vars. The list
+        // resolves the backend once (with safe `auto` fallback); every write below
+        // is pinned to whatever backend served this read so the push never crosses
+        // backends mid-operation.
+        const { preference, scapiConnection, legacyAuth } = this.getMrtBackendContext();
         const { mrtOrigin: origin } = this.resolvedConfig.values;
-        const auth = this.getMrtAuth();
-        ux.stdout(t('commands.mrt.env.var.push.fetching', 'Fetching remote env vars for {{project}}/{{environment}}...', {
+        // Human progress goes through this.log, which MrtCommand.log() suppresses
+        // centrally under --json — so these lines need no per-call --json guard.
+        this.log(t('commands.mrt.env.var.push.fetching', 'Fetching remote env vars for {{project}}/{{environment}}...', {
             project,
             environment,
         }));
-        const { variables: remoteVariables } = await this.operations.listEnvVars({ projectSlug: project, environment, origin }, auth);
+        const { backend, variables: remoteVariables } = await this.operations.listEnvVarsWithBackend({
+            preference,
+            scapiConnection,
+            legacyAuth,
+            projectSlug: project,
+            environment,
+            origin,
+            onFallback: (reason) => this.warn(reason),
+            onResolve: (resolved) => this.logger.debug({ backend: resolved }, '[MRT] Pushing environment variables via backend'),
+        });
         const remoteVars = new Map(remoteVariables.map((v) => [v.name, v.value]));
         // Step 5: Compute diff
         const diff = computeEnvVarDiff(localVars, remoteVars);
         const toSync = [...diff.add, ...diff.update];
         // Step 6: Display summary
-        ux.stdout('');
-        ux.stdout(formatEnvVarDiffSummary(diff));
+        this.log('');
+        this.log(formatEnvVarDiffSummary(diff));
         if (toSync.length === 0) {
             return { pushed: 0, failed: 0, skipped: diff.remoteOnly.length };
         }
         // Step 7: Confirm unless --yes
         if (!flags.yes) {
+            // Under --json the command is non-interactive: a machine consumer can't
+            // answer a prompt (and stdout must stay clean JSON), so require --yes
+            // rather than hang on stdin.
+            if (this.jsonEnabled()) {
+                this.error(t('commands.mrt.env.var.push.jsonRequiresYes', 'Confirmation is required to push. Re-run with --yes to push in --json (non-interactive) mode.'));
+            }
             const message = t('commands.mrt.env.var.push.confirm', 'Push {{count}} variable(s) ({{add}} new, {{update}} updated) to {{project}}/{{environment}}?', {
                 count: toSync.length,
                 add: diff.add.length,
@@ -107,48 +127,74 @@ export default class MrtEnvVarPush extends MrtCommand {
             });
             const confirmed = await confirm(message);
             if (!confirmed) {
-                ux.stdout(t('commands.mrt.env.var.push.aborted', 'Aborted.'));
+                this.log(t('commands.mrt.env.var.push.aborted', 'Aborted.'));
                 return { pushed: 0, failed: 0, skipped: diff.remoteOnly.length };
             }
         }
-        // Step 8: Push variables — try batch first, fall back to individual calls
+        // Step 8: Push variables, pinned to the backend the read resolved to
+        // (`preference: backend`), so a write never silently falls back to the other
+        // backend after the read already committed to one.
         let pushed = 0;
         let failed = 0;
-        const baseParams = { projectSlug: project, environment, origin };
+        const pinnedContext = {
+            preference: backend,
+            scapiConnection,
+            legacyAuth,
+            projectSlug: project,
+            environment,
+            origin,
+        };
         try {
             const variables = Object.fromEntries(toSync.map(({ key, value }) => [key, value]));
-            await this.operations.setEnvVars({ ...baseParams, variables }, auth);
+            await this.operations.setEnvVarsWithBackend({ ...pinnedContext, variables });
             for (const { key } of toSync) {
-                ux.stdout(t('commands.mrt.env.var.push.varSuccess', '  ✓ {{key}}', { key }));
+                this.log(t('commands.mrt.env.var.push.varSuccess', '  ✓ {{key}}', { key }));
             }
             pushed = toSync.length;
         }
-        catch {
-            this.warn(t('commands.mrt.env.var.push.batchFailed', 'Batch push failed, retrying variables individually...'));
-            const results = await Promise.allSettled(toSync.map(({ key, value }) => this.operations.setEnvVar({ ...baseParams, key, value }, auth)));
-            for (const [index, result] of results.entries()) {
-                const { key } = toSync[index];
-                if (result.status === 'fulfilled') {
-                    ux.stdout(t('commands.mrt.env.var.push.varSuccess', '  ✓ {{key}}', { key }));
-                    pushed++;
-                }
-                else {
+        catch (batchError) {
+            if (backend === 'scapi') {
+                // SCAPI applies the whole set as a single merge-PATCH; retrying per key
+                // would just re-hit the same endpoint, so surface the batch failure
+                // directly instead of a misleading per-variable retry.
+                for (const { key } of toSync) {
                     this.warn(t('commands.mrt.env.var.push.varFailed', '  ✗ {{key}}: {{message}}', {
                         key,
-                        message: result.reason.message,
+                        message: batchError.message,
                     }));
-                    failed++;
+                }
+                failed = toSync.length;
+            }
+            else {
+                this.warn(t('commands.mrt.env.var.push.batchFailed', 'Batch push failed, retrying variables individually...'));
+                const results = await Promise.allSettled(toSync.map(({ key, value }) => this.operations.setEnvVarWithBackend({ ...pinnedContext, key, value })));
+                for (const [index, result] of results.entries()) {
+                    const { key } = toSync[index];
+                    if (result.status === 'fulfilled') {
+                        this.log(t('commands.mrt.env.var.push.varSuccess', '  ✓ {{key}}', { key }));
+                        pushed++;
+                    }
+                    else {
+                        this.warn(t('commands.mrt.env.var.push.varFailed', '  ✗ {{key}}: {{message}}', {
+                            key,
+                            message: result.reason.message,
+                        }));
+                        failed++;
+                    }
                 }
             }
         }
         // Step 9: Summary
-        ux.stdout('');
-        ux.stdout(t('commands.mrt.env.var.push.summary', 'Summary: {{pushed}} pushed, {{failed}} failed, {{skipped}} remote-only (not deleted)', {
+        this.log('');
+        this.log(t('commands.mrt.env.var.push.summary', 'Summary: {{pushed}} pushed, {{failed}} failed, {{skipped}} remote-only (not deleted)', {
             pushed,
             failed,
             skipped: diff.remoteOnly.length,
         }));
         return { pushed, failed, skipped: diff.remoteOnly.length };
     }
+    supportsScapiMrt() {
+        return true;
+    }
 }
 //# sourceMappingURL=push.js.map

package/dist/commands/mrt/env/var/push.js.map

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/env/var/push.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/env/var/push.ts"],"names":[],"mappings":"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"}

package/dist/commands/mrt/env/var/set.d.ts

@@ -1,5 +1,5 @@
 import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { setEnvVars } from '@salesforce/b2c-tooling-sdk/operations/mrt';
+import { setEnvVarsWithBackend } from '@salesforce/b2c-tooling-sdk/operations/mrt';
 /**
  * Set environment variables on an MRT project environment.
  */
@@ -16,6 +16,18 @@ export default class MrtEnvVarSet extends MrtCommand<typeof MrtEnvVarSet> {
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -30,11 +42,12 @@ export default class MrtEnvVarSet extends MrtCommand<typeof MrtEnvVarSet> {
     };
     static strict: boolean;
     protected operations: {
-        setEnvVars: typeof setEnvVars;
+        setEnvVarsWithBackend: typeof setEnvVarsWithBackend;
     };
     run(): Promise<{
         variables: Record<string, string>;
         project: string;
         environment: string;
     }>;
+    protected supportsScapiMrt(): boolean;
 }

package/dist/commands/mrt/env/var/set.js

@@ -5,7 +5,7 @@
  */
 import { Args } from '@oclif/core';
 import { MrtCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { setEnvVars } from '@salesforce/b2c-tooling-sdk/operations/mrt';
+import { setEnvVarsWithBackend } from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import { t, withDocs } from '../../../../i18n/index.js';
 /**
  * Set environment variables on an MRT project environment.
@@ -23,6 +23,7 @@ export default class MrtEnvVarSet extends MrtCommand {
         '<%= config.bin %> <%= command.id %> MY_VAR=value --project acme-storefront --environment production',
         '<%= config.bin %> <%= command.id %> API_KEY=secret DEBUG=true -p my-project -e staging',
         '<%= config.bin %> <%= command.id %> "MESSAGE=hello world" -p my-project -e production',
+        '<%= config.bin %> <%= command.id %> API_KEY=secret -p my-project -e staging --mrt-backend scapi',
     ];
     static flags = {
         ...MrtCommand.baseFlags,
@@ -30,14 +31,13 @@ export default class MrtEnvVarSet extends MrtCommand {
     // Allow multiple arguments
     static strict = false;
     operations = {
-        setEnvVars,
+        setEnvVarsWithBackend,
     };
     async run() {
-        this.requireMrtCredentials();
         const { argv } = await this.parse(MrtEnvVarSet);
         const { mrtProject: project, mrtEnvironment: environment } = this.resolvedConfig.values;
         if (!project) {
-            this.error('MRT project is required. Provide --project flag, set MRT_PROJECT, or set mrtProject in dw.json.');
+            this.error('MRT project is required. Provide --project/--storefront (-p/-s), set MRT_PROJECT, or set mrtProject in dw.json.');
         }
         if (!environment) {
             this.error('MRT environment is required. Provide --environment flag, set MRT_ENVIRONMENT, or set mrtEnvironment in dw.json.');
@@ -61,27 +61,44 @@ export default class MrtEnvVarSet extends MrtCommand {
         if (keys.length === 0) {
             this.error(t('commands.mrt.env.var.set.noVariables', 'No environment variables provided. Use KEY=value format.'));
         }
-        await this.operations.setEnvVars({
+        const { preference, scapiConnection, legacyAuth } = this.getMrtBackendContext();
+        // The resolved backend is surfaced via `onResolve` (debug log) only — it is
+        // deliberately kept out of the `--json` payload so the legacy `--json`
+        // output stays byte-identical and matches `mrt env var list` / `bundle deploy`.
+        await this.operations.setEnvVarsWithBackend({
+            preference,
+            scapiConnection,
+            legacyAuth,
             projectSlug: project,
             environment,
             variables,
             origin: this.resolvedConfig.values.mrtOrigin,
-        }, this.getMrtAuth());
-        if (keys.length === 1) {
-            this.log(t('commands.mrt.env.var.set.successSingle', 'Set {{key}} on {{project}}/{{environment}}', {
-                key: keys[0],
-                project,
-                environment,
-            }));
-        }
-        else {
-            this.log(t('commands.mrt.env.var.set.successMultiple', 'Set {{count}} variables on {{project}}/{{environment}}', {
-                count: keys.length,
-                project,
-                environment,
-            }));
+            onFallback: (reason) => this.warn(reason),
+            onResolve: (resolved) => this.logger.debug({ backend: resolved }, '[MRT] Setting environment variables via backend'),
+        });
+        // Under --json, emit only the result object: the human success message
+        // routes through the logger (stderr) and would otherwise interleave with the
+        // JSON. Mirrors `mrt env var list` / `mrt bundle deploy`.
+        if (!this.jsonEnabled()) {
+            if (keys.length === 1) {
+                this.log(t('commands.mrt.env.var.set.successSingle', 'Set {{key}} on {{project}}/{{environment}}', {
+                    key: keys[0],
+                    project,
+                    environment,
+                }));
+            }
+            else {
+                this.log(t('commands.mrt.env.var.set.successMultiple', 'Set {{count}} variables on {{project}}/{{environment}}', {
+                    count: keys.length,
+                    project,
+                    environment,
+                }));
+            }
         }
         return { variables, project, environment };
     }
+    supportsScapiMrt() {
+        return true;
+    }
 }
 //# sourceMappingURL=set.js.map

package/dist/commands/mrt/env/var/set.js.map

@@ -1 +1 @@
-{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/env/var/set.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/env/var/set.ts"],"names":[],"mappings":"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"}

package/dist/commands/mrt/org/b2c.d.ts

@@ -18,6 +18,18 @@ export default class MrtB2COrgInfo extends MrtCommand<typeof MrtB2COrgInfo> {
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/create.d.ts

@@ -14,6 +14,18 @@ export default class MrtOrgCertCreate extends MrtCommand<typeof MrtOrgCertCreate
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/create.js

@@ -26,14 +26,12 @@ export default class MrtOrgCertCreate extends MrtCommand {
         const { domain } = this.args;
         const { org } = this.flags;
         const cert = await createCertificate({ organizationSlug: org, domainName: domain, origin: this.resolvedConfig.values.mrtOrigin }, this.getMrtAuth());
-        if (!this.jsonEnabled()) {
-            this.log(t('commands.mrt.org.cert.create.success', 'Certificate created (id={{id}}) for {{domain}}.', {
-                id: String(cert.id ?? '?'),
-                domain,
-            }));
-            if (cert.validation_record) {
-                this.log(t('commands.mrt.org.cert.create.validationRecord', 'Add the following DNS record to validate this certificate:\n  {{record}}', { record: cert.validation_record }));
-            }
+        this.log(t('commands.mrt.org.cert.create.success', 'Certificate created (id={{id}}) for {{domain}}.', {
+            id: String(cert.id ?? '?'),
+            domain,
+        }));
+        if (cert.validation_record) {
+            this.log(t('commands.mrt.org.cert.create.validationRecord', 'Add the following DNS record to validate this certificate:\n  {{record}}', { record: cert.validation_record }));
         }
         return cert;
     }

package/dist/commands/mrt/org/cert/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAgC,MAAM,4CAA4C,CAAC;AAC5G,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAmC;IAC/E,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YAClB,WAAW,EAAE,oDAAoD;YACjE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,0CAA0C,EAAE,wDAAwD,CAAC,EACvG,uCAAuC,CACxC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,mEAAmE,CAAC,CAAC;IAExF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAClC,EAAC,gBAAgB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EACzF,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,sCAAsC,EAAE,iDAAiD,EAAE;gBAC3F,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC;gBAC1B,MAAM;aACP,CAAC,CACH,CAAC;YACF,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,IAAI,CAAC,GAAG,CACN,CAAC,CACC,+CAA+C,EAC/C,0EAA0E,EAC1E,EAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAC,CACjC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAgC,MAAM,4CAA4C,CAAC;AAC5G,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAmC;IAC/E,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;YAClB,WAAW,EAAE,oDAAoD;YACjE,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,0CAA0C,EAAE,wDAAwD,CAAC,EACvG,uCAAuC,CACxC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,mEAAmE,CAAC,CAAC;IAExF,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAClC,EAAC,gBAAgB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EACzF,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,sCAAsC,EAAE,iDAAiD,EAAE;YAC3F,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC;YAC1B,MAAM;SACP,CAAC,CACH,CAAC;QACF,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CACN,CAAC,CACC,+CAA+C,EAC/C,0EAA0E,EAC1E,EAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAC,CACjC,CACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC"}

package/dist/commands/mrt/org/cert/delete.d.ts

@@ -17,6 +17,18 @@ export default class MrtOrgCertDelete extends MrtCommand<typeof MrtOrgCertDelete
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/delete.js

@@ -35,9 +35,7 @@ export default class MrtOrgCertDelete extends MrtCommand {
             }
         }
         await deleteCertificate({ organizationSlug: org, certId, origin: this.resolvedConfig.values.mrtOrigin }, this.getMrtAuth());
-        if (!this.jsonEnabled()) {
-            this.log(t('commands.mrt.org.cert.delete.success', 'Certificate {{id}} deleted.', { id: String(certId) }));
-        }
+        this.log(t('commands.mrt.org.cert.delete.success', 'Certificate {{id}} deleted.', { id: String(certId) }));
         return { certId, deleted: true };
     }
 }

package/dist/commands/mrt/org/cert/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAmC;IAC/E,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,0BAA0B,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KAChF,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,0CAA0C,EAAE,oCAAoC,CAAC,EACnF,uCAAuC,CACxC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,sDAAsD,CAAC,CAAC;IAE3E,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;QACrE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,0BAA0B,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;KAC3F,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,MAAM,OAAO,CAC7B,CAAC,CAAC,sCAAsC,EAAE,yCAAyC,EAAE;gBACnF,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;gBAClB,GAAG;aACJ,CAAC,CACH,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAC,CAAC;gBACpE,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,CACrB,EAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EAC7E,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC,EAAE,6BAA6B,EAAE,EAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC;QAC3G,CAAC;QAED,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IACjC,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAmC;IAC/E,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,0BAA0B,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KAChF,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,0CAA0C,EAAE,oCAAoC,CAAC,EACnF,uCAAuC,CACxC,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,sDAAsD,CAAC,CAAC;IAE3E,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;QACrE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,0BAA0B,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;KAC3F,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,MAAM,OAAO,CAC7B,CAAC,CAAC,sCAAsC,EAAE,yCAAyC,EAAE;gBACnF,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;gBAClB,GAAG;aACJ,CAAC,CACH,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAC,CAAC;gBACpE,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,CACrB,EAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EAC7E,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC,EAAE,6BAA6B,EAAE,EAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC;QAEzG,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IACjC,CAAC"}

package/dist/commands/mrt/org/cert/get.d.ts

@@ -17,6 +17,18 @@ export default class MrtOrgCertGet extends MrtCommand<typeof MrtOrgCertGet> {
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/list.d.ts

@@ -17,6 +17,18 @@ export default class MrtOrgCertList extends MrtCommand<typeof MrtOrgCertList> {
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/restart-validation.d.ts

@@ -17,6 +17,18 @@ export default class MrtOrgCertRestartValidation extends MrtCommand<typeof MrtOr
         environment: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'cloud-origin': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'credentials-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'mrt-backend': import("@oclif/core/interfaces").OptionFlag<"scapi" | "auto" | "legacy", import("@oclif/core/interfaces").CustomOptions>;
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'short-code': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'tenant-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'user-auth': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-cert': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'jwt-passphrase': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'log-level': import("@oclif/core/interfaces").OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/mrt/org/cert/restart-validation.js

@@ -23,15 +23,13 @@ export default class MrtOrgCertRestartValidation extends MrtCommand {
         const { certId } = this.args;
         const { org } = this.flags;
         const cert = await restartCertificateValidation({ organizationSlug: org, certId, origin: this.resolvedConfig.values.mrtOrigin }, this.getMrtAuth());
-        if (!this.jsonEnabled()) {
-            this.log(t('commands.mrt.org.cert.restartValidation.success', 'Validation restarted for certificate {{id}}.', {
-                id: String(certId),
+        this.log(t('commands.mrt.org.cert.restartValidation.success', 'Validation restarted for certificate {{id}}.', {
+            id: String(certId),
+        }));
+        if (cert.validation_record) {
+            this.log(t('commands.mrt.org.cert.restartValidation.record', 'New validation record:\n  {{record}}', {
+                record: cert.validation_record,
             }));
-            if (cert.validation_record) {
-                this.log(t('commands.mrt.org.cert.restartValidation.record', 'New validation record:\n  {{record}}', {
-                    record: cert.validation_record,
-                }));
-            }
         }
         return cert;
     }

package/dist/commands/mrt/org/cert/restart-validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"restart-validation.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/restart-validation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,4BAA4B,EAAsB,MAAM,4CAA4C,CAAC;AAC7G,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,UAA8C;IACrG,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CACC,qDAAqD,EACrD,sEAAsE,CACvE,EACD,mDAAmD,CACpD,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,sDAAsD,CAAC,CAAC;IAE3E,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,IAAI,GAAG,MAAM,4BAA4B,CAC7C,EAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EAC7E,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,iDAAiD,EAAE,8CAA8C,EAAE;gBACnG,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;aACnB,CAAC,CACH,CAAC;YACF,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,gDAAgD,EAAE,sCAAsC,EAAE;oBAC1F,MAAM,EAAE,IAAI,CAAC,iBAAiB;iBAC/B,CAAC,CACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC"}
+{"version":3,"file":"restart-validation.js","sourceRoot":"","sources":["../../../../../src/commands/mrt/org/cert/restart-validation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,4BAA4B,EAAsB,MAAM,4CAA4C,CAAC;AAC7G,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,UAA8C;IACrG,MAAM,CAAC,IAAI,GAAG;QACZ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CACC,qDAAqD,EACrD,sEAAsE,CACvE,EACD,mDAAmD,CACpD,CAAC;IAEF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,QAAQ,GAAG,CAAC,sDAAsD,CAAC,CAAC;IAE3E,MAAM,CAAC,KAAK,GAAG;QACb,GAAG,UAAU,CAAC,SAAS;QACvB,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;KACtE,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,EAAC,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,IAAI,GAAG,MAAM,4BAA4B,CAC7C,EAAC,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAC,EAC7E,IAAI,CAAC,UAAU,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,iDAAiD,EAAE,8CAA8C,EAAE;YACnG,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;SACnB,CAAC,CACH,CAAC;QACF,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CACN,CAAC,CAAC,gDAAgD,EAAE,sCAAsC,EAAE;gBAC1F,MAAM,EAAE,IAAI,CAAC,iBAAiB;aAC/B,CAAC,CACH,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC"}