sfdx-hardis 6.1.1 → 6.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/lib/commands/hardis/org/retrieve/packageconfig.js +5 -1
- package/lib/commands/hardis/org/retrieve/packageconfig.js.map +1 -1
- package/lib/commands/hardis/project/configure/auth.js +20 -4
- package/lib/commands/hardis/project/configure/auth.js.map +1 -1
- package/lib/commands/hardis/scratch/create.js +1 -1
- package/lib/commands/hardis/scratch/create.js.map +1 -1
- package/lib/common/utils/authUtils.js +2 -2
- package/lib/common/utils/authUtils.js.map +1 -1
- package/lib/common/utils/index.js +22 -9
- package/lib/common/utils/index.js.map +1 -1
- package/lib/common/utils/orgUtils.js +69 -42
- package/lib/common/utils/orgUtils.js.map +1 -1
- package/lib/config/index.d.ts +2 -2
- package/lib/config/index.js +2 -1
- package/lib/config/index.js.map +1 -1
- package/oclif.manifest.json +415 -416
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,18 @@
|
|
|
4
4
|
|
|
5
5
|
Note: Can be used with `sfdx plugins:install sfdx-hardis@beta` and docker image `hardisgroupcom/sfdx-hardis@beta`
|
|
6
6
|
|
|
7
|
+
## [6.1.3] 2025-08-24
|
|
8
|
+
|
|
9
|
+
- [hardis:org:configure:auth](https://sfdx-hardis.cloudity.com/hardis/org/configure/auth/)
|
|
10
|
+
- Fix issues related to VsCode background mode
|
|
11
|
+
- When updating existing branch authentication, pre-select merge targets.
|
|
12
|
+
- Send more information to the user about files that are created/updated
|
|
13
|
+
|
|
14
|
+
## [6.1.2] 2025-08-24
|
|
15
|
+
|
|
16
|
+
- Simplify package retrieve command
|
|
17
|
+
- Handle when an org is disconnected in CodeBuilder context
|
|
18
|
+
|
|
7
19
|
## [6.1.1] 2025-08-24
|
|
8
20
|
|
|
9
21
|
- Auto-detect which login type to use depending if we are in local or web context (Code Builder, CodeSpaces)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* jscpd:ignore-start */
|
|
2
2
|
import { SfCommand, Flags, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
|
|
3
|
-
import { Messages } from '@salesforce/core';
|
|
3
|
+
import { Messages, SfError } from '@salesforce/core';
|
|
4
4
|
import c from 'chalk';
|
|
5
5
|
import { MetadataUtils } from '../../../../common/metadata-utils/index.js';
|
|
6
6
|
import { uxLog } from '../../../../common/utils/index.js';
|
|
@@ -65,6 +65,10 @@ The command's technical implementation involves:
|
|
|
65
65
|
.map((pkg) => `- ${pkg.SubscriberPackageName} (${pkg.SubscriberPackageVersionNumber})`)
|
|
66
66
|
.sort((a, b) => a.localeCompare(b))
|
|
67
67
|
.join('\n');
|
|
68
|
+
if (installedPackages.length === 0) {
|
|
69
|
+
uxLog("warning", this, c.yellow(`No installed packages found in org ${targetUsername}.`));
|
|
70
|
+
throw new SfError('No installed packages found in the target org. Maybe an auth issue ?');
|
|
71
|
+
}
|
|
68
72
|
uxLog("action", this, c.cyan(`Successfully retrieved ${installedPackages.length} installed packages from org ${targetUsername}.\n${packageNames}`));
|
|
69
73
|
// Store list in config
|
|
70
74
|
const updateConfigRes = await prompts({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageconfig.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/retrieve/packageconfig.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageconfig.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/retrieve/packageconfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* jscpd:ignore-start */
|
|
2
2
|
import { SfCommand, Flags, optionalOrgFlagWithDeprecations, optionalHubFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
|
|
3
|
-
import { Messages } from '@salesforce/core';
|
|
3
|
+
import { fs, Messages } from '@salesforce/core';
|
|
4
4
|
import c from 'chalk';
|
|
5
|
+
import * as yaml from 'js-yaml';
|
|
5
6
|
import { execSfdxJson, generateSSLCertificate, git, promptInstanceUrl, uxLog } from '../../../../common/utils/index.js';
|
|
6
7
|
import { getOrgAliasUsername, promptOrg } from '../../../../common/utils/orgUtils.js';
|
|
7
8
|
import { prompts } from '../../../../common/utils/prompts.js';
|
|
@@ -132,6 +133,14 @@ prompts
|
|
|
132
133
|
}
|
|
133
134
|
// Request merge targets
|
|
134
135
|
if (!devHub) {
|
|
136
|
+
let initialMergeTargets = [];
|
|
137
|
+
const branchConfigFile = `./config/branches/.sfdx-hardis.${branchName}.yml`;
|
|
138
|
+
if (fs.existsSync(branchConfigFile)) {
|
|
139
|
+
const branchConfig = yaml.load(fs.readFileSync(branchConfigFile, 'utf8'));
|
|
140
|
+
if (branchConfig && branchConfig.mergeTargets) {
|
|
141
|
+
initialMergeTargets = branchConfig.mergeTargets;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
135
144
|
const mergeTargetsResponse = await prompts({
|
|
136
145
|
type: 'multiselect',
|
|
137
146
|
name: 'value',
|
|
@@ -142,6 +151,7 @@ prompts
|
|
|
142
151
|
value: branch.replace('origin/', ''),
|
|
143
152
|
};
|
|
144
153
|
}),
|
|
154
|
+
initial: initialMergeTargets,
|
|
145
155
|
description: 'Select the git branches that this branch will be able to merge in',
|
|
146
156
|
placeholder: 'Select the target git branches',
|
|
147
157
|
});
|
|
@@ -149,7 +159,7 @@ prompts
|
|
|
149
159
|
// Update config file
|
|
150
160
|
await setInConfigFile([], {
|
|
151
161
|
mergeTargets: mergeTargets,
|
|
152
|
-
},
|
|
162
|
+
}, branchConfigFile);
|
|
153
163
|
}
|
|
154
164
|
// Request username
|
|
155
165
|
const usernameResponse = await prompts({
|
|
@@ -161,16 +171,19 @@ prompts
|
|
|
161
171
|
placeholder: 'Ex: admin.sfdx@myclient.com',
|
|
162
172
|
});
|
|
163
173
|
if (devHub) {
|
|
164
|
-
await setConfig('project', {
|
|
174
|
+
const configFile = await setConfig('project', {
|
|
165
175
|
devHubUsername: usernameResponse.value,
|
|
166
176
|
});
|
|
177
|
+
WebSocketClient.sendReportFileMessage(configFile, 'Updated project config file', 'report');
|
|
167
178
|
}
|
|
168
179
|
else {
|
|
169
180
|
// Update config file
|
|
181
|
+
const branchConfigFile = `./config/branches/.sfdx-hardis.${branchName}.yml`;
|
|
170
182
|
await setInConfigFile([], {
|
|
171
183
|
targetUsername: usernameResponse.value,
|
|
172
184
|
instanceUrl,
|
|
173
|
-
},
|
|
185
|
+
}, branchConfigFile);
|
|
186
|
+
WebSocketClient.sendReportFileMessage(branchConfigFile, `Updated ${branchName} config file`, 'report');
|
|
174
187
|
}
|
|
175
188
|
WebSocketClient.sendRefreshPipelineMessage();
|
|
176
189
|
// Generate SSL certificate (requires openssl to be installed on computer)
|
|
@@ -181,6 +194,9 @@ prompts
|
|
|
181
194
|
targetUsername: devHub ? flags['target-dev-hub']?.getUsername() : flags['target-org']?.getUsername(),
|
|
182
195
|
};
|
|
183
196
|
await generateSSLCertificate(certName, certFolder, this, orgConn, sslGenOptions);
|
|
197
|
+
uxLog("action", this, c.green(`Branch ${devHub ? '(DevHub)' : branchName} successfully configured for authentication!`));
|
|
198
|
+
uxLog("warning", this, c.yellow('Make sure you have set the environment variables in your CI/CD platform'));
|
|
199
|
+
uxLog("warning", this, c.yellow('Don\'t forget to commit the sfdx-hardis config file and the encrypted certificated key in git!'));
|
|
184
200
|
// Return an object to be displayed with --json
|
|
185
201
|
return { outputString: 'Configured branch for authentication' };
|
|
186
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/configure/auth.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EACL,SAAS,EACT,KAAK,EACL,+BAA+B,EAC/B,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/configure/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ export default class ScratchCreate extends SfCommand {
|
|
|
58
58
|
// Set this to true if your command requires a project workspace; 'requiresProject' is false by default
|
|
59
59
|
static requiresProject = true;
|
|
60
60
|
// List required plugins, their presence will be tested before running the command
|
|
61
|
-
static requiresSfdxPlugins = ['sfdmu'
|
|
61
|
+
static requiresSfdxPlugins = ['sfdmu'];
|
|
62
62
|
forceNew = false;
|
|
63
63
|
/* jscpd:ignore-end */
|
|
64
64
|
debugMode = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/hardis/scratch/create.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/hardis/scratch/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,12 +57,12 @@ export async function authOrg(orgAlias, options) {
|
|
|
57
57
|
globalThis.currentOrgApiVersion = orgInfoResult.result.apiVersion;
|
|
58
58
|
}
|
|
59
59
|
// Set as default username or devhubusername
|
|
60
|
-
uxLog("
|
|
60
|
+
uxLog("log", this, `[sfdx-hardis] You are already ${c.green('connected')} as ${c.green(orgInfoResult.result.username)} on org ${c.green(orgInfoResult.result.instanceUrl)} (apiVersion ${globalThis.currentOrgApiVersion})`);
|
|
61
61
|
if (orgInfoResult.result.expirationDate) {
|
|
62
62
|
uxLog("action", this, c.cyan(`[sfdx-hardis] Org expiration date: ${c.yellow(orgInfoResult.result.expirationDate)}`));
|
|
63
63
|
}
|
|
64
64
|
if (!isCI) {
|
|
65
|
-
uxLog("warning", this, c.yellow(c.italic(`
|
|
65
|
+
uxLog("warning", this, c.yellow(c.italic(`If this is NOT the org you want to play with, ${c.whiteBright(c.bold('hit CTRL+C'))}, then input ${c.whiteBright(c.bold('sf hardis:org:select'))}`)));
|
|
66
66
|
}
|
|
67
67
|
if (setDefaultOrg) {
|
|
68
68
|
const setDefaultOrgCommand = `sf config set ${alias ? alias : isDevHub ? 'target-dev-hub' : 'target-org'}=${orgInfoResult.result.username}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../src/common/utils/authUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authUtils.js","sourceRoot":"","sources":["../../../src/common/utils/authUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1025,7 +1025,7 @@ export function uxLog(logType, commandThis, textInit, sensitive = false) {
|
|
|
1025
1025
|
}
|
|
1026
1026
|
// VsCode sfdx-hardis log
|
|
1027
1027
|
if (WebSocketClient.isAlive() && !text.includes('[command]') && !text.includes('[NotifProvider]')) {
|
|
1028
|
-
if (sensitive) {
|
|
1028
|
+
if (sensitive && !text.includes('SFDX_CLIENT_ID_') && !text.includes('SFDX_CLIENT_KEY_')) {
|
|
1029
1029
|
WebSocketClient.sendCommandLogLineMessage('OBFUSCATED LOG LINE');
|
|
1030
1030
|
}
|
|
1031
1031
|
else {
|
|
@@ -1146,18 +1146,30 @@ export async function generateSSLCertificate(branchName, folder, commandThis, co
|
|
|
1146
1146
|
const tmpDir = await createTempDir();
|
|
1147
1147
|
const prevDir = process.cwd();
|
|
1148
1148
|
process.chdir(tmpDir);
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1149
|
+
try {
|
|
1150
|
+
const sslCommand = 'openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj "/C=GB/ST=Paris/L=Paris/O=Hardis Group/OU=sfdx-hardis/CN=hardis-group.com"';
|
|
1151
|
+
await execCommand(sslCommand, this, { output: true, fail: true });
|
|
1152
|
+
await execCommand('openssl x509 -req -sha256 -days 3650 -in server.csr -signkey server.key -out server.crt', this, {
|
|
1153
|
+
output: true,
|
|
1154
|
+
fail: true,
|
|
1155
|
+
});
|
|
1156
|
+
}
|
|
1157
|
+
catch (e) {
|
|
1158
|
+
uxLog("error", commandThis, c.red(`Error generating SSL certificate, please ensure you have openssl installed
|
|
1159
|
+
- It is included in Git Bash for Windows
|
|
1160
|
+
- You can also install it using "choco install openssl" if you have chocolatey installed
|
|
1161
|
+
- If it is installed, make sure that paths to bash and openssl are available in PATH
|
|
1162
|
+
- If you still have issues, run sfdx-hardis command in Git Bash terminal
|
|
1163
|
+
`));
|
|
1164
|
+
throw e;
|
|
1165
|
+
}
|
|
1155
1166
|
process.chdir(prevDir);
|
|
1156
1167
|
// Copy certificate key in local project
|
|
1157
1168
|
await fs.ensureDir(folder);
|
|
1158
1169
|
const targetKeyFile = path.join(folder, `${branchName}.key`);
|
|
1159
1170
|
await fs.copy(path.join(tmpDir, 'server.key'), targetKeyFile);
|
|
1160
1171
|
const encryptionKey = await encryptFile(targetKeyFile);
|
|
1172
|
+
WebSocketClient.sendReportFileMessage(targetKeyFile, `Encrypted SSL certificate key for branch ${branchName}`, 'report');
|
|
1161
1173
|
// Copy certificate file in user home project
|
|
1162
1174
|
const crtFile = path.join(os.homedir(), `${branchName}.crt`);
|
|
1163
1175
|
await fs.copy(path.join(tmpDir, 'server.crt'), crtFile);
|
|
@@ -1174,10 +1186,11 @@ export async function generateSSLCertificate(branchName, folder, commandThis, co
|
|
|
1174
1186
|
description: 'Creates a Connected App required for CI/CD authentication. Choose yes if you are unsure.',
|
|
1175
1187
|
});
|
|
1176
1188
|
if (confirmResponse.value === true) {
|
|
1177
|
-
uxLog("action", commandThis, c.cyan('Please configure both below variables in your CI/CD platform
|
|
1189
|
+
uxLog("action", commandThis, c.cyan('Please configure both below variables in your CI/CD platform.\n(expand section below to see values)'));
|
|
1178
1190
|
uxLog("log", commandThis, c.grey(c.cyanBright(`${c.green(c.bold(`- SFDX_CLIENT_ID_${branchName.toUpperCase()}`))} with value ${c.bold(c.green(consumerKey))}`)), true);
|
|
1179
1191
|
uxLog("log", commandThis, c.grey(c.cyanBright(`${c.green(c.bold(`- SFDX_CLIENT_KEY_${branchName.toUpperCase()}`))} with value ${c.bold(c.green(encryptionKey))}`)), true);
|
|
1180
1192
|
uxLog("log", commandThis, c.grey(c.yellow(`Help to configure CI variables is here: ${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-setup-auth/`)));
|
|
1193
|
+
WebSocketClient.sendReportFileMessage(`${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-setup-auth/`, "Help to configure CI variables", "docUrl");
|
|
1181
1194
|
await prompts({
|
|
1182
1195
|
type: 'confirm',
|
|
1183
1196
|
message: c.cyanBright('Please confirm when variables have been set'),
|
|
@@ -1271,7 +1284,7 @@ If this is a Test class issue (production env), you may have to create manually
|
|
|
1271
1284
|
- Once created, update CI/CD variable ${c.green(c.bold(`SFDX_CLIENT_ID_${branchName.toUpperCase()}`))} with the ConsumerKey of the newly created connected app`));
|
|
1272
1285
|
await prompts({
|
|
1273
1286
|
type: 'confirm',
|
|
1274
|
-
message: c.cyanBright('You need to manually configure the connected app. Follow the MANUAL INSTRUCTIONS
|
|
1287
|
+
message: c.cyanBright('You need to manually configure the connected app. Follow the MANUAL INSTRUCTIONS above, then continue here'),
|
|
1275
1288
|
description: 'Confirm when you have completed the manual Connected App configuration steps',
|
|
1276
1289
|
});
|
|
1277
1290
|
}
|