@codiac.io/codiac-cli 1.3.275 → 1.3.277
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 +223 -199
- package/dist/commands/asset/edit.d.ts +2 -0
- package/dist/commands/asset/edit.js +27 -0
- package/dist/commands/asset/edit.js.map +1 -1
- package/dist/commands/pvc/create.d.ts +14 -0
- package/dist/commands/pvc/create.js +40 -0
- package/dist/commands/pvc/create.js.map +1 -1
- package/oclif.manifest.json +21 -1
- package/package.json +1 -1
|
@@ -16,6 +16,8 @@ export declare class AssetEdit extends CommandBaseExec<AssetUpdateRequest> {
|
|
|
16
16
|
name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
17
17
|
code: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
18
18
|
registry: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
19
|
+
"pod-filter": import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
20
|
+
"remove-pod-filter": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
19
21
|
"deploy-condition": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
20
22
|
"deploy-condition-because": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
21
23
|
"remove-deploy-condition": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -16,6 +16,7 @@ class AssetEdit extends command_base_exec_1.CommandBaseExec {
|
|
|
16
16
|
return this.uiAsset_backer;
|
|
17
17
|
}
|
|
18
18
|
captureArgs() {
|
|
19
|
+
var _a;
|
|
19
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
21
|
const { args, flags } = yield this.parse(AssetEdit);
|
|
21
22
|
let partial = {};
|
|
@@ -33,6 +34,24 @@ class AssetEdit extends command_base_exec_1.CommandBaseExec {
|
|
|
33
34
|
partial.regInput = { code: flags.registry };
|
|
34
35
|
this._requestedRegistryCode = flags.registry;
|
|
35
36
|
}
|
|
37
|
+
// Each --pod-filter is one podSpec: a comma-separated set of key=value labels, ANDed.
|
|
38
|
+
// podSpecName is positional (`pods`, `pods-2`, ...) — it only has to be stable and
|
|
39
|
+
// unique within the asset; nothing downstream resolves an asset by it.
|
|
40
|
+
if ((_a = flags['pod-filter']) === null || _a === void 0 ? void 0 : _a.length) {
|
|
41
|
+
partial.customPodFilters = flags['pod-filter'].map((raw, i) => {
|
|
42
|
+
const labelSelector = {};
|
|
43
|
+
for (const pair of raw.split(',')) {
|
|
44
|
+
const at = pair.indexOf('=');
|
|
45
|
+
if (at < 1)
|
|
46
|
+
throw new Error(`Invalid --pod-filter entry [${pair.trim()}]. Expected key=value, comma-separated.`);
|
|
47
|
+
labelSelector[pair.slice(0, at).trim()] = pair.slice(at + 1).trim();
|
|
48
|
+
}
|
|
49
|
+
return { podSpecName: i === 0 ? 'pods' : `pods-${i + 1}`, labelSelector };
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
else if (flags['remove-pod-filter']) {
|
|
53
|
+
partial.customPodFilters = [];
|
|
54
|
+
}
|
|
36
55
|
if (flags['deploy-condition']) {
|
|
37
56
|
partial.deployCondition = { expr: flags['deploy-condition'], because: flags['deploy-condition-because'] };
|
|
38
57
|
}
|
|
@@ -56,9 +75,15 @@ class AssetEdit extends command_base_exec_1.CommandBaseExec {
|
|
|
56
75
|
if (!asset)
|
|
57
76
|
throw new Error("Asset not found");
|
|
58
77
|
// Overlay the existing record with the given property values
|
|
78
|
+
const requestedPodFilters = partial.customPodFilters; // captured before the merge
|
|
59
79
|
partial = _.merge({}, asset, partial);
|
|
60
80
|
if (partial.deployCondition === null)
|
|
61
81
|
delete partial.deployCondition;
|
|
82
|
+
// _.merge combines arrays BY INDEX, so merging a shorter pod-filter list over a longer
|
|
83
|
+
// stored one leaves the stored tail in place — and clearing them would be a no-op.
|
|
84
|
+
// A supplied list replaces wholesale; an empty list clears.
|
|
85
|
+
if (requestedPodFilters !== undefined)
|
|
86
|
+
partial.customPodFilters = requestedPodFilters;
|
|
62
87
|
let candidate = Object.assign({}, partial);
|
|
63
88
|
yield this.applyRegistryRepoint(candidate);
|
|
64
89
|
return candidate;
|
|
@@ -171,6 +196,8 @@ AssetEdit.flags = {
|
|
|
171
196
|
code: core_1.Flags.string({ char: 'c', required: false, description: "The host name to assign this asset in the domain url. eg: 'myasset' in 'myasset.your-domain.com' (Optional: defaults to the asset name)." }),
|
|
172
197
|
registry: core_1.Flags.string({ char: 'r', required: false, description: "Re-point this asset at a different container registry, given by its Codiac registry CODE (run `cod imageRegistry list`; NOT the registry url). Re-resolves the asset's embedded registry reference — use this after correcting a registry url so the asset picks up the fix." }),
|
|
173
198
|
// id: Flags.string({ required: false, description: "The system id of the enterprise asset to edit." }),
|
|
199
|
+
"pod-filter": core_1.Flags.string({ required: false, description: "Label selector identifying the pods that belong to this asset, as comma-separated key=value pairs (eg: 'app.kubernetes.io/name=rabbitmq,app.kubernetes.io/component=rabbitmq'). Needed when a chart's workload is created by an OPERATOR rather than by helm — the operator labels its pods after its custom resource, which Codiac cannot infer from the asset name. Repeat the flag for an asset that runs several kinds of pod.", multiple: true }),
|
|
200
|
+
"remove-pod-filter": core_1.Flags.boolean({ required: false, description: "Clears any pod filters, reverting this asset to Codiac's built-in deployment-labeling convention." }),
|
|
174
201
|
"deploy-condition": core_1.Flags.string({ required: false, description: "JSONata expression evaluated at deploy time; when falsy the asset is skipped rather than deployed (see https://jsonata.org for syntax). Uses the same expression context as config conditions: cabinet, cluster, environment, and asset variables are all in scope." }),
|
|
175
202
|
"deploy-condition-because": core_1.Flags.string({ required: false, dependsOn: ["deploy-condition"], description: "Human-readable explanation shown in the deploy output when this asset is skipped." }),
|
|
176
203
|
"remove-deploy-condition": core_1.Flags.boolean({ required: false, exclusive: ["deploy-condition"], description: "Removes any existing deploy condition from this asset so it always deploys." }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../src/commands/asset/edit.ts"],"names":[],"mappings":";;;;AAAA,sCAAmD;AACnD,4BAA6B;AAG7B,+DAA0D;AAG1D,sGAAkG;AAClG,uEAA+E;AAC/E,6CAA0C;AAK1C,MAAa,SAAU,SAAQ,mCAAmC;
|
|
1
|
+
{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../src/commands/asset/edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,20 @@ export default class PvcCreate extends CommandBaseExec<PvcCreateRequest> {
|
|
|
32
32
|
buildCandidate_silently(partial: AtLeast<PvcCreateRequest, "enterprise">, rootMap: RootMap): Promise<PvcCreateRequest | undefined>;
|
|
33
33
|
buildCandidate_interactively(partial: AtLeast<PvcCreateRequest, "enterprise">, rootMap: RootMap, takeDefaults: boolean): Promise<PvcCreateRequest | undefined>;
|
|
34
34
|
buildCommandString(candidate: PvcCreateRequest, cmd: string[]): string[];
|
|
35
|
+
/** Storage-defining fields. Two definitions sharing a name but differing on any of these
|
|
36
|
+
* point at different storage, so a re-run that changes one is a mistake, not a repeat. */
|
|
37
|
+
private static readonly IDENTITY_FIELDS;
|
|
38
|
+
/**
|
|
39
|
+
* Returns the already-stored filestore of this name, or undefined.
|
|
40
|
+
*
|
|
41
|
+
* Pipelines re-run their generated `pvc create` lines on every pass. Creating blind used
|
|
42
|
+
* to leave a duplicate record behind each time — dozens under one name at a customer,
|
|
43
|
+
* and four duplicated names in Codiac's own prod. Duplicates matter because
|
|
44
|
+
* `buildPvcName()` derives the k8s PVC from `{cabinet|asset}-{filestore.name}`, so every
|
|
45
|
+
* copy resolves to the SAME physical volume while presenting several editable
|
|
46
|
+
* definitions of it.
|
|
47
|
+
*/
|
|
48
|
+
private findExisting;
|
|
35
49
|
executeTask(candidate: PvcCreateRequest): Promise<void>;
|
|
36
50
|
/** Builds the FileStoreDef-shaped candidate from the resolved partial. */
|
|
37
51
|
private assemble;
|
|
@@ -103,10 +103,47 @@ class PvcCreate extends command_base_exec_1.CommandBaseExec {
|
|
|
103
103
|
cmd.push("--volume-name", candidate.volumeName);
|
|
104
104
|
return cmd;
|
|
105
105
|
}
|
|
106
|
+
/**
|
|
107
|
+
* Returns the already-stored filestore of this name, or undefined.
|
|
108
|
+
*
|
|
109
|
+
* Pipelines re-run their generated `pvc create` lines on every pass. Creating blind used
|
|
110
|
+
* to leave a duplicate record behind each time — dozens under one name at a customer,
|
|
111
|
+
* and four duplicated names in Codiac's own prod. Duplicates matter because
|
|
112
|
+
* `buildPvcName()` derives the k8s PVC from `{cabinet|asset}-{filestore.name}`, so every
|
|
113
|
+
* copy resolves to the SAME physical volume while presenting several editable
|
|
114
|
+
* definitions of it.
|
|
115
|
+
*/
|
|
116
|
+
findExisting(candidate) {
|
|
117
|
+
var _a;
|
|
118
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
try {
|
|
120
|
+
const found = yield this._codiacApi.FileStoreDef.tryReadMany({ name: { $eq: candidate.name } });
|
|
121
|
+
return ((_a = found === null || found === void 0 ? void 0 : found.output) !== null && _a !== void 0 ? _a : []).find((f) => (f === null || f === void 0 ? void 0 : f.name) === candidate.name);
|
|
122
|
+
}
|
|
123
|
+
catch (_b) {
|
|
124
|
+
return undefined; // a failed pre-check must never block a legitimate create
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
}
|
|
106
128
|
executeTask(candidate) {
|
|
107
129
|
var _a, _b;
|
|
108
130
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
109
131
|
try {
|
|
132
|
+
// Idempotent re-run: an identical definition already exists, so there is nothing
|
|
133
|
+
// to do. Report it plainly rather than erroring, so a pipeline's second pass is a
|
|
134
|
+
// no-op instead of a failure. A definition that differs is NOT absorbed — that is
|
|
135
|
+
// a real conflict and the API rejects it with the offending field named.
|
|
136
|
+
const existing = yield this.findExisting(candidate);
|
|
137
|
+
if (existing) {
|
|
138
|
+
const differing = PvcCreate.IDENTITY_FIELDS.filter(f => existing[f] !== candidate[f]);
|
|
139
|
+
if (differing.length === 0) {
|
|
140
|
+
const msg = `PVC filestore ${this._styler.bold(this._styler.hilite(candidate.name))} already exists and is unchanged. Nothing to do.`;
|
|
141
|
+
this.logger.notice(msg, existing);
|
|
142
|
+
this._ui.userMessage(msg);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
throw new Error(`A filestore named "${candidate.name}" already exists and resolves to different storage (differs on: ${differing.join(", ")}). Use a different name, or edit the existing definition.`);
|
|
146
|
+
}
|
|
110
147
|
const result = yield this._codiacApi.FileStoreDef.tryCreate(candidate);
|
|
111
148
|
if (result.error)
|
|
112
149
|
throw result.error;
|
|
@@ -213,4 +250,7 @@ PvcCreate.flags = {
|
|
|
213
250
|
"to-script": core_1.Flags.boolean({ exclusive: ["echo", "silent"], description: 'Toscript interaction mode; renders the equivalent non-interactive cli command WITHOUT any execution.' }),
|
|
214
251
|
"take-defaults": core_1.Flags.boolean({ exclusive: ["silent"], description: "Setting this to true prevents prompting for confirmation on parameters that were passed in or were automatically set to default values (Irrelevant in --silent mode)." }),
|
|
215
252
|
};
|
|
253
|
+
/** Storage-defining fields. Two definitions sharing a name but differing on any of these
|
|
254
|
+
* point at different storage, so a re-run that changes one is a mistake, not a repeat. */
|
|
255
|
+
PvcCreate.IDENTITY_FIELDS = ["type", "shareName", "provider", "providerSubscriptionId"];
|
|
216
256
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/pvc/create.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/pvc/create.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.3.
|
|
2
|
+
"version": "1.3.277",
|
|
3
3
|
"commands": {
|
|
4
4
|
"branch": {
|
|
5
5
|
"id": "branch",
|
|
@@ -2058,6 +2058,20 @@
|
|
|
2058
2058
|
"required": false,
|
|
2059
2059
|
"multiple": false
|
|
2060
2060
|
},
|
|
2061
|
+
"pod-filter": {
|
|
2062
|
+
"name": "pod-filter",
|
|
2063
|
+
"type": "option",
|
|
2064
|
+
"description": "Label selector identifying the pods that belong to this asset, as comma-separated key=value pairs (eg: 'app.kubernetes.io/name=rabbitmq,app.kubernetes.io/component=rabbitmq'). Needed when a chart's workload is created by an OPERATOR rather than by helm — the operator labels its pods after its custom resource, which Codiac cannot infer from the asset name. Repeat the flag for an asset that runs several kinds of pod.",
|
|
2065
|
+
"required": false,
|
|
2066
|
+
"multiple": true
|
|
2067
|
+
},
|
|
2068
|
+
"remove-pod-filter": {
|
|
2069
|
+
"name": "remove-pod-filter",
|
|
2070
|
+
"type": "boolean",
|
|
2071
|
+
"description": "Clears any pod filters, reverting this asset to Codiac's built-in deployment-labeling convention.",
|
|
2072
|
+
"required": false,
|
|
2073
|
+
"allowNo": false
|
|
2074
|
+
},
|
|
2061
2075
|
"deploy-condition": {
|
|
2062
2076
|
"name": "deploy-condition",
|
|
2063
2077
|
"type": "option",
|
|
@@ -8650,6 +8664,12 @@
|
|
|
8650
8664
|
"dependsOn": [
|
|
8651
8665
|
"enterprise",
|
|
8652
8666
|
"name"
|
|
8667
|
+
],
|
|
8668
|
+
"IDENTITY_FIELDS": [
|
|
8669
|
+
"type",
|
|
8670
|
+
"shareName",
|
|
8671
|
+
"provider",
|
|
8672
|
+
"providerSubscriptionId"
|
|
8653
8673
|
]
|
|
8654
8674
|
},
|
|
8655
8675
|
"pvc:delete": {
|
package/package.json
CHANGED