sfdx-hardis 4.38.0 → 4.38.2
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 +9 -0
- package/defaults/monitoring/.github/workflows/org-monitoring.yml +12 -12
- package/lib/commands/hardis/org/monitor/backup.js +13 -1
- package/lib/commands/hardis/org/monitor/backup.js.map +1 -1
- package/lib/common/notifProvider/apiProvider.js +4 -1
- package/lib/common/notifProvider/apiProvider.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,15 @@
|
|
|
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
|
+
## [4.38.2] 2024-06-06
|
|
8
|
+
|
|
9
|
+
- Fix npm packages installation for GitHub monitoring to avoid random failures
|
|
10
|
+
- Add _notifKey in Grafana notifications to be able to build unique alerts
|
|
11
|
+
|
|
12
|
+
## [4.38.1] 2024-06-04
|
|
13
|
+
|
|
14
|
+
- Add installed packages in monitoring backup logs
|
|
15
|
+
|
|
7
16
|
## [4.38.0] 2024-06-03
|
|
8
17
|
|
|
9
18
|
- New command **hardis:org:diagnose:licenses** to send used licenses to monitoring logs like Grafana
|
|
@@ -68,10 +68,10 @@ jobs:
|
|
|
68
68
|
- name: Install SFDX and plugins
|
|
69
69
|
run: |
|
|
70
70
|
npm install --no-cache @salesforce/cli --global
|
|
71
|
-
sf plugins install @salesforce/plugin-packaging
|
|
72
|
-
echo 'y' | sfdx plugins:install sfdx-hardis
|
|
73
|
-
echo 'y' | sfdx plugins:install sfdx-essentials
|
|
74
|
-
echo 'y' | sfdx plugins:install sfdx-git-delta
|
|
71
|
+
sf plugins install --force @salesforce/plugin-packaging
|
|
72
|
+
echo 'y' | sfdx plugins:install --force sfdx-hardis
|
|
73
|
+
echo 'y' | sfdx plugins:install --force sfdx-essentials
|
|
74
|
+
echo 'y' | sfdx plugins:install --force sfdx-git-delta
|
|
75
75
|
sf version --verbose --json
|
|
76
76
|
# Login & check deploy with test classes & code coverage
|
|
77
77
|
- name: Login & Retrieve Metadata
|
|
@@ -156,10 +156,10 @@ jobs:
|
|
|
156
156
|
- name: Install SFDX and plugins
|
|
157
157
|
run: |
|
|
158
158
|
npm install --no-cache @salesforce/cli --global
|
|
159
|
-
sf plugins install @salesforce/plugin-packaging
|
|
160
|
-
echo 'y' | sfdx plugins:install sfdx-hardis
|
|
161
|
-
echo 'y' | sfdx plugins:install sfdx-essentials
|
|
162
|
-
echo 'y' | sfdx plugins:install sfdx-git-delta
|
|
159
|
+
sf plugins install --force @salesforce/plugin-packaging
|
|
160
|
+
echo 'y' | sfdx plugins:install --force sfdx-hardis
|
|
161
|
+
echo 'y' | sfdx plugins:install --force sfdx-essentials
|
|
162
|
+
echo 'y' | sfdx plugins:install --force sfdx-git-delta
|
|
163
163
|
sf version --verbose --json
|
|
164
164
|
# Login & check deploy with test classes & code coverage
|
|
165
165
|
- name: Login & Run apex tests
|
|
@@ -282,10 +282,10 @@ jobs:
|
|
|
282
282
|
- name: Install SFDX and plugins
|
|
283
283
|
run: |
|
|
284
284
|
npm install --no-cache @salesforce/cli --global
|
|
285
|
-
sf plugins install @salesforce/plugin-packaging
|
|
286
|
-
echo 'y' | sfdx plugins:install sfdx-hardis
|
|
287
|
-
echo 'y' | sfdx plugins:install sfdx-essentials
|
|
288
|
-
echo 'y' | sfdx plugins:install sfdx-git-delta
|
|
285
|
+
sf plugins install --force @salesforce/plugin-packaging
|
|
286
|
+
echo 'y' | sfdx plugins:install --force sfdx-hardis
|
|
287
|
+
echo 'y' | sfdx plugins:install --force sfdx-essentials
|
|
288
|
+
echo 'y' | sfdx plugins:install --force sfdx-git-delta
|
|
289
289
|
sf version --verbose --json
|
|
290
290
|
# Login & check deploy with test classes & code coverage
|
|
291
291
|
- name: Login & Run monitoring checks
|
|
@@ -92,6 +92,7 @@ class MonitorBackup extends command_1.SfdxCommand {
|
|
|
92
92
|
}
|
|
93
93
|
// Write installed packages
|
|
94
94
|
utils_1.uxLog(this, c.cyan(`Write installed packages ...`));
|
|
95
|
+
const installedPackagesLog = [];
|
|
95
96
|
const packageFolder = path.join(process.cwd(), "installedPackages");
|
|
96
97
|
await fs.ensureDir(packageFolder);
|
|
97
98
|
for (const installedPackage of installedPackages) {
|
|
@@ -99,6 +100,14 @@ class MonitorBackup extends command_1.SfdxCommand {
|
|
|
99
100
|
const fileNameNoSep = fileName.replace(/\//g, "_"); // Handle case when package name contains slashes
|
|
100
101
|
delete installedPackage.Id; // Not needed for diffs
|
|
101
102
|
await fs.writeFile(path.join(packageFolder, fileNameNoSep), JSON.stringify(installedPackage, null, 2));
|
|
103
|
+
const installedPackageLog = {
|
|
104
|
+
SubscriberPackageName: installedPackage.SubscriberPackageName,
|
|
105
|
+
SubscriberPackageNamespace: installedPackage.SubscriberPackageNamespace,
|
|
106
|
+
SubscriberPackageVersionId: installedPackage.SubscriberPackageVersionId,
|
|
107
|
+
SubscriberPackageVersionName: installedPackage.SubscriberPackageVersionName,
|
|
108
|
+
SubscriberPackageVersionNumber: installedPackage.SubscriberPackageVersionNumber,
|
|
109
|
+
};
|
|
110
|
+
installedPackagesLog.push(installedPackageLog);
|
|
102
111
|
}
|
|
103
112
|
this.diffFiles = await metadata_utils_1.MetadataUtils.listChangedFiles();
|
|
104
113
|
// Write output file
|
|
@@ -155,7 +164,10 @@ class MonitorBackup extends command_1.SfdxCommand {
|
|
|
155
164
|
sideImage: "backup",
|
|
156
165
|
attachedFiles: this.outputFilesRes.xlsxFile ? [this.outputFilesRes.xlsxFile] : [],
|
|
157
166
|
logElements: this.diffFilesSimplified,
|
|
158
|
-
data: {
|
|
167
|
+
data: {
|
|
168
|
+
metric: this.diffFilesSimplified.length,
|
|
169
|
+
installedPackages: installedPackagesLog,
|
|
170
|
+
},
|
|
159
171
|
metrics: {
|
|
160
172
|
UpdatedMetadatas: this.diffFilesSimplified.length,
|
|
161
173
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/monitor/backup.ts"],"names":[],"mappings":";;AAAA,wBAAwB;AACxB,iDAAyD;AACzD,2CAA4C;AAE5C,2BAA2B;AAC3B,+BAA+B;AAC/B,6BAA6B;AAC7B,sEAAwE;AACxE,oDAAgF;AAChF,sEAAkE;AAClE,+CAA+C;AAC/C,oEAAgF;AAEhF,oEAA8G;AAC9G,oEAA0F;AAC1F,gEAA6F;AAE7F,wDAAwD;AACxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,iGAAiG;AACjG,mFAAmF;AACnF,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAqB,aAAc,SAAQ,qBAAW;IAAtD;;QA+CY,cAAS,GAAG,EAAE,CAAC;QACf,wBAAmB,GAAG,EAAE,CAAC;QAEzB,mBAAc,GAAQ,EAAE,CAAC;QACzB,cAAS,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/monitor/backup.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,10 +84,12 @@ class ApiProvider extends notifProviderRoot_1.NotifProviderRoot {
|
|
|
84
84
|
const repoName = (await utils_1.getGitRepoName()).replace(".git", "");
|
|
85
85
|
const currentGitBranch = await utils_1.getCurrentGitBranch();
|
|
86
86
|
const conn = globalThis.jsForceConn;
|
|
87
|
+
const orgIdentifier = conn.instanceUrl.replace("https://", "").replace(".my.salesforce.com", "").replace(/\./gm, "__");
|
|
88
|
+
const notifKey = orgIdentifier + "!!" + notifMessage.type;
|
|
87
89
|
this.payload = {
|
|
88
90
|
source: "sfdx-hardis",
|
|
89
91
|
type: notifMessage.type,
|
|
90
|
-
orgIdentifier:
|
|
92
|
+
orgIdentifier: orgIdentifier,
|
|
91
93
|
gitIdentifier: `${repoName}/${currentGitBranch}`,
|
|
92
94
|
severity: notifMessage.severity,
|
|
93
95
|
data: Object.assign(notifMessage.data, {
|
|
@@ -98,6 +100,7 @@ class ApiProvider extends notifProviderRoot_1.NotifProviderRoot {
|
|
|
98
100
|
_logElements: notifMessage.logElements,
|
|
99
101
|
_metrics: notifMessage.metrics,
|
|
100
102
|
_metricsKeys: Object.keys(notifMessage.metrics),
|
|
103
|
+
_notifKey: notifKey,
|
|
101
104
|
}),
|
|
102
105
|
};
|
|
103
106
|
// Add job url if available
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiProvider.js","sourceRoot":"","sources":["../../../src/common/notifProvider/apiProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"apiProvider.js","sourceRoot":"","sources":["../../../src/common/notifProvider/apiProvider.ts"],"names":[],"mappings":"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"}
|