sfdx-hardis 6.9.0 → 6.9.1-alpha202510260151.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 +6 -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/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/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 +20 -66
- 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 +31 -0
- package/lib/common/utils/prePostCommandUtils.js +353 -0
- package/lib/common/utils/prePostCommandUtils.js.map +1 -0
- package/oclif.lock +938 -918
- package/oclif.manifest.json +429 -429
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,12 @@
|
|
|
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
|
+
|
|
7
13
|
## [6.9.0] 2025-10-23
|
|
8
14
|
|
|
9
15
|
- Bring back Microsoft Teams notifications [using Teams Workflow](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-ms-teams/)
|
|
@@ -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 }}
|
|
@@ -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)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDevops.js","sourceRoot":"","sources":["../../../src/common/gitProvider/azureDevops.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"azureDevops.js","sourceRoot":"","sources":["../../../src/common/gitProvider/azureDevops.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare class BitbucketProvider extends GitProviderRoot {
|
|
|
13
13
|
getBranchDeploymentCheckId(gitBranch: string): Promise<string | null>;
|
|
14
14
|
getPullRequestDeploymentCheckId(): Promise<string | null>;
|
|
15
15
|
private getDeploymentIdFromPullRequest;
|
|
16
|
+
listPullRequestsInBranchSinceLastMerge(currentBranchName: string, targetBranchName: string, childBranchesNames: string[]): Promise<CommonPullRequestInfo[]>;
|
|
16
17
|
postPullRequestMessage(prMessage: PullRequestMessageRequest): Promise<PullRequestMessageResult>;
|
|
17
18
|
private completePullRequestInfo;
|
|
18
19
|
uploadImage(localImagePath: string): Promise<string | null>;
|