@marsson/ciutils 0.0.7 → 0.0.11
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/README.md +11 -2
- package/lib/commands/remove/assignments.d.ts +1 -1
- package/lib/commands/reporton/deployment.d.ts +1 -2
- package/lib/commands/reporton/deployment.js +17 -32
- package/lib/commands/reporton/deployment.js.map +1 -1
- package/lib/utils/Utils.js +19 -14
- package/lib/utils/Utils.js.map +1 -1
- package/oclif.lock +4413 -2826
- package/oclif.manifest.json +113 -49
- package/package.json +12 -18
package/README.md
CHANGED
|
@@ -119,7 +119,8 @@ Summary of a command.
|
|
|
119
119
|
|
|
120
120
|
```
|
|
121
121
|
USAGE
|
|
122
|
-
$ sf remove assignments -b PermissionSet|PermissionSetGroup|Group -u <value> -o <value> [-
|
|
122
|
+
$ sf remove assignments -b PermissionSet|PermissionSetGroup|Group -u <value> -o <value> [--json] [--flags-dir <value>]
|
|
123
|
+
[-n <value>]
|
|
123
124
|
|
|
124
125
|
FLAGS
|
|
125
126
|
-b, --object=<option>... (required) The object for which the assignment will be removed.
|
|
@@ -130,6 +131,10 @@ FLAGS
|
|
|
130
131
|
-u, --usernames=<value>... (required) The list of usernames to be unassigned from the selected object. If in a
|
|
131
132
|
sandbox, the script will look for "usename" and "username".sandbox for unassignment.
|
|
132
133
|
|
|
134
|
+
GLOBAL FLAGS
|
|
135
|
+
--flags-dir=<value> Import flag values from a directory.
|
|
136
|
+
--json Format output as json.
|
|
137
|
+
|
|
133
138
|
DESCRIPTION
|
|
134
139
|
Summary of a command.
|
|
135
140
|
|
|
@@ -150,7 +155,7 @@ Summary of a command.
|
|
|
150
155
|
|
|
151
156
|
```
|
|
152
157
|
USAGE
|
|
153
|
-
$ sf reporton deployment -o <value> -d <value> [-a]
|
|
158
|
+
$ sf reporton deployment -o <value> -d <value> [--json] [--flags-dir <value>] [-a]
|
|
154
159
|
|
|
155
160
|
FLAGS
|
|
156
161
|
-a, --awaitcompletion If the aplication should respond every 30 sec until the deployment is complete.
|
|
@@ -158,6 +163,10 @@ FLAGS
|
|
|
158
163
|
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
159
164
|
configuration variable is already set.
|
|
160
165
|
|
|
166
|
+
GLOBAL FLAGS
|
|
167
|
+
--flags-dir=<value> Import flag values from a directory.
|
|
168
|
+
--json Format output as json.
|
|
169
|
+
|
|
161
170
|
DESCRIPTION
|
|
162
171
|
Summary of a command.
|
|
163
172
|
|
|
@@ -8,7 +8,7 @@ export default class RemoveAssignments extends SfCommand<RemoveAssignmentsResult
|
|
|
8
8
|
static readonly examples: string[];
|
|
9
9
|
static readonly flags: {
|
|
10
10
|
name: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
11
|
-
object: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<("
|
|
11
|
+
object: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<("PermissionSet" | "Group" | "PermissionSetGroup")[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
12
12
|
usernames: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
13
13
|
'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
|
|
14
14
|
};
|
|
@@ -12,8 +12,7 @@ export default class ReportonDeployment extends SfCommand<ReportonDeploymentResu
|
|
|
12
12
|
};
|
|
13
13
|
private connection;
|
|
14
14
|
private deploymentStatus;
|
|
15
|
-
private
|
|
16
|
-
private isRunningTest;
|
|
15
|
+
private multiBar;
|
|
17
16
|
private isComplete;
|
|
18
17
|
run(): Promise<ReportonDeploymentResult>;
|
|
19
18
|
private awaitDeploymentCompletion;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { SfCommand, Flags
|
|
1
|
+
import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
2
2
|
import { Messages } from '@salesforce/core';
|
|
3
3
|
import Table from 'cli-table3';
|
|
4
|
+
import { MultiBar } from 'cli-progress';
|
|
4
5
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
5
6
|
const messages = Messages.loadMessages('@marsson/ciutils', 'reporton.deployment');
|
|
6
7
|
export default class ReportonDeployment extends SfCommand {
|
|
@@ -23,8 +24,15 @@ export default class ReportonDeployment extends SfCommand {
|
|
|
23
24
|
};
|
|
24
25
|
connection;
|
|
25
26
|
deploymentStatus;
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
multiBar = new MultiBar({
|
|
28
|
+
format: 'Deployment Progress | {bar} | {percentage}% || {value}/{total} {filename}}',
|
|
29
|
+
barCompleteChar: '\u2588',
|
|
30
|
+
barIncompleteChar: '\u2591',
|
|
31
|
+
hideCursor: true,
|
|
32
|
+
noTTYOutput: true,
|
|
33
|
+
notTTYSchedule: 10000,
|
|
34
|
+
emptyOnZero: true,
|
|
35
|
+
});
|
|
28
36
|
isComplete = false;
|
|
29
37
|
async run() {
|
|
30
38
|
const { flags } = await this.parse(ReportonDeployment);
|
|
@@ -33,7 +41,6 @@ export default class ReportonDeployment extends SfCommand {
|
|
|
33
41
|
this.displayHeader(deploymentId);
|
|
34
42
|
await this.updateDeployResult(deploymentId);
|
|
35
43
|
// Correctly initializing the progress bars with the total expected count
|
|
36
|
-
this.progressBar.start(this.deploymentStatus.numberComponentsTotal);
|
|
37
44
|
// Updating the progress bars with the current progress
|
|
38
45
|
if (flags.awaitcompletion) {
|
|
39
46
|
await this.awaitDeploymentCompletion(deploymentId);
|
|
@@ -56,8 +63,6 @@ export default class ReportonDeployment extends SfCommand {
|
|
|
56
63
|
await new Promise((resolve) => setTimeout(resolve, 5000)); // Wait for 5 seconds
|
|
57
64
|
}
|
|
58
65
|
} while (!this.isComplete);
|
|
59
|
-
// Ensure progress bars are properly concluded outside the loop
|
|
60
|
-
this.progressBar.finish();
|
|
61
66
|
}
|
|
62
67
|
/* eslint-enable no-await-in-loop */
|
|
63
68
|
async updateDeployResult(deploymentid) {
|
|
@@ -71,32 +76,12 @@ export default class ReportonDeployment extends SfCommand {
|
|
|
71
76
|
}
|
|
72
77
|
updateProgressBars() {
|
|
73
78
|
// Ensure progress bars are updated only if deploymentStatus has been fetched
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
this.progressBar = new Progress(true);
|
|
81
|
-
this.progressBar.start(this.deploymentStatus.numberTestsTotal, {}, {
|
|
82
|
-
title: 'PROGRESS',
|
|
83
|
-
format: '%s | {bar} | {value}/{total} Test Methods',
|
|
84
|
-
barCompleteChar: '\u2588',
|
|
85
|
-
barIncompleteChar: '\u2591',
|
|
86
|
-
linewrap: true,
|
|
87
|
-
});
|
|
88
|
-
this.progressBar.update(this.deploymentStatus.numberTestsCompleted);
|
|
89
|
-
if (this.deploymentStatus.numberTestsCompleted === this.deploymentStatus.numberTestsTotal) {
|
|
90
|
-
this.progressBar.finish();
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
this.progressBar.update(this.deploymentStatus.numberTestsCompleted);
|
|
96
|
-
if (this.deploymentStatus.numberTestsCompleted === this.deploymentStatus.numberTestsTotal) {
|
|
97
|
-
this.progressBar.finish();
|
|
98
|
-
}
|
|
99
|
-
}
|
|
79
|
+
const b1 = this.multiBar.create(this.deploymentStatus.numberComponentsTotal, this.deploymentStatus.numberComponentsDeployed + this.deploymentStatus.numberComponentErrors, { filename: 'Components' });
|
|
80
|
+
const b2 = this.multiBar.create(this.deploymentStatus.numberTestsTotal, this.deploymentStatus.numberTestsCompleted + this.deploymentStatus.numberTestErrors, { filename: 'Test Methods' });
|
|
81
|
+
b1.setTotal(this.deploymentStatus.numberComponentsTotal);
|
|
82
|
+
b2.setTotal(this.deploymentStatus.numberTestsTotal);
|
|
83
|
+
b1.update(this.deploymentStatus.numberComponentsDeployed + this.deploymentStatus.numberComponentErrors);
|
|
84
|
+
b2.update(this.deploymentStatus.numberTestsCompleted + this.deploymentStatus.numberTestErrors);
|
|
100
85
|
}
|
|
101
86
|
// Example helper function that needs to use UX methods
|
|
102
87
|
displayHeader(header) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/commands/reporton/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/commands/reporton/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/Utils.js
CHANGED
|
@@ -95,7 +95,10 @@ class UnassignableObject {
|
|
|
95
95
|
}
|
|
96
96
|
class BatchDownloadHelper {
|
|
97
97
|
static fetchAllUsers(conn) {
|
|
98
|
-
const usersAndPermsetAssignments = this.bulkQuery(conn,
|
|
98
|
+
const usersAndPermsetAssignments = this.bulkQuery(conn, {
|
|
99
|
+
objectName: 'User',
|
|
100
|
+
query: 'SELECT Id, Username FROM User',
|
|
101
|
+
});
|
|
99
102
|
return usersAndPermsetAssignments;
|
|
100
103
|
// Use the fetched User IDs to then query for PermissionSetAssignments and GroupMembers using similar Bulk API calls or logic.
|
|
101
104
|
}
|
|
@@ -118,7 +121,7 @@ class BatchDownloadHelper {
|
|
|
118
121
|
objectName: 'PermissionSetAssignment',
|
|
119
122
|
query: 'SELECT Id,AssigneeId FROM PermissionSetAssignment WHERE PermissionSetGroupId != NULL',
|
|
120
123
|
});
|
|
121
|
-
const queryPromises = queries.map((q) => this.bulkQuery(conn, q
|
|
124
|
+
const queryPromises = queries.map((q) => this.bulkQuery(conn, q));
|
|
122
125
|
const results = await Promise.all(queryPromises);
|
|
123
126
|
response.users = results[0];
|
|
124
127
|
response.groupmembers = results[1];
|
|
@@ -150,7 +153,7 @@ class BatchDownloadHelper {
|
|
|
150
153
|
// Handling the async operation with proper event listeners
|
|
151
154
|
return new Promise((resolve, reject) => {
|
|
152
155
|
void batch.on('queue', () => {
|
|
153
|
-
batch.poll(1000,
|
|
156
|
+
batch.poll(1000, 60_000); // Poll every 1 second, timeout after 1 minute
|
|
154
157
|
});
|
|
155
158
|
void batch.on('response', (result) => {
|
|
156
159
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
@@ -178,18 +181,20 @@ class BatchDownloadHelper {
|
|
|
178
181
|
}
|
|
179
182
|
}
|
|
180
183
|
static async bulkQuery(conn, query) {
|
|
184
|
+
const job = conn.bulk.createJob(query.objectName, 'query');
|
|
185
|
+
const batch = job.createBatch();
|
|
186
|
+
void batch.execute(query.query);
|
|
187
|
+
// Handling the async operation with proper event listeners
|
|
181
188
|
return new Promise((resolve, reject) => {
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
.on('error', (err) => {
|
|
192
|
-
reject(err); // Reject the promise on error
|
|
189
|
+
void batch.on('queue', () => {
|
|
190
|
+
batch.poll(1000, 60_000); // Poll every 1 second, timeout after 1 minute
|
|
191
|
+
});
|
|
192
|
+
void batch.on('response', (result) => {
|
|
193
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
194
|
+
resolve(result);
|
|
195
|
+
});
|
|
196
|
+
void batch.on('error', (error) => {
|
|
197
|
+
reject(error);
|
|
193
198
|
});
|
|
194
199
|
});
|
|
195
200
|
}
|
package/lib/utils/Utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":"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"}
|