@axway/axway-central-cli 4.11.0 → 4.12.0
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.
|
@@ -25,7 +25,7 @@ const STAGE_TAG_NAME_LENGTH = 127;
|
|
|
25
25
|
let DeploymentTypes = exports.DeploymentTypes = /*#__PURE__*/function (DeploymentTypes) {
|
|
26
26
|
DeploymentTypes["EC2"] = "EC2";
|
|
27
27
|
DeploymentTypes["ECS_FARGATE"] = "ECS Fargate";
|
|
28
|
-
DeploymentTypes["OTHER"] = "Other";
|
|
28
|
+
DeploymentTypes["OTHER"] = "Other"; //Docker Container Only
|
|
29
29
|
return DeploymentTypes;
|
|
30
30
|
}({}); // EC2InstanceTypes - instance types allowed in cloud formation document
|
|
31
31
|
var EC2InstanceTypes = /*#__PURE__*/function (EC2InstanceTypes) {
|
|
@@ -23,7 +23,7 @@ class ProductizationHelper {
|
|
|
23
23
|
const sortedDefsArray = Array.from(sortedDefsMap.values());
|
|
24
24
|
let bulkResultMap = new Map();
|
|
25
25
|
for (const resource of resources) {
|
|
26
|
-
var _resource$spec, _resource$spec$apiSer, _resource$metadata, _resource$metadata$sc, _resource$spec6, _resource$spec6$apiSe, _resource$metadata2, _resource$
|
|
26
|
+
var _resource$spec, _resource$spec$apiSer, _resource$metadata, _resource$metadata$sc, _resource$spec6, _resource$spec6$apiSe, _resource$metadata2, _resource$spec13, _resource$spec13$apiS;
|
|
27
27
|
let bulkResult = {
|
|
28
28
|
success: [],
|
|
29
29
|
error: [],
|
|
@@ -84,7 +84,7 @@ class ProductizationHelper {
|
|
|
84
84
|
}
|
|
85
85
|
let assetResourcesResult = await this.createAssetResourcesForAPIServiceProductization(apiSvc.data, sortedDefsMap, apiServiceInstances, transferOwnership);
|
|
86
86
|
if (assetResourcesResult.error.length > 0) {
|
|
87
|
-
var _assetResourcesResult, _resource$
|
|
87
|
+
var _assetResourcesResult, _resource$spec0, _resource$spec0$apiSe;
|
|
88
88
|
// if there is an error at any stage while productizing an api service,
|
|
89
89
|
// clean up the resources created until that stage to avoid duplicate resources hanging around
|
|
90
90
|
const asset = (_assetResourcesResult = assetResourcesResult.warning) === null || _assetResourcesResult === void 0 ? void 0 : _assetResourcesResult.find(result => result.kind === _types.Kind.Asset);
|
|
@@ -92,7 +92,7 @@ class ProductizationHelper {
|
|
|
92
92
|
await this.cleanupResourcesOnFailure(asset, assetResourceDef);
|
|
93
93
|
}
|
|
94
94
|
bulkResult.error.push(...assetResourcesResult.error);
|
|
95
|
-
bulkResultMap.set((_resource$
|
|
95
|
+
bulkResultMap.set((_resource$spec0 = resource.spec) === null || _resource$spec0 === void 0 ? void 0 : (_resource$spec0$apiSe = _resource$spec0.apiService) === null || _resource$spec0$apiSe === void 0 ? void 0 : _resource$spec0$apiSe.name, bulkResult);
|
|
96
96
|
continue;
|
|
97
97
|
}
|
|
98
98
|
const assetName = (_assetResourcesResult2 = assetResourcesResult.warning) === null || _assetResourcesResult2 === void 0 ? void 0 : (_assetResourcesResult3 = _assetResourcesResult2.find(res => res.kind === _types.Kind.Asset)) === null || _assetResourcesResult3 === void 0 ? void 0 : _assetResourcesResult3.name;
|
|
@@ -121,40 +121,40 @@ class ProductizationHelper {
|
|
|
121
121
|
}
|
|
122
122
|
if (productResourcesResult.warning) (_bulkResult$warning2 = bulkResult.warning) === null || _bulkResult$warning2 === void 0 ? void 0 : _bulkResult$warning2.push(...productResourcesResult.warning);
|
|
123
123
|
} else {
|
|
124
|
-
var _resource$
|
|
124
|
+
var _resource$spec1, _resource$spec1$apiSe;
|
|
125
125
|
if (assetResourcesResult.warning && assetResourcesResult.warning.length > 0) {
|
|
126
126
|
const asset = assetResourcesResult.warning.find(result => result.kind === _types.Kind.Asset);
|
|
127
127
|
asset ? await this.cleanupResourcesOnFailure(asset, assetResourceDef) : undefined;
|
|
128
128
|
}
|
|
129
129
|
bulkResult.error.push({
|
|
130
|
-
name: resource === null || resource === void 0 ? void 0 : (_resource$
|
|
130
|
+
name: resource === null || resource === void 0 ? void 0 : (_resource$spec1 = resource.spec) === null || _resource$spec1 === void 0 ? void 0 : (_resource$spec1$apiSe = _resource$spec1.apiService) === null || _resource$spec1$apiSe === void 0 ? void 0 : _resource$spec1$apiSe.name,
|
|
131
131
|
kind: _types.Kind.Asset,
|
|
132
132
|
error: new Error('Asset status not set to active while productizing api service')
|
|
133
133
|
});
|
|
134
134
|
}
|
|
135
135
|
});
|
|
136
136
|
} else {
|
|
137
|
-
var _resource$
|
|
137
|
+
var _resource$spec10, _resource$spec10$apiS;
|
|
138
138
|
if (assetResourcesResult.warning && assetResourcesResult.warning.length > 0) {
|
|
139
139
|
const asset = assetResourcesResult.warning.find(result => result.kind === _types.Kind.Asset);
|
|
140
140
|
asset ? await this.cleanupResourcesOnFailure(asset, assetResourceDef) : undefined;
|
|
141
141
|
}
|
|
142
142
|
bulkResult.error.push({
|
|
143
|
-
name: resource === null || resource === void 0 ? void 0 : (_resource$
|
|
143
|
+
name: resource === null || resource === void 0 ? void 0 : (_resource$spec10 = resource.spec) === null || _resource$spec10 === void 0 ? void 0 : (_resource$spec10$apiS = _resource$spec10.apiService) === null || _resource$spec10$apiS === void 0 ? void 0 : _resource$spec10$apiS.name,
|
|
144
144
|
kind: _types.Kind.ReleaseTag,
|
|
145
145
|
error: new Error('Unable to get asset release status while productizing api service')
|
|
146
146
|
});
|
|
147
147
|
}
|
|
148
148
|
});
|
|
149
149
|
} else {
|
|
150
|
-
var _resource$
|
|
150
|
+
var _resource$spec11, _resource$spec11$apiS, _resource$spec12, _resource$spec12$apiS, _resource$metadata4;
|
|
151
151
|
bulkResult.error.push({
|
|
152
|
-
name: resource === null || resource === void 0 ? void 0 : (_resource$
|
|
152
|
+
name: resource === null || resource === void 0 ? void 0 : (_resource$spec11 = resource.spec) === null || _resource$spec11 === void 0 ? void 0 : (_resource$spec11$apiS = _resource$spec11.apiService) === null || _resource$spec11$apiS === void 0 ? void 0 : _resource$spec11$apiS.name,
|
|
153
153
|
kind: resource.kind,
|
|
154
|
-
error: new Error('Unable to find API Service with name: ' + (resource === null || resource === void 0 ? void 0 : (_resource$
|
|
154
|
+
error: new Error('Unable to find API Service with name: ' + (resource === null || resource === void 0 ? void 0 : (_resource$spec12 = resource.spec) === null || _resource$spec12 === void 0 ? void 0 : (_resource$spec12$apiS = _resource$spec12.apiService) === null || _resource$spec12$apiS === void 0 ? void 0 : _resource$spec12$apiS.name) + ' in Environment scope: ' + ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.scope.name))
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
|
-
bulkResultMap.set((_resource$
|
|
157
|
+
bulkResultMap.set((_resource$spec13 = resource.spec) === null || _resource$spec13 === void 0 ? void 0 : (_resource$spec13$apiS = _resource$spec13.apiService) === null || _resource$spec13$apiS === void 0 ? void 0 : _resource$spec13$apiS.name, bulkResult);
|
|
158
158
|
}
|
|
159
159
|
return bulkResultMap;
|
|
160
160
|
}
|
|
@@ -885,18 +885,18 @@ class ApiServerClient {
|
|
|
885
885
|
const sortedDefsArray = Array.from(sortedDefsMap.values());
|
|
886
886
|
const applyResults = [];
|
|
887
887
|
for (const resource of resources) {
|
|
888
|
-
var _resource$
|
|
888
|
+
var _resource$metadata10, _resource$metadata11, _resource$metadata11$, _resource$name2, _singleResult$error, _applyResult$error3;
|
|
889
889
|
const resourceDef = sortedDefsArray.find(def => {
|
|
890
890
|
var _def$spec$scope3, _resource$metadata9, _resource$metadata9$s;
|
|
891
891
|
return def.spec.kind === resource.kind && ((_def$spec$scope3 = def.spec.scope) === null || _def$spec$scope3 === void 0 ? void 0 : _def$spec$scope3.kind) === ((_resource$metadata9 = resource.metadata) === null || _resource$metadata9 === void 0 ? void 0 : (_resource$metadata9$s = _resource$metadata9.scope) === null || _resource$metadata9$s === void 0 ? void 0 : _resource$metadata9$s.kind);
|
|
892
892
|
});
|
|
893
893
|
// the check below is already happening when loading the specs but checking again just in case.
|
|
894
894
|
if (!resourceDef) {
|
|
895
|
-
var _resource$
|
|
895
|
+
var _resource$metadata0, _resource$metadata0$s, _resource$name;
|
|
896
896
|
let errorMessage = `No resource definition found for "kind/${resource.kind}"`;
|
|
897
|
-
if (!!((_resource$
|
|
898
|
-
var _resource$
|
|
899
|
-
errorMessage += ` in the scope "${(_resource$
|
|
897
|
+
if (!!((_resource$metadata0 = resource.metadata) !== null && _resource$metadata0 !== void 0 && (_resource$metadata0$s = _resource$metadata0.scope) !== null && _resource$metadata0$s !== void 0 && _resource$metadata0$s.kind)) {
|
|
898
|
+
var _resource$metadata1, _resource$metadata1$s;
|
|
899
|
+
errorMessage += ` in the scope "${(_resource$metadata1 = resource.metadata) === null || _resource$metadata1 === void 0 ? void 0 : (_resource$metadata1$s = _resource$metadata1.scope) === null || _resource$metadata1$s === void 0 ? void 0 : _resource$metadata1$s.kind}".`;
|
|
900
900
|
} else {
|
|
901
901
|
errorMessage += ' with no scope.';
|
|
902
902
|
}
|
|
@@ -909,8 +909,8 @@ class ApiServerClient {
|
|
|
909
909
|
});
|
|
910
910
|
continue;
|
|
911
911
|
}
|
|
912
|
-
const scopeDef = !!((_resource$
|
|
913
|
-
const scopeName = (_resource$
|
|
912
|
+
const scopeDef = !!((_resource$metadata10 = resource.metadata) !== null && _resource$metadata10 !== void 0 && _resource$metadata10.scope) ? sortedDefsArray.find(def => def.spec.kind === resource.metadata.scope.kind && !def.spec.scope) : undefined;
|
|
913
|
+
const scopeName = (_resource$metadata11 = resource.metadata) === null || _resource$metadata11 === void 0 ? void 0 : (_resource$metadata11$ = _resource$metadata11.scope) === null || _resource$metadata11$ === void 0 ? void 0 : _resource$metadata11$.name;
|
|
914
914
|
const resourceName = (_resource$name2 = resource.name) !== null && _resource$name2 !== void 0 ? _resource$name2 : 'Unknown name';
|
|
915
915
|
|
|
916
916
|
// only making getResource call if resource has a name
|
|
@@ -1015,19 +1015,19 @@ class ApiServerClient {
|
|
|
1015
1015
|
};
|
|
1016
1016
|
for (const resource of resources) {
|
|
1017
1017
|
try {
|
|
1018
|
-
var _resource$
|
|
1018
|
+
var _resource$metadata13, _resource$metadata14, _resource$metadata14$;
|
|
1019
1019
|
const resourceDef = sortedDefsArray.find(def => {
|
|
1020
|
-
var _def$spec$scope4, _resource$
|
|
1021
|
-
return def.spec.kind === resource.kind && ((_def$spec$scope4 = def.spec.scope) === null || _def$spec$scope4 === void 0 ? void 0 : _def$spec$scope4.kind) === ((_resource$
|
|
1020
|
+
var _def$spec$scope4, _resource$metadata12, _resource$metadata12$;
|
|
1021
|
+
return def.spec.kind === resource.kind && ((_def$spec$scope4 = def.spec.scope) === null || _def$spec$scope4 === void 0 ? void 0 : _def$spec$scope4.kind) === ((_resource$metadata12 = resource.metadata) === null || _resource$metadata12 === void 0 ? void 0 : (_resource$metadata12$ = _resource$metadata12.scope) === null || _resource$metadata12$ === void 0 ? void 0 : _resource$metadata12$.kind);
|
|
1022
1022
|
});
|
|
1023
|
-
const scopeDef = !!((_resource$
|
|
1024
|
-
const scopeName = (_resource$
|
|
1023
|
+
const scopeDef = !!((_resource$metadata13 = resource.metadata) !== null && _resource$metadata13 !== void 0 && _resource$metadata13.scope) ? sortedDefsArray.find(def => def.spec.kind === resource.metadata.scope.kind && !def.spec.scope) : undefined;
|
|
1024
|
+
const scopeName = (_resource$metadata14 = resource.metadata) === null || _resource$metadata14 === void 0 ? void 0 : (_resource$metadata14$ = _resource$metadata14.scope) === null || _resource$metadata14$ === void 0 ? void 0 : _resource$metadata14$.name;
|
|
1025
1025
|
if (!resourceDef) {
|
|
1026
|
-
var _resource$
|
|
1026
|
+
var _resource$metadata15, _resource$metadata15$;
|
|
1027
1027
|
let errorMessage = `No resource definition found for "kind/${resource.kind}"`;
|
|
1028
|
-
if (!!((_resource$
|
|
1029
|
-
var _resource$
|
|
1030
|
-
errorMessage += ` in the scope "${(_resource$
|
|
1028
|
+
if (!!((_resource$metadata15 = resource.metadata) !== null && _resource$metadata15 !== void 0 && (_resource$metadata15$ = _resource$metadata15.scope) !== null && _resource$metadata15$ !== void 0 && _resource$metadata15$.kind)) {
|
|
1029
|
+
var _resource$metadata16, _resource$metadata16$;
|
|
1030
|
+
errorMessage += ` in the scope "${(_resource$metadata16 = resource.metadata) === null || _resource$metadata16 === void 0 ? void 0 : (_resource$metadata16$ = _resource$metadata16.scope) === null || _resource$metadata16$ === void 0 ? void 0 : _resource$metadata16$.kind}".`;
|
|
1031
1031
|
} else {
|
|
1032
1032
|
errorMessage += ' with no scope.';
|
|
1033
1033
|
}
|
|
@@ -18,7 +18,18 @@ let CliConfigKeys = exports.CliConfigKeys = /*#__PURE__*/function (CliConfigKeys
|
|
|
18
18
|
CliConfigKeys["ACCOUNT"] = "account";
|
|
19
19
|
CliConfigKeys["REGION"] = "region";
|
|
20
20
|
CliConfigKeys["PLATFORM"] = "platform";
|
|
21
|
+
/*
|
|
22
|
+
note: "extensions" key is an object, current list of possible keys:
|
|
23
|
+
extensions.apigee
|
|
24
|
+
extensions.azure
|
|
25
|
+
extensions.bitbucket
|
|
26
|
+
extensions.github
|
|
27
|
+
extensions.layer7
|
|
28
|
+
extensions.mulesoft
|
|
29
|
+
extensions.swaggerhub
|
|
30
|
+
*/
|
|
21
31
|
CliConfigKeys["EXTENSIONS"] = "extensions";
|
|
32
|
+
// deprecated, keeping it here just for "unset" command, remove when all related functionality is gone
|
|
22
33
|
CliConfigKeys["CLIENT_ID"] = "client-id";
|
|
23
34
|
return CliConfigKeys;
|
|
24
35
|
}({});
|
package/dist/common/types.js
CHANGED
|
@@ -57,6 +57,7 @@ let ConfigTypes = exports.ConfigTypes = /*#__PURE__*/function (ConfigTypes) {
|
|
|
57
57
|
ConfigTypes["REGION"] = "region";
|
|
58
58
|
ConfigTypes["PLATFORM"] = "platform";
|
|
59
59
|
ConfigTypes["AXWAY_MANAGED"] = "axway-managed";
|
|
60
|
+
// deprecated, keeping it here just for old logic, remove when all related functionality is gone
|
|
60
61
|
ConfigTypes["CLIENT_ID"] = "client-id";
|
|
61
62
|
return ConfigTypes;
|
|
62
63
|
}({});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axway/axway-central-cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.12.0",
|
|
4
4
|
"description": "Manage APIs, services and publish to the Amplify Marketplace",
|
|
5
5
|
"homepage": "https://platform.axway.com",
|
|
6
6
|
"author": {
|
|
@@ -54,14 +54,14 @@
|
|
|
54
54
|
"extract-zip": "^2.0.1",
|
|
55
55
|
"form-data": "^4.0.0",
|
|
56
56
|
"fs-extra": "^10.1.0",
|
|
57
|
-
"handlebars": "^4.7.
|
|
57
|
+
"handlebars": "^4.7.9",
|
|
58
58
|
"http-cache-semantics": "^4.1.1",
|
|
59
59
|
"inquirer": "^8.2.4",
|
|
60
60
|
"js-yaml": "^4.1.0",
|
|
61
61
|
"json5": "^2.2.3",
|
|
62
62
|
"lodash": "^4.17.21",
|
|
63
63
|
"node-cache": "^5.1.2",
|
|
64
|
-
"npm-check-updates": "
|
|
64
|
+
"npm-check-updates": "^21.0.0",
|
|
65
65
|
"ora": "^5.4.1",
|
|
66
66
|
"promise-limit": "^2.7.0",
|
|
67
67
|
"semver": "^7.3.7",
|
|
@@ -95,28 +95,17 @@
|
|
|
95
95
|
"chai": "^4.3.7",
|
|
96
96
|
"chai-as-promised": "^7.1.1",
|
|
97
97
|
"core-js": "^3.22.8",
|
|
98
|
-
"mocha": "^
|
|
98
|
+
"mocha": "^11.0.0",
|
|
99
99
|
"nock": "^13.3.0",
|
|
100
100
|
"nodemon": "^2.0.18",
|
|
101
101
|
"nyc": "^15.1.0",
|
|
102
102
|
"prettier": "^2.6.2",
|
|
103
103
|
"sinon": "^15.0.3",
|
|
104
104
|
"source-map-support": "^0.5.21",
|
|
105
|
-
"ts-mocha": "^
|
|
105
|
+
"ts-mocha": "^11.0.0",
|
|
106
|
+
"ts-node": "^10.9.2",
|
|
106
107
|
"typescript": "^4.7.2"
|
|
107
108
|
},
|
|
108
|
-
"jest": {
|
|
109
|
-
"verbose": true,
|
|
110
|
-
"roots": [
|
|
111
|
-
"<rootDir>"
|
|
112
|
-
],
|
|
113
|
-
"modulePaths": [
|
|
114
|
-
"<rootDir>"
|
|
115
|
-
],
|
|
116
|
-
"moduleDirectories": [
|
|
117
|
-
"node_modules"
|
|
118
|
-
]
|
|
119
|
-
},
|
|
120
109
|
"prettier": {
|
|
121
110
|
"bracketSpacing": true,
|
|
122
111
|
"printWidth": 120,
|