sfdx-hardis 6.8.1 → 6.9.1-alpha202510252146.0
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 +11 -0
- package/defaults/ci/.github/workflows/check-deploy.yml +2 -2
- package/defaults/ci/.github/workflows/process-deploy.yml +2 -2
- package/defaults/ci/azure-pipelines-checks.yml +1 -1
- package/defaults/ci/azure-pipelines-deployment.yml +1 -1
- package/defaults/monitoring/.github/workflows/org-monitoring.yml +6 -7
- package/lib/commands/hardis/misc/servicenow-report.d.ts +1 -0
- package/lib/commands/hardis/misc/servicenow-report.js +40 -2
- package/lib/commands/hardis/misc/servicenow-report.js.map +1 -1
- package/lib/commands/hardis/org/test/apex.js +3 -3
- package/lib/commands/hardis/org/test/apex.js.map +1 -1
- package/lib/commands/hardis/project/deploy/notify.js +2 -2
- package/lib/commands/hardis/project/deploy/notify.js.map +1 -1
- package/lib/commands/hardis/project/deploy/quick.js +2 -1
- package/lib/commands/hardis/project/deploy/quick.js.map +1 -1
- package/lib/commands/hardis/project/deploy/start.js +2 -1
- package/lib/commands/hardis/project/deploy/start.js.map +1 -1
- package/lib/commands/hardis/project/deploy/validate.js +2 -1
- package/lib/commands/hardis/project/deploy/validate.js.map +1 -1
- package/lib/commands/hardis/source/deploy.js +2 -1
- package/lib/commands/hardis/source/deploy.js.map +1 -1
- package/lib/common/gitProvider/azureDevops.d.ts +1 -0
- package/lib/common/gitProvider/azureDevops.js +68 -1
- package/lib/common/gitProvider/azureDevops.js.map +1 -1
- package/lib/common/gitProvider/bitbucket.d.ts +1 -0
- package/lib/common/gitProvider/bitbucket.js +78 -0
- package/lib/common/gitProvider/bitbucket.js.map +1 -1
- package/lib/common/gitProvider/gitProviderRoot.d.ts +1 -0
- package/lib/common/gitProvider/gitProviderRoot.js +6 -0
- package/lib/common/gitProvider/gitProviderRoot.js.map +1 -1
- package/lib/common/gitProvider/github.d.ts +1 -0
- package/lib/common/gitProvider/github.js +71 -0
- package/lib/common/gitProvider/github.js.map +1 -1
- package/lib/common/gitProvider/gitlab.d.ts +3 -0
- package/lib/common/gitProvider/gitlab.js +107 -0
- package/lib/common/gitProvider/gitlab.js.map +1 -1
- package/lib/common/gitProvider/index.js +49 -37
- package/lib/common/gitProvider/index.js.map +1 -1
- package/lib/common/notifProvider/teamsProvider.d.ts +7 -0
- package/lib/common/notifProvider/teamsProvider.js +146 -6
- package/lib/common/notifProvider/teamsProvider.js.map +1 -1
- package/lib/common/utils/dataUtils.d.ts +1 -1
- package/lib/common/utils/dataUtils.js +1 -0
- package/lib/common/utils/dataUtils.js.map +1 -1
- package/lib/common/utils/deployTips.js +2 -1
- package/lib/common/utils/deployTips.js.map +1 -1
- package/lib/common/utils/deployUtils.d.ts +0 -7
- package/lib/common/utils/deployUtils.js +11 -65
- package/lib/common/utils/deployUtils.js.map +1 -1
- package/lib/common/utils/gitUtils.d.ts +2 -0
- package/lib/common/utils/gitUtils.js +7 -1
- package/lib/common/utils/gitUtils.js.map +1 -1
- package/lib/common/utils/prePostCommandUtils.d.ts +25 -0
- package/lib/common/utils/prePostCommandUtils.js +331 -0
- package/lib/common/utils/prePostCommandUtils.js.map +1 -0
- package/oclif.lock +938 -918
- package/oclif.manifest.json +676 -676
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,17 @@
|
|
|
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
|
+
- New feature: **Deployment actions** at Pull Request level
|
|
8
|
+
- Define pre-deploy and post-deploy commands to be executed during CI/CD deployments
|
|
9
|
+
- Display summary in Pull Request with details of each command execution
|
|
10
|
+
- Add explicit message in case of error when authenticating to Git provider API
|
|
11
|
+
- Allow to override SFDX_TEST_WAIT_MINUTES and SFDX_DEPLOY_WAIT_MINUTES using CI/CD variables, and set 120 minutes as default value everywhere
|
|
12
|
+
|
|
13
|
+
## [6.9.0] 2025-10-23
|
|
14
|
+
|
|
15
|
+
- Bring back Microsoft Teams notifications [using Teams Workflow](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-ms-teams/)
|
|
16
|
+
- Update servicenow-report to add validity rows management
|
|
17
|
+
|
|
7
18
|
## [6.8.1] 2025-10-22
|
|
8
19
|
|
|
9
20
|
- Update Metadata List to use v65 one
|
|
@@ -60,8 +60,8 @@ jobs:
|
|
|
60
60
|
SFDX_CLIENT_ID_MAIN: ${{ secrets.SFDX_CLIENT_ID_MAIN}}
|
|
61
61
|
SFDX_CLIENT_KEY_MAIN: ${{ secrets.SFDX_CLIENT_KEY_MAIN}}
|
|
62
62
|
SFDX_AUTH_URL_TECHNICAL_ORG: ${{ SFDX_AUTH_URL_TECHNICAL_ORG }}
|
|
63
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
64
|
-
SFDX_TEST_WAIT_MINUTES:
|
|
63
|
+
SFDX_DEPLOY_WAIT_MINUTES: ${{ vars.SFDX_DEPLOY_WAIT_MINUTES || '120' }}
|
|
64
|
+
SFDX_TEST_WAIT_MINUTES: ${{ vars.SFDX_TEST_WAIT_MINUTES || '120' }}
|
|
65
65
|
CI_COMMIT_REF_NAME: ${{ github.event.pull_request.base.ref }} # Defines the target branch of the PR
|
|
66
66
|
ORG_ALIAS: ${{ github.event.pull_request.base.ref }} # Defines the target branch of the PR
|
|
67
67
|
CONFIG_BRANCH: ${{ github.event.pull_request.base.ref }} # Defines the target branch of the PR
|
|
@@ -59,8 +59,8 @@ jobs:
|
|
|
59
59
|
SFDX_CLIENT_ID_MAIN: ${{ secrets.SFDX_CLIENT_ID_MAIN}}
|
|
60
60
|
SFDX_CLIENT_KEY_MAIN: ${{ secrets.SFDX_CLIENT_KEY_MAIN}}
|
|
61
61
|
SFDX_AUTH_URL_TECHNICAL_ORG: ${{ secrets.SFDX_AUTH_URL_TECHNICAL_ORG }}
|
|
62
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
63
|
-
SFDX_TEST_WAIT_MINUTES:
|
|
62
|
+
SFDX_DEPLOY_WAIT_MINUTES: ${{ vars.SFDX_DEPLOY_WAIT_MINUTES || '120' }}
|
|
63
|
+
SFDX_TEST_WAIT_MINUTES: ${{ vars.SFDX_TEST_WAIT_MINUTES || '120' }}
|
|
64
64
|
CI_COMMIT_REF_NAME: ${{ env.BRANCH }} # Defines the target branch of the PR
|
|
65
65
|
ORG_ALIAS: ${{ env.BRANCH }} # Defines the target branch of the PR
|
|
66
66
|
CONFIG_BRANCH: ${{ env.BRANCH }} # Defines the target branch of the PR
|
|
@@ -71,7 +71,7 @@ jobs:
|
|
|
71
71
|
CONFIG_BRANCH: $(BRANCH_NAME)
|
|
72
72
|
ORG_ALIAS: $(BRANCH_NAME)
|
|
73
73
|
CI: "true"
|
|
74
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
74
|
+
SFDX_DEPLOY_WAIT_MINUTES: $(SFDX_DEPLOY_WAIT_MINUTES)
|
|
75
75
|
SLACK_TOKEN: $(SLACK_TOKEN)
|
|
76
76
|
SLACK_CHANNEL_ID: $(SLACK_CHANNEL_ID)
|
|
77
77
|
NOTIF_EMAIL_ADDRESS: $(NOTIF_EMAIL_ADDRESS)
|
|
@@ -76,7 +76,7 @@ jobs:
|
|
|
76
76
|
JIRA_TOKEN: $(JIRA_TOKEN)
|
|
77
77
|
JIRA_PAT: $(JIRA_HOST)
|
|
78
78
|
JIRA_TICKET_REGEX: $(JIRA_TICKET_REGEX)
|
|
79
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
79
|
+
SFDX_DEPLOY_WAIT_MINUTES: $(SFDX_DEPLOY_WAIT_MINUTES)
|
|
80
80
|
SFDX_AUTH_URL_TECHNICAL_ORG: $(SFDX_AUTH_URL_TECHNICAL_ORG)
|
|
81
81
|
CI: "true"
|
|
82
82
|
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
|
|
@@ -81,8 +81,8 @@ jobs:
|
|
|
81
81
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX}}
|
|
82
82
|
SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
83
83
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
84
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
85
|
-
SFDX_TEST_WAIT_MINUTES:
|
|
84
|
+
SFDX_DEPLOY_WAIT_MINUTES: ${{ vars.SFDX_DEPLOY_WAIT_MINUTES || '120' }}
|
|
85
|
+
SFDX_TEST_WAIT_MINUTES: ${{ vars.SFDX_TEST_WAIT_MINUTES || '120' }}
|
|
86
86
|
CI_COMMIT_REF_NAME: ${{ matrix.branch }}
|
|
87
87
|
ORG_ALIAS: ${{ matrix.branch }}
|
|
88
88
|
CONFIG_BRANCH: ${{ matrix.branch }}
|
|
@@ -176,8 +176,8 @@ jobs:
|
|
|
176
176
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX}}
|
|
177
177
|
SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
178
178
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
179
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
180
|
-
SFDX_TEST_WAIT_MINUTES:
|
|
179
|
+
SFDX_DEPLOY_WAIT_MINUTES: ${{ vars.SFDX_DEPLOY_WAIT_MINUTES || '120' }}
|
|
180
|
+
SFDX_TEST_WAIT_MINUTES: ${{ vars.SFDX_TEST_WAIT_MINUTES || '120' }}
|
|
181
181
|
CI_COMMIT_REF_NAME: ${{ matrix.branch }}
|
|
182
182
|
ORG_ALIAS: ${{ matrix.branch }}
|
|
183
183
|
CONFIG_BRANCH: ${{ matrix.branch }}
|
|
@@ -317,9 +317,8 @@ jobs:
|
|
|
317
317
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__RECETTE_SANDBOX}}
|
|
318
318
|
SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_ID_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
319
319
|
SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX: ${{ secrets.SFDX_CLIENT_KEY_MONITORING_MYCLIENT__PREPROD_SANDBOX}}
|
|
320
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
321
|
-
SFDX_TEST_WAIT_MINUTES: 120 # Override if necessary
|
|
322
|
-
CI_COMMIT_REF_NAME: ${{ matrix.branch }}
|
|
320
|
+
SFDX_DEPLOY_WAIT_MINUTES: ${{ vars.SFDX_DEPLOY_WAIT_MINUTES || '120' }}
|
|
321
|
+
SFDX_TEST_WAIT_MINUTES: ${{ vars.SFDX_TEST_WAIT_MINUTES || '120' }} # Override if necessary CI_COMMIT_REF_NAME: ${{ matrix.branch }}
|
|
323
322
|
ORG_ALIAS: ${{ matrix.branch }}
|
|
324
323
|
CONFIG_BRANCH: ${{ matrix.branch }}
|
|
325
324
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
@@ -14,6 +14,7 @@ export default class ServiceNowReport extends SfCommand<any> {
|
|
|
14
14
|
protected outputFilesRes: any;
|
|
15
15
|
protected userStories: any[];
|
|
16
16
|
protected results: any[];
|
|
17
|
+
protected invalidResults: any[];
|
|
17
18
|
protected conn: Connection;
|
|
18
19
|
protected userStoriesConfig: any;
|
|
19
20
|
protected serviceNowConfig: any;
|
|
@@ -115,6 +115,7 @@ Example:
|
|
|
115
115
|
outputFilesRes = {};
|
|
116
116
|
userStories = [];
|
|
117
117
|
results = [];
|
|
118
|
+
invalidResults = [];
|
|
118
119
|
conn;
|
|
119
120
|
userStoriesConfig = {
|
|
120
121
|
fields: [
|
|
@@ -287,7 +288,8 @@ Example:
|
|
|
287
288
|
this.results = this.userStories.map((userStory) => {
|
|
288
289
|
const serviceNowInfo = userStory.serviceNowInfo || {};
|
|
289
290
|
// Build result object dynamically based on config
|
|
290
|
-
|
|
291
|
+
let result = {};
|
|
292
|
+
const invalidFields = [];
|
|
291
293
|
for (const field of this.userStoriesConfig.reportFields) {
|
|
292
294
|
if (field.special === "serviceNowTicketUrl") {
|
|
293
295
|
if (!serviceNowInfo.sys_id) {
|
|
@@ -302,21 +304,57 @@ Example:
|
|
|
302
304
|
const value = field.path.split('.').reduce((obj, prop) => obj && obj[prop], { ...userStory, serviceNowInfo });
|
|
303
305
|
result[field.key] = value !== undefined && value !== null ? value : (field.default ?? 'NOT FOUND');
|
|
304
306
|
}
|
|
307
|
+
// Check field validity
|
|
308
|
+
let isValueValid = true;
|
|
309
|
+
// Use a safe hasOwnProperty check to avoid calling Object.prototype methods on the target object.
|
|
310
|
+
if (Object.prototype.hasOwnProperty.call(field, 'valid')) {
|
|
311
|
+
const fieldValue = result[field.key];
|
|
312
|
+
if (field.valid === "NOT NULL") {
|
|
313
|
+
isValueValid = fieldValue !== null && fieldValue !== 'NOT FOUND';
|
|
314
|
+
}
|
|
315
|
+
else {
|
|
316
|
+
isValueValid = fieldValue === field.valid;
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
// If any field is invalid for this result, mark the result as invalid
|
|
320
|
+
if (!isValueValid) {
|
|
321
|
+
invalidFields.push(field.key);
|
|
322
|
+
}
|
|
305
323
|
}
|
|
324
|
+
const isValid = invalidFields.length === 0 ? true : false;
|
|
325
|
+
const invalidFieldsStr = invalidFields.join(", ");
|
|
326
|
+
result = Object.assign({ "Is Valid": isValid, "Invalid Fields": invalidFieldsStr }, result);
|
|
306
327
|
return result;
|
|
307
328
|
});
|
|
308
329
|
uxLog("action", this, c.cyan(`Final results built with ${this.results.length} records.`));
|
|
309
330
|
uxLogTable(this, this.results);
|
|
331
|
+
// Check results validity
|
|
332
|
+
this.invalidResults = this.results.filter((res) => {
|
|
333
|
+
return res["Is Valid"] === false;
|
|
334
|
+
});
|
|
335
|
+
uxLog("action", this, c.cyan(`${this.invalidResults.length} invalid results found.`));
|
|
336
|
+
if (this.invalidResults.length > 0) {
|
|
337
|
+
uxLog("warning", this, c.yellow(`Listing invalid results below.`));
|
|
338
|
+
uxLogTable(this, this.invalidResults);
|
|
339
|
+
process.exitCode = 1;
|
|
340
|
+
}
|
|
310
341
|
// Process result
|
|
311
342
|
if (this.results.length > 0) {
|
|
312
343
|
// Generate output CSV file
|
|
313
344
|
this.outputFile = await generateReportPath('service-now-report', this.outputFile);
|
|
314
345
|
this.outputFilesRes = await generateCsvFile(this.results, this.outputFile, { fileTitle: 'ServiceNow cross-report' });
|
|
346
|
+
if (this.invalidResults.length > 0) {
|
|
347
|
+
const invalidOutputFile = this.outputFile.replace('.csv', '-invalid.csv');
|
|
348
|
+
await generateCsvFile(this.invalidResults, invalidOutputFile, { fileTitle: 'ServiceNow cross-report - Invalid Entries' });
|
|
349
|
+
}
|
|
315
350
|
// Build notification
|
|
316
351
|
const orgMarkdown = await getOrgMarkdown(this.conn?.instanceUrl);
|
|
317
352
|
const notifButtons = await getNotificationButtons();
|
|
318
353
|
const notifSeverity = 'warning';
|
|
319
|
-
|
|
354
|
+
let notifText = `${this.results.length} ServiceNow report lines have been extracted from ${orgMarkdown}`;
|
|
355
|
+
if (this.invalidResults.length > 0) {
|
|
356
|
+
notifText += `, including ${this.invalidResults.length} invalid entries`;
|
|
357
|
+
}
|
|
320
358
|
// Post notif
|
|
321
359
|
await setConnectionVariables(this.conn); // Required for some notifications providers like Email
|
|
322
360
|
await NotifProvider.postNotifications({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"servicenow-report.js","sourceRoot":"","sources":["../../../../src/commands/hardis/misc/servicenow-report.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"servicenow-report.js","sourceRoot":"","sources":["../../../../src/commands/hardis/misc/servicenow-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import fs from 'fs-extra';
|
|
|
5
5
|
import * as path from 'path';
|
|
6
6
|
import { execCommand, extractRegexMatchesMultipleGroups, uxLog } from '../../../../common/utils/index.js';
|
|
7
7
|
import { getNotificationButtons, getOrgMarkdown } from '../../../../common/utils/notifUtils.js';
|
|
8
|
-
import { CONSTANTS, getConfig, getReportDirectory } from '../../../../config/index.js';
|
|
8
|
+
import { CONSTANTS, getConfig, getEnvVar, getReportDirectory } from '../../../../config/index.js';
|
|
9
9
|
import { NotifProvider } from '../../../../common/notifProvider/index.js';
|
|
10
10
|
import { generateApexCoverageOutputFile } from '../../../../common/utils/deployUtils.js';
|
|
11
11
|
import { setConnectionVariables } from '../../../../common/utils/orgUtils.js';
|
|
@@ -20,7 +20,7 @@ If following configuration is defined, it will fail if apex coverage target is n
|
|
|
20
20
|
- Env \`APEX_TESTS_MIN_COVERAGE_ORG_WIDE\` or \`.sfdx-hardis\` property \`apexTestsMinCoverageOrgWide\`
|
|
21
21
|
- Env \`APEX_TESTS_MIN_COVERAGE_ORG_WIDE\` or \`.sfdx-hardis\` property \`apexTestsMinCoverageOrgWide\`
|
|
22
22
|
|
|
23
|
-
You can override env var SFDX_TEST_WAIT_MINUTES to wait more than
|
|
23
|
+
You can override env var SFDX_TEST_WAIT_MINUTES to wait more than 120 minutes.
|
|
24
24
|
|
|
25
25
|
This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/salesforce-monitoring-apex-tests/) and can output Grafana, Slack and MsTeams Notifications.
|
|
26
26
|
`;
|
|
@@ -127,7 +127,7 @@ This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/sales
|
|
|
127
127
|
' --code-coverage' +
|
|
128
128
|
' --result-format human' +
|
|
129
129
|
` --output-dir ${reportDir}` +
|
|
130
|
-
` --wait ${
|
|
130
|
+
` --wait ${getEnvVar("SFDX_TEST_WAIT_MINUTES") || '60'}` +
|
|
131
131
|
` --test-level ${testlevel}` +
|
|
132
132
|
(orgUsername ? ` --target-org ${orgUsername}` : '') +
|
|
133
133
|
(debugMode ? ' --verbose' : '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apex.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/test/apex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,iCAAiC,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1G,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"apex.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/test/apex.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { SfCommand, Flags, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import { Messages } from '@salesforce/core';
|
|
4
4
|
import { CONSTANTS } from '../../../../config/index.js';
|
|
5
|
-
import { buildCheckDeployCommitSummary, handlePostDeploymentNotifications } from '../../../../common/utils/gitUtils.js';
|
|
5
|
+
import { buildCheckDeployCommitSummary, handlePostDeploymentNotifications, setPullRequestData } from '../../../../common/utils/gitUtils.js';
|
|
6
6
|
import { GitProvider } from '../../../../common/gitProvider/index.js';
|
|
7
7
|
import c from "chalk";
|
|
8
8
|
import { uxLog } from '../../../../common/utils/index.js';
|
|
@@ -144,7 +144,7 @@ You can also use [sfdx-hardis wrapper commands of SF deployment commands](${CONS
|
|
|
144
144
|
deployErrorsMarkdownBody: this.message,
|
|
145
145
|
status: this.deployStatus === "valid" ? "valid" : this.deployStatus === "invalid" ? "invalid" : "tovalidate",
|
|
146
146
|
};
|
|
147
|
-
|
|
147
|
+
setPullRequestData(prData);
|
|
148
148
|
// Post comments 😊
|
|
149
149
|
await GitProvider.managePostPullRequestComment();
|
|
150
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notify.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/notify.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;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"notify.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/notify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/* jscpd:ignore-start */
|
|
2
2
|
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import { wrapSfdxCoreCommand } from "../../../../common/utils/wrapUtils.js";
|
|
4
|
-
import { checkDeploymentOrgCoverage,
|
|
4
|
+
import { checkDeploymentOrgCoverage, extractOrgCoverageFromLog } from '../../../../common/utils/deployUtils.js';
|
|
5
5
|
import { GitProvider } from '../../../../common/gitProvider/index.js';
|
|
6
6
|
import { handlePostDeploymentNotifications } from '../../../../common/utils/gitUtils.js';
|
|
7
7
|
import { setConnectionVariables } from '../../../../common/utils/orgUtils.js';
|
|
8
|
+
import { executePrePostCommands } from '../../../../common/utils/prePostCommandUtils.js';
|
|
8
9
|
export default class ProjectDeployStart extends SfCommand {
|
|
9
10
|
static description = `sfdx-hardis wrapper for **sf project deploy quick** that displays tips to solve deployment errors.
|
|
10
11
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/quick.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/quick.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/* jscpd:ignore-start */
|
|
2
2
|
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import { wrapSfdxCoreCommand } from "../../../../common/utils/wrapUtils.js";
|
|
4
|
-
import { checkDeploymentOrgCoverage,
|
|
4
|
+
import { checkDeploymentOrgCoverage, extractOrgCoverageFromLog } from '../../../../common/utils/deployUtils.js';
|
|
5
5
|
import { GitProvider } from '../../../../common/gitProvider/index.js';
|
|
6
6
|
import { buildCheckDeployCommitSummary, handlePostDeploymentNotifications } from '../../../../common/utils/gitUtils.js';
|
|
7
7
|
import { setConnectionVariables } from '../../../../common/utils/orgUtils.js';
|
|
8
|
+
import { executePrePostCommands } from '../../../../common/utils/prePostCommandUtils.js';
|
|
8
9
|
export default class ProjectDeployStart extends SfCommand {
|
|
9
10
|
static description = `sfdx-hardis wrapper for **sf project deploy start** that displays tips to solve deployment errors.
|
|
10
11
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/start.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/* jscpd:ignore-start */
|
|
2
2
|
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import { wrapSfdxCoreCommand } from "../../../../common/utils/wrapUtils.js";
|
|
4
|
-
import { checkDeploymentOrgCoverage,
|
|
4
|
+
import { checkDeploymentOrgCoverage, extractOrgCoverageFromLog } from '../../../../common/utils/deployUtils.js';
|
|
5
5
|
import { GitProvider } from '../../../../common/gitProvider/index.js';
|
|
6
6
|
import { buildCheckDeployCommitSummary } from '../../../../common/utils/gitUtils.js';
|
|
7
7
|
import { setConnectionVariables } from '../../../../common/utils/orgUtils.js';
|
|
8
|
+
import { executePrePostCommands } from '../../../../common/utils/prePostCommandUtils.js';
|
|
8
9
|
export default class ProjectDeployValidate extends SfCommand {
|
|
9
10
|
static description = `sfdx-hardis wrapper for **sf project deploy validate** that displays tips to solve deployment errors.
|
|
10
11
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/validate.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/deploy/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
import { SfCommand, Flags, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
|
|
3
3
|
import c from 'chalk';
|
|
4
4
|
import { GitProvider } from '../../../common/gitProvider/index.js';
|
|
5
|
-
import { checkDeploymentOrgCoverage,
|
|
5
|
+
import { checkDeploymentOrgCoverage, extractOrgCoverageFromLog, } from '../../../common/utils/deployUtils.js';
|
|
6
6
|
import { wrapSfdxCoreCommand } from '../../../common/utils/wrapUtils.js';
|
|
7
7
|
import { uxLog } from '../../../common/utils/index.js';
|
|
8
8
|
import { CONSTANTS } from '../../../config/index.js';
|
|
9
|
+
import { executePrePostCommands } from '../../../common/utils/prePostCommandUtils.js';
|
|
9
10
|
// Wrapper for sfdx force:source:deploy
|
|
10
11
|
export class Deploy extends SfCommand {
|
|
11
12
|
static description = `sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/commands/hardis/source/deploy.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAEhG,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/commands/hardis/source/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ export declare class AzureDevopsProvider extends GitProviderRoot {
|
|
|
24
24
|
getBranchDeploymentCheckId(gitBranch: string): Promise<string | null>;
|
|
25
25
|
getPullRequestDeploymentCheckId(): Promise<string | null>;
|
|
26
26
|
private getDeploymentIdFromPullRequest;
|
|
27
|
+
listPullRequestsInBranchSinceLastMerge(currentBranchName: string, targetBranchName: string, childBranchesNames: string[]): Promise<CommonPullRequestInfo[]>;
|
|
27
28
|
postPullRequestMessage(prMessage: PullRequestMessageRequest): Promise<PullRequestMessageResult>;
|
|
28
29
|
private pullRequestStatusToAzureThreadStatus;
|
|
29
30
|
private completePullRequestInfo;
|
|
@@ -280,6 +280,73 @@ ${this.getPipelineVariablesConfig()}
|
|
|
280
280
|
}
|
|
281
281
|
return deploymentCheckId;
|
|
282
282
|
}
|
|
283
|
+
async listPullRequestsInBranchSinceLastMerge(currentBranchName, targetBranchName, childBranchesNames) {
|
|
284
|
+
if (!this.azureApi || !process.env.SYSTEM_TEAMPROJECT || !process.env.BUILD_REPOSITORY_ID) {
|
|
285
|
+
return [];
|
|
286
|
+
}
|
|
287
|
+
try {
|
|
288
|
+
const gitApi = await this.azureApi.getGitApi();
|
|
289
|
+
// Step 1: Find the last completed PR from currentBranch to targetBranch
|
|
290
|
+
const lastMergePRs = await gitApi.getPullRequests(process.env.BUILD_REPOSITORY_ID, {
|
|
291
|
+
sourceRefName: `refs/heads/${currentBranchName}`,
|
|
292
|
+
targetRefName: `refs/heads/${targetBranchName}`,
|
|
293
|
+
status: PullRequestStatus.Completed,
|
|
294
|
+
}, process.env.SYSTEM_TEAMPROJECT);
|
|
295
|
+
const lastMergeToTarget = lastMergePRs && lastMergePRs.length > 0 ? lastMergePRs[0] : null;
|
|
296
|
+
// Step 2: Get commits between branches
|
|
297
|
+
const gitApiCommits = await gitApi.getCommitsBatch({
|
|
298
|
+
itemVersion: {
|
|
299
|
+
version: currentBranchName,
|
|
300
|
+
versionType: 0, // branch
|
|
301
|
+
},
|
|
302
|
+
compareVersion: {
|
|
303
|
+
version: lastMergeToTarget
|
|
304
|
+
? lastMergeToTarget.lastMergeSourceCommit?.commitId
|
|
305
|
+
: targetBranchName,
|
|
306
|
+
versionType: lastMergeToTarget ? 2 : 0, // commit or branch
|
|
307
|
+
},
|
|
308
|
+
}, process.env.BUILD_REPOSITORY_ID, process.env.SYSTEM_TEAMPROJECT);
|
|
309
|
+
if (!gitApiCommits || gitApiCommits.length === 0) {
|
|
310
|
+
return [];
|
|
311
|
+
}
|
|
312
|
+
const commitIds = new Set(gitApiCommits.map((c) => c.commitId));
|
|
313
|
+
// Step 3: Get all completed PRs targeting currentBranch and child branches (parallelized)
|
|
314
|
+
const allBranches = [currentBranchName, ...childBranchesNames];
|
|
315
|
+
const prPromises = allBranches.map(async (branchName) => {
|
|
316
|
+
try {
|
|
317
|
+
const prs = await gitApi.getPullRequests(process.env.BUILD_REPOSITORY_ID, {
|
|
318
|
+
targetRefName: `refs/heads/${branchName}`,
|
|
319
|
+
status: PullRequestStatus.Completed,
|
|
320
|
+
}, process.env.SYSTEM_TEAMPROJECT);
|
|
321
|
+
return prs || [];
|
|
322
|
+
}
|
|
323
|
+
catch (err) {
|
|
324
|
+
uxLog("warning", this, c.yellow(`Error fetching completed PRs for branch ${branchName}: ${String(err)}`));
|
|
325
|
+
return [];
|
|
326
|
+
}
|
|
327
|
+
});
|
|
328
|
+
const prResults = await Promise.all(prPromises);
|
|
329
|
+
const allMergedPRs = prResults.flat();
|
|
330
|
+
// Step 4: Filter PRs whose merge commit is in our commit list
|
|
331
|
+
const relevantPRs = allMergedPRs.filter((pr) => {
|
|
332
|
+
const mergeCommitId = pr.lastMergeSourceCommit?.commitId;
|
|
333
|
+
return mergeCommitId && commitIds.has(mergeCommitId);
|
|
334
|
+
});
|
|
335
|
+
// Step 5: Remove duplicates
|
|
336
|
+
const uniquePRsMap = new Map();
|
|
337
|
+
for (const pr of relevantPRs) {
|
|
338
|
+
if (!uniquePRsMap.has(pr.pullRequestId)) {
|
|
339
|
+
uniquePRsMap.set(pr.pullRequestId, pr);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
// Step 6: Convert to CommonPullRequestInfo
|
|
343
|
+
return Array.from(uniquePRsMap.values()).map((pr) => this.completePullRequestInfo(pr));
|
|
344
|
+
}
|
|
345
|
+
catch (err) {
|
|
346
|
+
uxLog("warning", this, c.yellow(`Error in listPullRequestsInBranchSinceLastMerge: ${String(err)}`));
|
|
347
|
+
return [];
|
|
348
|
+
}
|
|
349
|
+
}
|
|
283
350
|
// Posts a note on the merge request
|
|
284
351
|
async postPullRequestMessage(prMessage) {
|
|
285
352
|
// Get CI variables
|
|
@@ -392,7 +459,7 @@ _Powered by [sfdx-hardis](${CONSTANTS.DOC_URL_ROOT}) from job [${azureJobName}](
|
|
|
392
459
|
}
|
|
393
460
|
getPipelineVariablesConfig() {
|
|
394
461
|
return `
|
|
395
|
-
SFDX_DEPLOY_WAIT_MINUTES:
|
|
462
|
+
SFDX_DEPLOY_WAIT_MINUTES: $(SFDX_DEPLOY_WAIT_MINUTES)
|
|
396
463
|
CI_COMMIT_REF_NAME: $(BRANCH_NAME)
|
|
397
464
|
CONFIG_BRANCH: $(BRANCH_NAME)
|
|
398
465
|
ORG_ALIAS: $(BRANCH_NAME)
|