@axinom/mosaic-cli 0.20.0-rc.27 → 0.20.0-rc.29
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.
|
@@ -18,7 +18,7 @@ const getAxiosInstance = (hostingServiceBaseUrl, serviceAccountToken) => {
|
|
|
18
18
|
});
|
|
19
19
|
};
|
|
20
20
|
const deployService = (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
var _a;
|
|
21
|
+
var _a, _b;
|
|
22
22
|
const serviceAccountToken = yield (0, mosaic_id_link_be_1.getServiceAccountToken)(args.idServiceAuthBaseURL, args.mosaicHostingClientId, args.mosaicHostingClientSecret);
|
|
23
23
|
const axiosInstance = getAxiosInstance(args.hostingServiceBaseURL, serviceAccountToken.accessToken);
|
|
24
24
|
const deploymentDetails = yield retrieveServiceDeploymentDetails(args, axiosInstance);
|
|
@@ -39,7 +39,7 @@ const deployService = (args) => tslib_1.__awaiter(void 0, void 0, void 0, functi
|
|
|
39
39
|
serviceDefinitionId: deploymentDetails.serviceDefinitionId,
|
|
40
40
|
containerImageVersion: args.containerImageTag,
|
|
41
41
|
serviceDeploymentConfigurationId: deploymentDetails.deploymentManifestId,
|
|
42
|
-
servicePiletArtifactIds: deploymentDetails.piletArtifactIds,
|
|
42
|
+
servicePiletArtifactIds: (_a = deploymentDetails.piletArtifactIds) !== null && _a !== void 0 ? _a : [],
|
|
43
43
|
name: args.name,
|
|
44
44
|
},
|
|
45
45
|
});
|
|
@@ -58,7 +58,7 @@ const deployService = (args) => tslib_1.__awaiter(void 0, void 0, void 0, functi
|
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
60
|
console.log((0, chalk_1.green)(`Deployment for Service ID [${args.serviceId}] initiated successfully. It may take some time to complete the deployment.`));
|
|
61
|
-
console.log((0, chalk_1.yellow)(JSON.stringify((
|
|
61
|
+
console.log((0, chalk_1.yellow)(JSON.stringify((_b = response.data.data) === null || _b === void 0 ? void 0 : _b.initiateServiceDeployment)));
|
|
62
62
|
console.log();
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -137,7 +137,7 @@ const getServiceIdFromManifest = () => {
|
|
|
137
137
|
}
|
|
138
138
|
};
|
|
139
139
|
const retrieveServiceDeploymentDetails = (args, axiosInstance) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
140
|
-
var
|
|
140
|
+
var _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
141
141
|
const piletNamingErrors = [];
|
|
142
142
|
const piletFilter = args.pilets.map((pilet) => {
|
|
143
143
|
const nameAndVersion = pilet.split('@');
|
|
@@ -157,33 +157,34 @@ const retrieveServiceDeploymentDetails = (args, axiosInstance) => tslib_1.__awai
|
|
|
157
157
|
console.log();
|
|
158
158
|
return;
|
|
159
159
|
}
|
|
160
|
-
const
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
id
|
|
165
|
-
}
|
|
160
|
+
const getDeploymentInfoQuery = `query GetDeploymentInfo($serviceId: String!, $manifestName: String!, $pilets: ServicePiletArtifactFilter ) {
|
|
161
|
+
serviceDefinitions(condition: {serviceId: $serviceId}) {
|
|
162
|
+
nodes {
|
|
163
|
+
id
|
|
166
164
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
165
|
+
}
|
|
166
|
+
serviceDeploymentManifests(
|
|
167
|
+
filter: {name: {equalTo: $manifestName}, serviceId: {equalTo: $serviceId}}
|
|
168
|
+
) {
|
|
169
|
+
nodes {
|
|
170
|
+
id
|
|
173
171
|
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
172
|
+
}
|
|
173
|
+
servicePiletArtifacts(
|
|
174
|
+
filter: $pilets
|
|
175
|
+
) {
|
|
176
|
+
nodes {
|
|
177
|
+
id
|
|
180
178
|
}
|
|
181
|
-
|
|
179
|
+
}
|
|
180
|
+
}`;
|
|
181
|
+
const deploymentInfo = JSON.stringify({
|
|
182
|
+
query: getDeploymentInfoQuery,
|
|
182
183
|
variables: {
|
|
183
184
|
serviceId: args.serviceId,
|
|
184
185
|
manifestName: args.manifestName,
|
|
185
186
|
pilets: {
|
|
186
|
-
or: piletFilter,
|
|
187
|
+
and: [{ serviceId: { equalTo: args.serviceId } }, { or: piletFilter }],
|
|
187
188
|
},
|
|
188
189
|
},
|
|
189
190
|
});
|
|
@@ -199,14 +200,17 @@ const retrieveServiceDeploymentDetails = (args, axiosInstance) => tslib_1.__awai
|
|
|
199
200
|
}
|
|
200
201
|
else {
|
|
201
202
|
serviceDefinitionId =
|
|
202
|
-
(
|
|
203
|
+
(_e = (_d = (_c = response.data.data) === null || _c === void 0 ? void 0 : _c.serviceDefinitions) === null || _d === void 0 ? void 0 : _d.nodes[0]) === null || _e === void 0 ? void 0 : _e.id;
|
|
203
204
|
deploymentManifestId =
|
|
204
|
-
(
|
|
205
|
-
piletArtifactIds = (
|
|
205
|
+
(_h = (_g = (_f = response.data.data) === null || _f === void 0 ? void 0 : _f.serviceDeploymentManifests) === null || _g === void 0 ? void 0 : _g.nodes[0]) === null || _h === void 0 ? void 0 : _h.id;
|
|
206
|
+
piletArtifactIds = (_l = (_k = (_j = response.data.data) === null || _j === void 0 ? void 0 : _j.servicePiletArtifacts) === null || _k === void 0 ? void 0 : _k.nodes) === null || _l === void 0 ? void 0 : _l.map((pilet) => pilet.id);
|
|
206
207
|
console.log((0, chalk_1.green)(`Deployment info retrieved successfully for [${args.serviceId}].`));
|
|
208
|
+
const joinedPiletArtifactIds = piletArtifactIds === null || piletArtifactIds === void 0 ? void 0 : piletArtifactIds.join(',');
|
|
207
209
|
console.log((0, chalk_1.green)(`Service Definition ID:\t${serviceDefinitionId}`));
|
|
208
210
|
console.log((0, chalk_1.green)(`Deployment Manifest ID:\t${deploymentManifestId}`));
|
|
209
|
-
console.log((0, chalk_1.green)(`Pilet Artifacts ID(s):\t${
|
|
211
|
+
console.log((0, chalk_1.green)(`Pilet Artifacts ID(s):\t${joinedPiletArtifactIds === ''
|
|
212
|
+
? '(No Pilet Artifacts)'
|
|
213
|
+
: joinedPiletArtifactIds}`));
|
|
210
214
|
console.log();
|
|
211
215
|
}
|
|
212
216
|
}
|
|
@@ -225,7 +229,8 @@ const retrieveServiceDeploymentDetails = (args, axiosInstance) => tslib_1.__awai
|
|
|
225
229
|
console.log();
|
|
226
230
|
return;
|
|
227
231
|
}
|
|
228
|
-
if (args.pilets.length
|
|
232
|
+
if (args.pilets.length > 0 &&
|
|
233
|
+
args.pilets.length !== piletArtifactIds.length) {
|
|
229
234
|
console.log((0, chalk_1.red)(`Pilet artifacts were not found for the given pilet names. Cannot proceed with deployment.`));
|
|
230
235
|
console.log();
|
|
231
236
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-deploy.js","sourceRoot":"","sources":["../../../../../src/commands/hosting/service/deploy/service-deploy.ts"],"names":[],"mappings":";;;;AAAA,iEAAmE;AACnE,yEAAmE;AACnE,iCAAyD;AACzD,iCAA2C;AAC3C,2BAAkC;AAClC,gCAAgC;AAGhC,MAAM,gBAAgB,GAAG,CACvB,qBAA6B,EAC7B,mBAA2B,EACZ,EAAE;IACjB,OAAO,eAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE;QAClD,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,mBAAmB,EAAE;YAC9C,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,CAC3B,IAAuC,EACxB,EAAE;;IACjB,MAAM,mBAAmB,GAAG,MAAM,IAAA,0CAAsB,EACtD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,yBAAyB,CAC/B,CAAC;IAEF,MAAM,aAAa,GAAkB,gBAAgB,CACnD,IAAI,CAAC,qBAAqB,EAC1B,mBAAmB,CAAC,WAAW,CAChC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,gCAAgC,CAC9D,IAAI,EACJ,aAAa,CACd,CAAC;IAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;QACnC,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,KAAK,EAAE;;;;;;;;IAQP;QACA,SAAS,EAAE;YACT,mBAAmB,EAAE,iBAAiB,CAAC,mBAAmB;YAC1D,qBAAqB,EAAE,IAAI,CAAC,iBAAiB;YAC7C,gCAAgC,EAAE,iBAAiB,CAAC,oBAAoB;YACxE,uBAAuB,EAAE,iBAAiB,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"service-deploy.js","sourceRoot":"","sources":["../../../../../src/commands/hosting/service/deploy/service-deploy.ts"],"names":[],"mappings":";;;;AAAA,iEAAmE;AACnE,yEAAmE;AACnE,iCAAyD;AACzD,iCAA2C;AAC3C,2BAAkC;AAClC,gCAAgC;AAGhC,MAAM,gBAAgB,GAAG,CACvB,qBAA6B,EAC7B,mBAA2B,EACZ,EAAE;IACjB,OAAO,eAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE;QAClD,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,mBAAmB,EAAE;YAC9C,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,CAC3B,IAAuC,EACxB,EAAE;;IACjB,MAAM,mBAAmB,GAAG,MAAM,IAAA,0CAAsB,EACtD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,yBAAyB,CAC/B,CAAC;IAEF,MAAM,aAAa,GAAkB,gBAAgB,CACnD,IAAI,CAAC,qBAAqB,EAC1B,mBAAmB,CAAC,WAAW,CAChC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,gCAAgC,CAC9D,IAAI,EACJ,aAAa,CACd,CAAC;IAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;QACnC,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,KAAK,EAAE;;;;;;;;IAQP;QACA,SAAS,EAAE;YACT,mBAAmB,EAAE,iBAAiB,CAAC,mBAAmB;YAC1D,qBAAqB,EAAE,IAAI,CAAC,iBAAiB;YAC7C,gCAAgC,EAAE,iBAAiB,CAAC,oBAAoB;YACxE,uBAAuB,EAAE,MAAA,iBAAiB,CAAC,gBAAgB,mCAAI,EAAE;YACjE,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;KACF,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACxE,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACzE,OAAO,CAAC,GAAG,CAAC,IAAA,WAAG,EAAC,8BAA8B,IAAI,CAAC,SAAS,WAAW,CAAC,CAAC,CAAC;YAC1E,IACE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;gBAC/B,kGAAkG,EAClG;gBACA,OAAO,CAAC,GAAG,CACT,IAAA,cAAM,EACJ,mEAAmE,IAAI,CAAC,IAAI,wDAAwD,CACrI,CACF,CAAC;aACH;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,IAAA,WAAG,EAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;aACnD;YACD,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;aAAM;YACL,OAAO,CAAC,GAAG,CACT,IAAA,aAAK,EACH,8BAA8B,IAAI,CAAC,SAAS,6EAA6E,CAC1H,CACF,CAAC;YACF,OAAO,CAAC,GAAG,CACT,IAAA,cAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,0CAAE,yBAAyB,CAAC,CAAC,CACtE,CAAC;YACF,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EACD,qDAAqD,IAAI,CAAC,SAAS,IAAI,CACxE,CACF,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,IAAA,WAAG,EAAC,IAAI,CAAC,SAAS,CAAE,KAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACjE;AACH,CAAC,CAAA,CAAC;AA9EW,QAAA,aAAa,iBA8ExB;AAEF;;;;;GAKG;AACI,MAAM,sBAAsB,GAAG,CACpC,IAA6B,EACkB,EAAE;;IACjD,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,MAAM,oBAAoB,GACxB,MAAA,MAAA,IAAI,CAAC,oBAAoB,mCAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,mCAAI,EAAE,CAAC;IAC1E,MAAM,qBAAqB,GACzB,MAAA,MAAA,IAAI,CAAC,qBAAqB,mCAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,mCAAI,EAAE,CAAC;IAC3E,MAAM,yBAAyB,GAC7B,MAAA,MAAA,IAAI,CAAC,yBAAyB,mCAC9B,OAAO,CAAC,GAAG,CAAC,4BAA4B,mCACxC,EAAE,CAAC;IACL,MAAM,SAAS,GAAG,MAAA,MAAA,IAAI,CAAC,SAAS,mCAAI,wBAAwB,EAAE,mCAAI,EAAE,CAAC;IACrE,MAAM,qBAAqB,GACzB,MAAA,MAAA,IAAI,CAAC,qBAAqB,mCAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,mCAAI,EAAE,CAAC;IAE3E,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;IACjD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAEzB,IAAI,IAAA,0CAAkB,EAAC,oBAAoB,CAAC,EAAE;QAC5C,aAAa,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;KAC3D;IACD,IAAI,IAAA,0CAAkB,EAAC,qBAAqB,CAAC,EAAE;QAC7C,aAAa,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;KAC/C;IACD,IAAI,IAAA,0CAAkB,EAAC,yBAAyB,CAAC,EAAE;QACjD,aAAa,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;KACnD;IACD,IAAI,IAAA,0CAAkB,EAAC,SAAS,CAAC,EAAE;QACjC,aAAa,CAAC,IAAI,CAChB,gLAAgL,CACjL,CAAC;KACH;IACD,IAAI,IAAA,0CAAkB,EAAC,qBAAqB,CAAC,EAAE;QAC7C,aAAa,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;KAC5D;IACD,IAAI,IAAA,0CAAkB,EAAC,YAAY,CAAC,EAAE;QACpC,aAAa,CAAC,IAAI,CAChB,2DAA2D,CAC5D,CAAC;KACH;IACD,IAAI,IAAA,0CAAkB,EAAC,iBAAiB,CAAC,EAAE;QACzC,aAAa,CAAC,IAAI,CAChB,gEAAgE,CACjE,CAAC;KACH;IAED,IAAI,IAAA,0CAAkB,EAAC,MAAM,CAAC,EAAE;QAC9B,MAAM,GAAG,EAAE,CAAC;KACb;IAED,OAAO;QACL;YACE,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,oBAAoB;YACpB,qBAAqB;YACrB,yBAAyB;YACzB,SAAS;YACT,YAAY;YACZ,MAAM;YACN,iBAAiB,EAAE,iBAAiB;YACpC,qBAAqB;SACtB;QACD,aAAa;KACd,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,sBAAsB,0BAmEjC;AAEF,MAAM,wBAAwB,GAAG,GAAuB,EAAE;IACxD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CACnB,IAAA,iBAAY,EAAC,2CAA2C,EAAE,MAAM,CAAC,CAClE,CAAC;QACF,IAAI,CAAC,IAAA,0CAAkB,EAAC,GAAG,CAAC,EAAE;YAC5B,OAAQ,GAAW,CAAC,SAAS,CAAC;SAC/B;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACvC,IAAuC,EACvC,aAA4B,EAQ5B,EAAE;;IACF,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,iBAAiB,CAAC,IAAI,CAAC,eAAe,KAAK,eAAe,CAAC,CAAC;YAC5D,OAAO;SACR;QACD,OAAO;YACL,IAAI,EAAE,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE;YACpC,cAAc,EAAE,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE;YAC9C,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE;SACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,IAAA,WAAG,EAAC,iBAAiB,CAAC,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CACT,IAAA,cAAM,EACJ,+FAA+F,CAChG,CACF,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO;KACR;IAED,MAAM,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;EAoB/B,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;QACpC,KAAK,EAAE,sBAAsB;QAC7B,SAAS,EAAE;YACT,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE;gBACN,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;aACvE;SACF;KACF,CAAC,CAAC;IAEH,IAAI,mBAAuC,CAAC;IAC5C,IAAI,oBAAwC,CAAC;IAC7C,IAAI,gBAAgB,GAAa,EAAE,CAAC;IAEpC,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACzE,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EAAC,+CAA+C,IAAI,CAAC,SAAS,IAAI,CAAC,CACvE,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;aAAM;YACL,mBAAmB;gBACjB,MAAA,MAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,0CAAE,kBAAkB,0CAAE,KAAK,CAAC,CAAC,CAAC,0CAAE,EAAE,CAAC;YACvD,oBAAoB;gBAClB,MAAA,MAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,0CAAE,0BAA0B,0CAAE,KAAK,CAAC,CAAC,CAAC,0CAAE,EAAE,CAAC;YAC/D,gBAAgB,GAAG,MAAA,MAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,0CAAE,qBAAqB,0CAAE,KAAK,0CAAE,GAAG,CACtE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CACpB,CAAC;YACF,OAAO,CAAC,GAAG,CACT,IAAA,aAAK,EACH,+CAA+C,IAAI,CAAC,SAAS,IAAI,CAClE,CACF,CAAC;YAEF,MAAM,sBAAsB,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,IAAA,aAAK,EAAC,2BAA2B,mBAAmB,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,GAAG,CAAC,IAAA,aAAK,EAAC,4BAA4B,oBAAoB,EAAE,CAAC,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CACT,IAAA,aAAK,EACH,2BACE,sBAAsB,KAAK,EAAE;gBAC3B,CAAC,CAAC,sBAAsB;gBACxB,CAAC,CAAC,sBACN,EAAE,CACH,CACF,CAAC;YAEF,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EAAC,8CAA8C,IAAI,CAAC,SAAS,GAAG,CAAC,CACrE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAE,KAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,EAAE,CAAC;KACf;IAED,IAAI,IAAA,0CAAkB,EAAC,mBAAmB,CAAC,EAAE;QAC3C,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EACD,+CAA+C,IAAI,CAAC,SAAS,oCAAoC,CAClG,CACF,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO;KACR;IAED,IAAI,IAAA,0CAAkB,EAAC,oBAAoB,CAAC,EAAE;QAC5C,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EACD,0CAA0C,IAAI,CAAC,YAAY,qBAAqB,IAAI,CAAC,SAAS,oCAAoC,CACnI,CACF,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO;KACR;IAED,IACE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAC9C;QACA,OAAO,CAAC,GAAG,CACT,IAAA,WAAG,EACD,2FAA2F,CAC5F,CACF,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO;KACR;IAED,OAAO;QACL,mBAAmB;QACnB,oBAAoB;QACpB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAA,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-cli",
|
|
3
|
-
"version": "0.20.0-rc.
|
|
3
|
+
"version": "0.20.0-rc.29",
|
|
4
4
|
"description": "The Axinom Mosaic CLI",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"@asyncapi/diff": "^0.4.1",
|
|
34
34
|
"@asyncapi/modelina": "^1.8.4",
|
|
35
35
|
"@asyncapi/parser": "^2.0.2",
|
|
36
|
-
"@axinom/mosaic-id-link-be": "^0.13.4-rc.
|
|
37
|
-
"@axinom/mosaic-service-common": "^0.35.0-rc.
|
|
36
|
+
"@axinom/mosaic-id-link-be": "^0.13.4-rc.29",
|
|
37
|
+
"@axinom/mosaic-service-common": "^0.35.0-rc.29",
|
|
38
38
|
"@graphql-inspector/core": "^3.1.2",
|
|
39
39
|
"@stoplight/spectral": "^5.9.1",
|
|
40
40
|
"axios": "^0.19.2",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"publishConfig": {
|
|
69
69
|
"access": "public"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "38931b57cd3fd96a4662534eb9065fa3121ff870"
|
|
72
72
|
}
|
|
@@ -56,7 +56,7 @@ export const deployService = async (
|
|
|
56
56
|
serviceDefinitionId: deploymentDetails.serviceDefinitionId,
|
|
57
57
|
containerImageVersion: args.containerImageTag,
|
|
58
58
|
serviceDeploymentConfigurationId: deploymentDetails.deploymentManifestId,
|
|
59
|
-
servicePiletArtifactIds: deploymentDetails.piletArtifactIds,
|
|
59
|
+
servicePiletArtifactIds: deploymentDetails.piletArtifactIds ?? [],
|
|
60
60
|
name: args.name,
|
|
61
61
|
},
|
|
62
62
|
});
|
|
@@ -224,33 +224,35 @@ const retrieveServiceDeploymentDetails = async (
|
|
|
224
224
|
return;
|
|
225
225
|
}
|
|
226
226
|
|
|
227
|
-
const
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
id
|
|
232
|
-
}
|
|
227
|
+
const getDeploymentInfoQuery = `query GetDeploymentInfo($serviceId: String!, $manifestName: String!, $pilets: ServicePiletArtifactFilter ) {
|
|
228
|
+
serviceDefinitions(condition: {serviceId: $serviceId}) {
|
|
229
|
+
nodes {
|
|
230
|
+
id
|
|
233
231
|
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
232
|
+
}
|
|
233
|
+
serviceDeploymentManifests(
|
|
234
|
+
filter: {name: {equalTo: $manifestName}, serviceId: {equalTo: $serviceId}}
|
|
235
|
+
) {
|
|
236
|
+
nodes {
|
|
237
|
+
id
|
|
240
238
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
239
|
+
}
|
|
240
|
+
servicePiletArtifacts(
|
|
241
|
+
filter: $pilets
|
|
242
|
+
) {
|
|
243
|
+
nodes {
|
|
244
|
+
id
|
|
247
245
|
}
|
|
248
|
-
|
|
246
|
+
}
|
|
247
|
+
}`;
|
|
248
|
+
|
|
249
|
+
const deploymentInfo = JSON.stringify({
|
|
250
|
+
query: getDeploymentInfoQuery,
|
|
249
251
|
variables: {
|
|
250
252
|
serviceId: args.serviceId,
|
|
251
253
|
manifestName: args.manifestName,
|
|
252
254
|
pilets: {
|
|
253
|
-
or: piletFilter,
|
|
255
|
+
and: [{ serviceId: { equalTo: args.serviceId } }, { or: piletFilter }],
|
|
254
256
|
},
|
|
255
257
|
},
|
|
256
258
|
});
|
|
@@ -280,11 +282,20 @@ const retrieveServiceDeploymentDetails = async (
|
|
|
280
282
|
`Deployment info retrieved successfully for [${args.serviceId}].`,
|
|
281
283
|
),
|
|
282
284
|
);
|
|
285
|
+
|
|
286
|
+
const joinedPiletArtifactIds = piletArtifactIds?.join(',');
|
|
283
287
|
console.log(green(`Service Definition ID:\t${serviceDefinitionId}`));
|
|
284
288
|
console.log(green(`Deployment Manifest ID:\t${deploymentManifestId}`));
|
|
285
289
|
console.log(
|
|
286
|
-
green(
|
|
290
|
+
green(
|
|
291
|
+
`Pilet Artifacts ID(s):\t${
|
|
292
|
+
joinedPiletArtifactIds === ''
|
|
293
|
+
? '(No Pilet Artifacts)'
|
|
294
|
+
: joinedPiletArtifactIds
|
|
295
|
+
}`,
|
|
296
|
+
),
|
|
287
297
|
);
|
|
298
|
+
|
|
288
299
|
console.log();
|
|
289
300
|
}
|
|
290
301
|
} catch (error) {
|
|
@@ -315,7 +326,10 @@ const retrieveServiceDeploymentDetails = async (
|
|
|
315
326
|
return;
|
|
316
327
|
}
|
|
317
328
|
|
|
318
|
-
if (
|
|
329
|
+
if (
|
|
330
|
+
args.pilets.length > 0 &&
|
|
331
|
+
args.pilets.length !== piletArtifactIds.length
|
|
332
|
+
) {
|
|
319
333
|
console.log(
|
|
320
334
|
red(
|
|
321
335
|
`Pilet artifacts were not found for the given pilet names. Cannot proceed with deployment.`,
|