@axinom/mosaic-cli 0.20.0-rc.25 → 0.20.0-rc.27
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/dist/commands/hosting/manifest/upload-manifest.js +4 -0
- package/dist/commands/hosting/manifest/upload-manifest.js.map +1 -1
- package/dist/commands/hosting/pilet/pilet-commands.js +8 -13
- package/dist/commands/hosting/pilet/pilet-commands.js.map +1 -1
- package/dist/commands/hosting/pilet/register-pilet-options.d.ts +0 -2
- package/dist/commands/hosting/pilet/register-pilet.d.ts +1 -1
- package/dist/commands/hosting/pilet/register-pilet.js +62 -51
- package/dist/commands/hosting/pilet/register-pilet.js.map +1 -1
- package/dist/commands/hosting/service/deploy/service-deploy-command.js +3 -3
- package/dist/commands/hosting/service/deploy/service-deploy-command.js.map +1 -1
- package/dist/commands/hosting/service/deploy/service-deploy-options.d.ts +1 -1
- package/dist/commands/hosting/service/deploy/service-deploy.js +5 -5
- package/dist/commands/hosting/service/deploy/service-deploy.js.map +1 -1
- package/package.json +4 -4
- package/src/commands/hosting/manifest/upload-manifest.ts +7 -0
- package/src/commands/hosting/pilet/pilet-commands.ts +9 -13
- package/src/commands/hosting/pilet/register-pilet-options.ts +0 -2
- package/src/commands/hosting/pilet/register-pilet.ts +89 -57
- package/src/commands/hosting/service/deploy/service-deploy-command.ts +4 -3
- package/src/commands/hosting/service/deploy/service-deploy-options.ts +1 -1
- package/src/commands/hosting/service/deploy/service-deploy.ts +5 -5
|
@@ -28,6 +28,10 @@ const uploadDeploymentManifest = (args) => tslib_1.__awaiter(void 0, void 0, voi
|
|
|
28
28
|
console.log(`Error occurred while trying to read the Deployment Manifest at ${args.deploymentManifestPath}.`);
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
|
+
if (manifestToUpload.serviceId !== args.serviceId) {
|
|
32
|
+
console.log(`Service ID in the given Deployment Manifest does not match with the argument value. Please make sure the value of the argument given for Service ID matches the value in the Deployment Manifest.`);
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
31
35
|
const axiosInstance = getAxiosInstance(args.hostingServiceBaseURL, serviceAccountToken.accessToken);
|
|
32
36
|
const data = JSON.stringify({
|
|
33
37
|
query: `mutation CreateServiceDeploymentManifest($serviceId: String!, $name: String, $configMap: DeploymentConfigMap!) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-manifest.js","sourceRoot":"","sources":["../../../../src/commands/hosting/manifest/upload-manifest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload-manifest.js","sourceRoot":"","sources":["../../../../src/commands/hosting/manifest/upload-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,19 +28,9 @@ const piletRegister = {
|
|
|
28
28
|
describe: 'Client Secret to authenticate',
|
|
29
29
|
alias: 's',
|
|
30
30
|
string: true,
|
|
31
|
-
})
|
|
32
|
-
.option('tenantId', {
|
|
33
|
-
describe: 'Tenant ID',
|
|
34
|
-
alias: 't',
|
|
35
|
-
string: true,
|
|
36
|
-
})
|
|
37
|
-
.option('environmentId', {
|
|
38
|
-
describe: 'Environment ID',
|
|
39
|
-
alias: 'e',
|
|
40
|
-
string: true,
|
|
41
31
|
})
|
|
42
32
|
.option('piletArtifactPath', {
|
|
43
|
-
describe: '
|
|
33
|
+
describe: 'Path to the pilet artifact .tgz file or a directory containing the .tgz file',
|
|
44
34
|
alias: 'p',
|
|
45
35
|
string: true,
|
|
46
36
|
})
|
|
@@ -63,8 +53,13 @@ const piletRegister = {
|
|
|
63
53
|
},
|
|
64
54
|
handler: (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
65
55
|
// Validate arguments and read any arguments that are coming from environment variables.
|
|
66
|
-
const validatedArgs = (0, register_pilet_1.validateArgs)(args);
|
|
67
|
-
|
|
56
|
+
const [validatedArgs, errorMessages] = (0, register_pilet_1.validateArgs)(args);
|
|
57
|
+
if (errorMessages.length > 0) {
|
|
58
|
+
console.log(errorMessages);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
yield (0, register_pilet_1.registerPilet)(validatedArgs);
|
|
62
|
+
}
|
|
68
63
|
}),
|
|
69
64
|
};
|
|
70
65
|
//# sourceMappingURL=pilet-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet-commands.js","sourceRoot":"","sources":["../../../../src/commands/hosting/pilet/pilet-commands.ts"],"names":[],"mappings":";;;;AACA,qDAA+D;AAGlD,QAAA,aAAa,GAAoC;IAC5D,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,OAAO,CACN,UAAU,EACV,oDAAoD,EACpD,aAAa,CACd;SACA,aAAa,EAAE;IACpB,OAAO,EAAE,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;CACF,CAAC;AAEF,MAAM,aAAa,GAAoD;IACrE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,WAAW,EAAE;YACnB,QAAQ,EAAE,8CAA8C;YACxD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,uBAAuB,EAAE;YAC/B,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,2BAA2B,EAAE;YACnC,QAAQ,EAAE,+BAA+B;YACzC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"pilet-commands.js","sourceRoot":"","sources":["../../../../src/commands/hosting/pilet/pilet-commands.ts"],"names":[],"mappings":";;;;AACA,qDAA+D;AAGlD,QAAA,aAAa,GAAoC;IAC5D,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,OAAO,CACN,UAAU,EACV,oDAAoD,EACpD,aAAa,CACd;SACA,aAAa,EAAE;IACpB,OAAO,EAAE,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;CACF,CAAC;AAEF,MAAM,aAAa,GAAoD;IACrE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,WAAW,EAAE;YACnB,QAAQ,EAAE,8CAA8C;YACxD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,uBAAuB,EAAE;YAC/B,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,2BAA2B,EAAE;YACnC,QAAQ,EAAE,+BAA+B;YACzC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,mBAAmB,EAAE;YAC3B,QAAQ,EACN,8EAA8E;YAChF,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,QAAQ,EAAE,6CAA6C;YACvD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,6BAA6B,EAAE;YACrC,QAAQ,EAAE,iCAAiC;YAC3C,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,QAAQ,EAAE,uBAAuB;YACjC,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;QACtB,wFAAwF;QACxF,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,IAAA,8BAAa,EAAC,aAAa,CAAC,CAAC;SACpC;IACH,CAAC,CAAA;CACF,CAAC"}
|
|
@@ -5,8 +5,6 @@ export interface GetRegisterPiletOptions {
|
|
|
5
5
|
serviceId?: string;
|
|
6
6
|
mosaicHostingClientId?: string;
|
|
7
7
|
mosaicHostingClientSecret?: string;
|
|
8
|
-
tenantId?: string;
|
|
9
|
-
environmentId?: string;
|
|
10
8
|
piletArtifactPath?: string;
|
|
11
9
|
idServiceAuthBaseURL?: string;
|
|
12
10
|
microFrontendServiceBaseURL?: string;
|
|
@@ -7,4 +7,4 @@ export declare const registerPilet: (args: Required<GetRegisterPiletOptions>) =>
|
|
|
7
7
|
* @param args
|
|
8
8
|
* @returns
|
|
9
9
|
*/
|
|
10
|
-
export declare const validateArgs: (args: GetRegisterPiletOptions) => Required<GetRegisterPiletOptions
|
|
10
|
+
export declare const validateArgs: (args: GetRegisterPiletOptions) => [Required<GetRegisterPiletOptions>, string[]];
|
|
@@ -10,7 +10,16 @@ const fs_1 = require("fs");
|
|
|
10
10
|
const path = require("path");
|
|
11
11
|
const registerPilet = (args) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
12
|
var _a, _b;
|
|
13
|
-
|
|
13
|
+
let serviceAccountToken;
|
|
14
|
+
try {
|
|
15
|
+
serviceAccountToken = yield (0, mosaic_id_link_be_1.getServiceAccountToken)(args.idServiceAuthBaseURL, args.mosaicHostingClientId, args.mosaicHostingClientSecret);
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
console.log(`\nFailed to get the service account token. ${error.message}\n`);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
// Extract the tenant/environment IDs from the access token
|
|
22
|
+
const { tenantId, environmentId } = JSON.parse(Buffer.from(serviceAccountToken.accessToken.split('.')[1], 'base64').toString());
|
|
14
23
|
const data = new FormData();
|
|
15
24
|
const config = {
|
|
16
25
|
maxBodyLength: 52428890,
|
|
@@ -18,23 +27,25 @@ const registerPilet = (args) => tslib_1.__awaiter(void 0, void 0, void 0, functi
|
|
|
18
27
|
};
|
|
19
28
|
try {
|
|
20
29
|
const artifactToPublish = findArtifactToPublish(args.piletArtifactPath);
|
|
21
|
-
|
|
22
|
-
data.append('', (0, fs_1.createReadStream)(artifactToPublish));
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
throw new Error(`No Pilet Artifact found at ${args.piletArtifactPath}.`);
|
|
26
|
-
}
|
|
30
|
+
data.append('', (0, fs_1.createReadStream)(artifactToPublish));
|
|
27
31
|
}
|
|
28
32
|
catch (error) {
|
|
29
|
-
|
|
33
|
+
console.log(`\n${error.message}`);
|
|
34
|
+
return;
|
|
30
35
|
}
|
|
31
36
|
try {
|
|
32
|
-
|
|
37
|
+
console.log(`\nRegistering pilet...`);
|
|
38
|
+
console.log(`path:\t\t${args.piletArtifactPath}`);
|
|
39
|
+
console.log(`tenantId:\t${tenantId}`);
|
|
40
|
+
console.log(`environmentId:\t${environmentId}`);
|
|
41
|
+
console.log(`serviceId:\t${args.serviceId}\n`);
|
|
42
|
+
const result = yield axios_1.default.post(`${args.microFrontendServiceBaseURL}/v1/pilets/${tenantId}/${environmentId}/${args.serviceId}/register?override=${args.overrideRegistration}`, data, config);
|
|
33
43
|
console.log('Registration of Pilet complete.');
|
|
34
44
|
console.log(result.data);
|
|
35
45
|
}
|
|
36
46
|
catch (error) {
|
|
37
47
|
console.log('Registration of Pilet failed.', (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) !== null && _b !== void 0 ? _b : error.message);
|
|
48
|
+
return;
|
|
38
49
|
}
|
|
39
50
|
});
|
|
40
51
|
exports.registerPilet = registerPilet;
|
|
@@ -46,70 +57,70 @@ exports.registerPilet = registerPilet;
|
|
|
46
57
|
* @returns
|
|
47
58
|
*/
|
|
48
59
|
const validateArgs = (args) => {
|
|
49
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const
|
|
53
|
-
const
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
const microFrontendServiceBaseURL = (_h = args.microFrontendServiceBaseURL) !== null && _h !== void 0 ? _h : process.env.MICRO_FRONTEND_SERVICE_BASE_URL;
|
|
60
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
61
|
+
const errorMessages = [];
|
|
62
|
+
const idServiceAuthBaseURL = (_b = (_a = args.idServiceAuthBaseURL) !== null && _a !== void 0 ? _a : process.env.ID_SERVICE_AUTH_BASE_URL) !== null && _b !== void 0 ? _b : '';
|
|
63
|
+
const mosaicHostingClientId = (_d = (_c = args.mosaicHostingClientId) !== null && _c !== void 0 ? _c : process.env.MOSAIC_HOSTING_CLIENT_ID) !== null && _d !== void 0 ? _d : '';
|
|
64
|
+
const mosaicHostingClientSecret = (_f = (_e = args.mosaicHostingClientSecret) !== null && _e !== void 0 ? _e : process.env.MOSAIC_HOSTING_CLIENT_SECRET) !== null && _f !== void 0 ? _f : '';
|
|
65
|
+
const serviceId = (_h = (_g = args.serviceId) !== null && _g !== void 0 ? _g : process.env.SERVICE_ID) !== null && _h !== void 0 ? _h : '';
|
|
66
|
+
const piletArtifactPath = (_k = (_j = args.piletArtifactPath) !== null && _j !== void 0 ? _j : process.env.PILET_PATH) !== null && _k !== void 0 ? _k : '';
|
|
67
|
+
const microFrontendServiceBaseURL = (_m = (_l = args.microFrontendServiceBaseURL) !== null && _l !== void 0 ? _l : process.env.MICRO_FRONTEND_SERVICE_BASE_URL) !== null && _m !== void 0 ? _m : '';
|
|
58
68
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(idServiceAuthBaseURL)) {
|
|
59
|
-
|
|
69
|
+
errorMessages.push('[idServiceAuthBaseURL] is required.');
|
|
60
70
|
}
|
|
61
71
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(mosaicHostingClientId)) {
|
|
62
|
-
|
|
72
|
+
errorMessages.push('[clientId] is required.');
|
|
63
73
|
}
|
|
64
74
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(mosaicHostingClientSecret)) {
|
|
65
|
-
|
|
66
|
-
}
|
|
67
|
-
if ((0, mosaic_service_common_1.isNullOrWhitespace)(tenantId)) {
|
|
68
|
-
throw new Error('tenantId is required.');
|
|
69
|
-
}
|
|
70
|
-
if ((0, mosaic_service_common_1.isNullOrWhitespace)(environmentId)) {
|
|
71
|
-
throw new Error('environmentId is required,');
|
|
75
|
+
errorMessages.push('[clientSecret] is required.');
|
|
72
76
|
}
|
|
73
77
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(serviceId)) {
|
|
74
|
-
|
|
78
|
+
errorMessages.push('[serviceId] is required.');
|
|
75
79
|
}
|
|
76
80
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(piletArtifactPath)) {
|
|
77
|
-
|
|
81
|
+
errorMessages.push('[piletArtifactPath] is required,');
|
|
78
82
|
}
|
|
79
83
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(microFrontendServiceBaseURL)) {
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
return
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
84
|
+
errorMessages.push('[microFrontendServiceBaseURL] is required.');
|
|
85
|
+
}
|
|
86
|
+
return [
|
|
87
|
+
{
|
|
88
|
+
idServiceAuthBaseURL,
|
|
89
|
+
mosaicHostingClientId,
|
|
90
|
+
mosaicHostingClientSecret,
|
|
91
|
+
serviceId,
|
|
92
|
+
piletArtifactPath,
|
|
93
|
+
microFrontendServiceBaseURL,
|
|
94
|
+
overrideRegistration: (_o = args.overrideRegistration) !== null && _o !== void 0 ? _o : false,
|
|
95
|
+
},
|
|
96
|
+
errorMessages,
|
|
97
|
+
];
|
|
93
98
|
};
|
|
94
99
|
exports.validateArgs = validateArgs;
|
|
95
100
|
const findArtifactToPublish = (piletPath) => {
|
|
96
101
|
if (!(0, fs_1.existsSync)(piletPath)) {
|
|
97
|
-
throw new Error(`
|
|
102
|
+
throw new Error(`The specified pilet artifact path [${piletPath}] does not exist.`);
|
|
98
103
|
}
|
|
99
|
-
const files = (0, fs_1.readdirSync)(piletPath);
|
|
100
104
|
const tgzFiles = [];
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
105
|
+
// Is the path a directory?
|
|
106
|
+
if ((0, fs_1.lstatSync)(piletPath).isDirectory()) {
|
|
107
|
+
const files = (0, fs_1.readdirSync)(piletPath);
|
|
108
|
+
for (let i = 0; i < files.length; i++) {
|
|
109
|
+
const filename = path.join(piletPath, files[i]);
|
|
110
|
+
const stat = (0, fs_1.lstatSync)(filename);
|
|
111
|
+
if (!stat.isDirectory() && filename.endsWith('.tgz')) {
|
|
112
|
+
tgzFiles.push(filename);
|
|
113
|
+
}
|
|
106
114
|
}
|
|
115
|
+
} // Path is a file
|
|
116
|
+
else {
|
|
117
|
+
tgzFiles.push(piletPath);
|
|
107
118
|
}
|
|
108
119
|
if (tgzFiles.length > 1) {
|
|
109
|
-
throw new Error(`Found more than one .tgz files in the folder ${piletPath}. Please make sure only one .tgz file exists
|
|
120
|
+
throw new Error(`Found more than one .tgz files in the folder [${piletPath}]. Please make sure only one .tgz file exists or specify the path to the .tgz file.`);
|
|
110
121
|
}
|
|
111
122
|
if (tgzFiles.length === 0) {
|
|
112
|
-
throw new Error(`
|
|
123
|
+
throw new Error(`No .tgz files found at pilet artifact path [${piletPath}].`);
|
|
113
124
|
}
|
|
114
125
|
return tgzFiles[0];
|
|
115
126
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-pilet.js","sourceRoot":"","sources":["../../../../src/commands/hosting/pilet/register-pilet.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"register-pilet.js","sourceRoot":"","sources":["../../../../src/commands/hosting/pilet/register-pilet.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,9 @@ exports.serviceDeploy = {
|
|
|
18
18
|
alias: 'i',
|
|
19
19
|
string: true,
|
|
20
20
|
})
|
|
21
|
-
.option('
|
|
22
|
-
describe: '
|
|
23
|
-
alias: '
|
|
21
|
+
.option('containerImageTag', {
|
|
22
|
+
describe: 'Tag of the container image to be used in the deployment. i.e: It should be the <tag> from the container image format <username>/<repository_name>:<tag>.',
|
|
23
|
+
alias: 't',
|
|
24
24
|
string: true,
|
|
25
25
|
demandOption: true,
|
|
26
26
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-deploy-command.js","sourceRoot":"","sources":["../../../../../src/commands/hosting/service/deploy/service-deploy-command.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAEpC,qDAAyE;AAG5D,QAAA,aAAa,GAAoD;IAC5E,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,MAAM,EAAE;YACd,QAAQ,EAAE,wBAAwB;YAClC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,WAAW,EAAE;YACnB,QAAQ,EACN,kJAAkJ;YACpJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"service-deploy-command.js","sourceRoot":"","sources":["../../../../../src/commands/hosting/service/deploy/service-deploy-command.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAEpC,qDAAyE;AAG5D,QAAA,aAAa,GAAoD;IAC5E,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,MAAM,EAAE;YACd,QAAQ,EAAE,wBAAwB;YAClC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,WAAW,EAAE;YACnB,QAAQ,EACN,kJAAkJ;YACpJ,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,mBAAmB,EAAE;YAC3B,QAAQ,EACN,0JAA0J;YAC5J,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,cAAc,EAAE;YACtB,QAAQ,EAAE,iCAAiC;YAC3C,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YAChB,QAAQ,EACN,6HAA6H;YAC/H,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,uBAAuB,EAAE;YAC/B,QAAQ,EAAE,2CAA2C;YACrD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,2BAA2B,EAAE;YACnC,QAAQ,EAAE,+CAA+C;YACzD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,sBAAsB,EAAE;YAC9B,QAAQ,EAAE,6CAA6C;YACvD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,uBAAuB,EAAE;YAC/B,QAAQ,EAAE,0BAA0B;YACpC,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;QACtB,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,IAAA,uCAAsB,EAAC,IAAI,CAAC,CAAC;QACpE,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,CAAC,GAAG,CAAC,IAAA,WAAG,EAAC,sCAAsC,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;aAAM;YACL,MAAM,IAAA,8BAAa,EAAC,aAAa,CAAC,CAAC;SACpC;IACH,CAAC,CAAA;CACF,CAAC"}
|
|
@@ -37,7 +37,7 @@ const deployService = (args) => tslib_1.__awaiter(void 0, void 0, void 0, functi
|
|
|
37
37
|
}`,
|
|
38
38
|
variables: {
|
|
39
39
|
serviceDefinitionId: deploymentDetails.serviceDefinitionId,
|
|
40
|
-
containerImageVersion: args.
|
|
40
|
+
containerImageVersion: args.containerImageTag,
|
|
41
41
|
serviceDeploymentConfigurationId: deploymentDetails.deploymentManifestId,
|
|
42
42
|
servicePiletArtifactIds: deploymentDetails.piletArtifactIds,
|
|
43
43
|
name: args.name,
|
|
@@ -83,7 +83,7 @@ const validateDeploymentArgs = (args) => {
|
|
|
83
83
|
const serviceId = (_h = (_g = args.serviceId) !== null && _g !== void 0 ? _g : getServiceIdFromManifest()) !== null && _h !== void 0 ? _h : '';
|
|
84
84
|
const hostingServiceBaseURL = (_k = (_j = args.hostingServiceBaseURL) !== null && _j !== void 0 ? _j : process.env.HOSTING_SERVICE_BASE_URL) !== null && _k !== void 0 ? _k : '';
|
|
85
85
|
const manifestName = args.manifestName;
|
|
86
|
-
const
|
|
86
|
+
const containerImageTag = args.containerImageTag;
|
|
87
87
|
let pilets = args.pilets;
|
|
88
88
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(idServiceAuthBaseURL)) {
|
|
89
89
|
errorMessages.push('[idServiceAuthBaseURL] is required.');
|
|
@@ -103,8 +103,8 @@ const validateDeploymentArgs = (args) => {
|
|
|
103
103
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(manifestName)) {
|
|
104
104
|
errorMessages.push('[manifestName] is required and cannot be an empty string.');
|
|
105
105
|
}
|
|
106
|
-
if ((0, mosaic_service_common_1.isNullOrWhitespace)(
|
|
107
|
-
errorMessages.push('[
|
|
106
|
+
if ((0, mosaic_service_common_1.isNullOrWhitespace)(containerImageTag)) {
|
|
107
|
+
errorMessages.push('[containerImageTag] is required and cannot be an empty string.');
|
|
108
108
|
}
|
|
109
109
|
if ((0, mosaic_service_common_1.isNullOrWhitespace)(pilets)) {
|
|
110
110
|
pilets = [];
|
|
@@ -118,7 +118,7 @@ const validateDeploymentArgs = (args) => {
|
|
|
118
118
|
serviceId,
|
|
119
119
|
manifestName,
|
|
120
120
|
pilets,
|
|
121
|
-
|
|
121
|
+
containerImageTag: containerImageTag,
|
|
122
122
|
hostingServiceBaseURL,
|
|
123
123
|
},
|
|
124
124
|
errorMessages,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"service-deploy.js","sourceRoot":"","sources":["../../../../../src/commands/hosting/service/deploy/service-deploy.ts"],"names":[],"mappings":"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"}
|
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.27",
|
|
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.27",
|
|
37
|
+
"@axinom/mosaic-service-common": "^0.35.0-rc.27",
|
|
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": "103acabfa2cde59adfbe805847fbab9f9ff91fac"
|
|
72
72
|
}
|
|
@@ -38,6 +38,13 @@ export const uploadDeploymentManifest = async (
|
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
+
if (manifestToUpload.serviceId !== args.serviceId) {
|
|
42
|
+
console.log(
|
|
43
|
+
`Service ID in the given Deployment Manifest does not match with the argument value. Please make sure the value of the argument given for Service ID matches the value in the Deployment Manifest.`,
|
|
44
|
+
);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
|
|
41
48
|
const axiosInstance: AxiosInstance = getAxiosInstance(
|
|
42
49
|
args.hostingServiceBaseURL,
|
|
43
50
|
serviceAccountToken.accessToken,
|
|
@@ -34,18 +34,9 @@ const piletRegister: CommandModule<unknown, GetRegisterPiletOptions> = {
|
|
|
34
34
|
alias: 's',
|
|
35
35
|
string: true,
|
|
36
36
|
})
|
|
37
|
-
.option('tenantId', {
|
|
38
|
-
describe: 'Tenant ID',
|
|
39
|
-
alias: 't',
|
|
40
|
-
string: true,
|
|
41
|
-
})
|
|
42
|
-
.option('environmentId', {
|
|
43
|
-
describe: 'Environment ID',
|
|
44
|
-
alias: 'e',
|
|
45
|
-
string: true,
|
|
46
|
-
})
|
|
47
37
|
.option('piletArtifactPath', {
|
|
48
|
-
describe:
|
|
38
|
+
describe:
|
|
39
|
+
'Path to the pilet artifact .tgz file or a directory containing the .tgz file',
|
|
49
40
|
alias: 'p',
|
|
50
41
|
string: true,
|
|
51
42
|
})
|
|
@@ -68,7 +59,12 @@ const piletRegister: CommandModule<unknown, GetRegisterPiletOptions> = {
|
|
|
68
59
|
},
|
|
69
60
|
handler: async (args) => {
|
|
70
61
|
// Validate arguments and read any arguments that are coming from environment variables.
|
|
71
|
-
const validatedArgs = validateArgs(args);
|
|
72
|
-
|
|
62
|
+
const [validatedArgs, errorMessages] = validateArgs(args);
|
|
63
|
+
|
|
64
|
+
if (errorMessages.length > 0) {
|
|
65
|
+
console.log(errorMessages);
|
|
66
|
+
} else {
|
|
67
|
+
await registerPilet(validatedArgs);
|
|
68
|
+
}
|
|
73
69
|
},
|
|
74
70
|
};
|
|
@@ -5,8 +5,6 @@ export interface GetRegisterPiletOptions {
|
|
|
5
5
|
serviceId?: string;
|
|
6
6
|
mosaicHostingClientId?: string;
|
|
7
7
|
mosaicHostingClientSecret?: string;
|
|
8
|
-
tenantId?: string;
|
|
9
|
-
environmentId?: string;
|
|
10
8
|
piletArtifactPath?: string;
|
|
11
9
|
idServiceAuthBaseURL?: string;
|
|
12
10
|
microFrontendServiceBaseURL?: string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getServiceAccountToken } from '@axinom/mosaic-id-link-be';
|
|
1
|
+
import { TokenResult, getServiceAccountToken } from '@axinom/mosaic-id-link-be';
|
|
2
2
|
import { isNullOrWhitespace } from '@axinom/mosaic-service-common';
|
|
3
3
|
import axios, { AxiosError } from 'axios';
|
|
4
4
|
import * as FormData from 'form-data';
|
|
@@ -9,11 +9,30 @@ import { GetRegisterPiletOptions } from './register-pilet-options';
|
|
|
9
9
|
export const registerPilet = async (
|
|
10
10
|
args: Required<GetRegisterPiletOptions>,
|
|
11
11
|
): Promise<void> => {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
let serviceAccountToken: TokenResult | undefined;
|
|
13
|
+
|
|
14
|
+
try {
|
|
15
|
+
serviceAccountToken = await getServiceAccountToken(
|
|
16
|
+
args.idServiceAuthBaseURL,
|
|
17
|
+
args.mosaicHostingClientId,
|
|
18
|
+
args.mosaicHostingClientSecret,
|
|
19
|
+
);
|
|
20
|
+
} catch (error) {
|
|
21
|
+
console.log(
|
|
22
|
+
`\nFailed to get the service account token. ${
|
|
23
|
+
(error as Error).message
|
|
24
|
+
}\n`,
|
|
25
|
+
);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// Extract the tenant/environment IDs from the access token
|
|
30
|
+
const { tenantId, environmentId } = JSON.parse(
|
|
31
|
+
Buffer.from(
|
|
32
|
+
serviceAccountToken.accessToken.split('.')[1],
|
|
33
|
+
'base64',
|
|
34
|
+
).toString(),
|
|
35
|
+
) as { tenantId: string; environmentId: string };
|
|
17
36
|
|
|
18
37
|
const data = new FormData();
|
|
19
38
|
|
|
@@ -27,20 +46,21 @@ export const registerPilet = async (
|
|
|
27
46
|
|
|
28
47
|
try {
|
|
29
48
|
const artifactToPublish = findArtifactToPublish(args.piletArtifactPath);
|
|
30
|
-
|
|
31
|
-
data.append('', createReadStream(artifactToPublish));
|
|
32
|
-
} else {
|
|
33
|
-
throw new Error(`No Pilet Artifact found at ${args.piletArtifactPath}.`);
|
|
34
|
-
}
|
|
49
|
+
data.append('', createReadStream(artifactToPublish));
|
|
35
50
|
} catch (error) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
);
|
|
51
|
+
console.log(`\n${(error as Error).message}`);
|
|
52
|
+
return;
|
|
39
53
|
}
|
|
40
54
|
|
|
41
55
|
try {
|
|
56
|
+
console.log(`\nRegistering pilet...`);
|
|
57
|
+
console.log(`path:\t\t${args.piletArtifactPath}`);
|
|
58
|
+
console.log(`tenantId:\t${tenantId}`);
|
|
59
|
+
console.log(`environmentId:\t${environmentId}`);
|
|
60
|
+
console.log(`serviceId:\t${args.serviceId}\n`);
|
|
61
|
+
|
|
42
62
|
const result = await axios.post(
|
|
43
|
-
`${args.microFrontendServiceBaseURL}/v1/pilets/${
|
|
63
|
+
`${args.microFrontendServiceBaseURL}/v1/pilets/${tenantId}/${environmentId}/${args.serviceId}/register?override=${args.overrideRegistration}`,
|
|
44
64
|
data,
|
|
45
65
|
config,
|
|
46
66
|
);
|
|
@@ -52,6 +72,7 @@ export const registerPilet = async (
|
|
|
52
72
|
'Registration of Pilet failed.',
|
|
53
73
|
(error as AxiosError).response?.data ?? (error as Error).message,
|
|
54
74
|
);
|
|
75
|
+
return;
|
|
55
76
|
}
|
|
56
77
|
};
|
|
57
78
|
|
|
@@ -64,82 +85,93 @@ export const registerPilet = async (
|
|
|
64
85
|
*/
|
|
65
86
|
export const validateArgs = (
|
|
66
87
|
args: GetRegisterPiletOptions,
|
|
67
|
-
): Required<GetRegisterPiletOptions
|
|
88
|
+
): [Required<GetRegisterPiletOptions>, string[]] => {
|
|
89
|
+
const errorMessages: string[] = [];
|
|
90
|
+
|
|
68
91
|
const idServiceAuthBaseURL =
|
|
69
|
-
args.idServiceAuthBaseURL ?? process.env.ID_SERVICE_AUTH_BASE_URL;
|
|
92
|
+
args.idServiceAuthBaseURL ?? process.env.ID_SERVICE_AUTH_BASE_URL ?? '';
|
|
70
93
|
const mosaicHostingClientId =
|
|
71
|
-
args.mosaicHostingClientId ?? process.env.MOSAIC_HOSTING_CLIENT_ID;
|
|
94
|
+
args.mosaicHostingClientId ?? process.env.MOSAIC_HOSTING_CLIENT_ID ?? '';
|
|
72
95
|
const mosaicHostingClientSecret =
|
|
73
|
-
args.mosaicHostingClientSecret ??
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const serviceId = args.serviceId ?? process.env.SERVICE_ID;
|
|
77
|
-
const piletArtifactPath =
|
|
96
|
+
args.mosaicHostingClientSecret ??
|
|
97
|
+
process.env.MOSAIC_HOSTING_CLIENT_SECRET ??
|
|
98
|
+
'';
|
|
99
|
+
const serviceId = args.serviceId ?? process.env.SERVICE_ID ?? '';
|
|
100
|
+
const piletArtifactPath =
|
|
101
|
+
args.piletArtifactPath ?? process.env.PILET_PATH ?? '';
|
|
78
102
|
const microFrontendServiceBaseURL =
|
|
79
103
|
args.microFrontendServiceBaseURL ??
|
|
80
|
-
process.env.MICRO_FRONTEND_SERVICE_BASE_URL
|
|
104
|
+
process.env.MICRO_FRONTEND_SERVICE_BASE_URL ??
|
|
105
|
+
'';
|
|
81
106
|
|
|
82
107
|
if (isNullOrWhitespace(idServiceAuthBaseURL)) {
|
|
83
|
-
|
|
108
|
+
errorMessages.push('[idServiceAuthBaseURL] is required.');
|
|
84
109
|
}
|
|
85
110
|
if (isNullOrWhitespace(mosaicHostingClientId)) {
|
|
86
|
-
|
|
111
|
+
errorMessages.push('[clientId] is required.');
|
|
87
112
|
}
|
|
88
113
|
if (isNullOrWhitespace(mosaicHostingClientSecret)) {
|
|
89
|
-
|
|
90
|
-
}
|
|
91
|
-
if (isNullOrWhitespace(tenantId)) {
|
|
92
|
-
throw new Error('tenantId is required.');
|
|
93
|
-
}
|
|
94
|
-
if (isNullOrWhitespace(environmentId)) {
|
|
95
|
-
throw new Error('environmentId is required,');
|
|
114
|
+
errorMessages.push('[clientSecret] is required.');
|
|
96
115
|
}
|
|
97
116
|
if (isNullOrWhitespace(serviceId)) {
|
|
98
|
-
|
|
117
|
+
errorMessages.push('[serviceId] is required.');
|
|
99
118
|
}
|
|
100
119
|
if (isNullOrWhitespace(piletArtifactPath)) {
|
|
101
|
-
|
|
120
|
+
errorMessages.push('[piletArtifactPath] is required,');
|
|
102
121
|
}
|
|
103
122
|
if (isNullOrWhitespace(microFrontendServiceBaseURL)) {
|
|
104
|
-
|
|
123
|
+
errorMessages.push('[microFrontendServiceBaseURL] is required.');
|
|
105
124
|
}
|
|
106
125
|
|
|
107
|
-
return
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
126
|
+
return [
|
|
127
|
+
{
|
|
128
|
+
idServiceAuthBaseURL,
|
|
129
|
+
mosaicHostingClientId,
|
|
130
|
+
mosaicHostingClientSecret,
|
|
131
|
+
serviceId,
|
|
132
|
+
piletArtifactPath,
|
|
133
|
+
microFrontendServiceBaseURL,
|
|
134
|
+
overrideRegistration: args.overrideRegistration ?? false,
|
|
135
|
+
},
|
|
136
|
+
errorMessages,
|
|
137
|
+
];
|
|
118
138
|
};
|
|
119
139
|
|
|
120
|
-
const findArtifactToPublish = (piletPath: string): string
|
|
140
|
+
const findArtifactToPublish = (piletPath: string): string => {
|
|
121
141
|
if (!existsSync(piletPath)) {
|
|
122
|
-
throw new Error(
|
|
142
|
+
throw new Error(
|
|
143
|
+
`The specified pilet artifact path [${piletPath}] does not exist.`,
|
|
144
|
+
);
|
|
123
145
|
}
|
|
124
146
|
|
|
125
|
-
const files = readdirSync(piletPath);
|
|
126
147
|
const tgzFiles: string[] = [];
|
|
127
148
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
149
|
+
// Is the path a directory?
|
|
150
|
+
if (lstatSync(piletPath).isDirectory()) {
|
|
151
|
+
const files = readdirSync(piletPath);
|
|
152
|
+
|
|
153
|
+
for (let i = 0; i < files.length; i++) {
|
|
154
|
+
const filename = path.join(piletPath, files[i]);
|
|
155
|
+
const stat = lstatSync(filename);
|
|
156
|
+
if (!stat.isDirectory() && filename.endsWith('.tgz')) {
|
|
157
|
+
tgzFiles.push(filename);
|
|
158
|
+
}
|
|
133
159
|
}
|
|
160
|
+
} // Path is a file
|
|
161
|
+
else {
|
|
162
|
+
tgzFiles.push(piletPath);
|
|
134
163
|
}
|
|
135
164
|
|
|
136
165
|
if (tgzFiles.length > 1) {
|
|
137
166
|
throw new Error(
|
|
138
|
-
`Found more than one .tgz files in the folder ${piletPath}. Please make sure only one .tgz file exists
|
|
167
|
+
`Found more than one .tgz files in the folder [${piletPath}]. Please make sure only one .tgz file exists or specify the path to the .tgz file.`,
|
|
139
168
|
);
|
|
140
169
|
}
|
|
170
|
+
|
|
141
171
|
if (tgzFiles.length === 0) {
|
|
142
|
-
throw new Error(
|
|
172
|
+
throw new Error(
|
|
173
|
+
`No .tgz files found at pilet artifact path [${piletPath}].`,
|
|
174
|
+
);
|
|
143
175
|
}
|
|
144
176
|
|
|
145
177
|
return tgzFiles[0];
|
|
@@ -18,9 +18,10 @@ export const serviceDeploy: CommandModule<unknown, GetServiceDeployOptions> = {
|
|
|
18
18
|
alias: 'i',
|
|
19
19
|
string: true,
|
|
20
20
|
})
|
|
21
|
-
.option('
|
|
22
|
-
describe:
|
|
23
|
-
|
|
21
|
+
.option('containerImageTag', {
|
|
22
|
+
describe:
|
|
23
|
+
'Tag of the container image to be used in the deployment. i.e: It should be the <tag> from the container image format <username>/<repository_name>:<tag>.',
|
|
24
|
+
alias: 't',
|
|
24
25
|
string: true,
|
|
25
26
|
demandOption: true,
|
|
26
27
|
})
|
|
@@ -54,7 +54,7 @@ export const deployService = async (
|
|
|
54
54
|
}`,
|
|
55
55
|
variables: {
|
|
56
56
|
serviceDefinitionId: deploymentDetails.serviceDefinitionId,
|
|
57
|
-
containerImageVersion: args.
|
|
57
|
+
containerImageVersion: args.containerImageTag,
|
|
58
58
|
serviceDeploymentConfigurationId: deploymentDetails.deploymentManifestId,
|
|
59
59
|
servicePiletArtifactIds: deploymentDetails.piletArtifactIds,
|
|
60
60
|
name: args.name,
|
|
@@ -123,7 +123,7 @@ export const validateDeploymentArgs = (
|
|
|
123
123
|
args.hostingServiceBaseURL ?? process.env.HOSTING_SERVICE_BASE_URL ?? '';
|
|
124
124
|
|
|
125
125
|
const manifestName = args.manifestName;
|
|
126
|
-
const
|
|
126
|
+
const containerImageTag = args.containerImageTag;
|
|
127
127
|
let pilets = args.pilets;
|
|
128
128
|
|
|
129
129
|
if (isNullOrWhitespace(idServiceAuthBaseURL)) {
|
|
@@ -148,9 +148,9 @@ export const validateDeploymentArgs = (
|
|
|
148
148
|
'[manifestName] is required and cannot be an empty string.',
|
|
149
149
|
);
|
|
150
150
|
}
|
|
151
|
-
if (isNullOrWhitespace(
|
|
151
|
+
if (isNullOrWhitespace(containerImageTag)) {
|
|
152
152
|
errorMessages.push(
|
|
153
|
-
'[
|
|
153
|
+
'[containerImageTag] is required and cannot be an empty string.',
|
|
154
154
|
);
|
|
155
155
|
}
|
|
156
156
|
|
|
@@ -167,7 +167,7 @@ export const validateDeploymentArgs = (
|
|
|
167
167
|
serviceId,
|
|
168
168
|
manifestName,
|
|
169
169
|
pilets,
|
|
170
|
-
|
|
170
|
+
containerImageTag: containerImageTag,
|
|
171
171
|
hostingServiceBaseURL,
|
|
172
172
|
},
|
|
173
173
|
errorMessages,
|