@axway/axway-central-cli 2.10.1 → 2.10.2
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.
|
@@ -89,7 +89,8 @@ als:
|
|
|
89
89
|
keysSecretName: {{istioAgentValues.keysSecretName}}
|
|
90
90
|
publishHeaders: true
|
|
91
91
|
|
|
92
|
-
|
|
92
|
+
istioGatewayNamespaces:
|
|
93
|
+
- {{istioAgentValues.envoyFilterNamespace}}
|
|
93
94
|
|
|
94
95
|
# discovers API Documentation
|
|
95
96
|
ada:
|
|
@@ -105,7 +105,11 @@ https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/m
|
|
|
105
105
|
const {
|
|
106
106
|
error
|
|
107
107
|
} = await _Kubectl.kubectl.isInstalled();
|
|
108
|
-
|
|
108
|
+
|
|
109
|
+
if (error) {
|
|
110
|
+
throw new Error(`Kubectl is required to fill out the following prompts. It appears to be missing or misconfigured.\n${error}`);
|
|
111
|
+
}
|
|
112
|
+
|
|
109
113
|
const istioOverrides = await setupIstio(istioValues);
|
|
110
114
|
installConfig.gatewayConfig = istioValues; // Set up the following values from installConfig to be used in setupKubernetes
|
|
111
115
|
|
|
@@ -113,7 +113,7 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
|
|
|
113
113
|
} // Get the DA Agent name
|
|
114
114
|
|
|
115
115
|
|
|
116
|
-
centralConfig.daAgentName = ''; //
|
|
116
|
+
centralConfig.daAgentName = ''; // Istio will not prompt for agent name. Remove when that ability exists
|
|
117
117
|
|
|
118
118
|
if (installConfig.switches.isDaEnabled && installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
|
|
119
119
|
centralConfig.daAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.da, centralConfig.ampcEnvInfo.name);
|
|
@@ -148,7 +148,7 @@ const finalizeCentralInstall = async (apiServerClient, platformClient, defsManag
|
|
|
148
148
|
installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', {
|
|
149
149
|
axwayManaged: installConfig.centralConfig.axwayManaged,
|
|
150
150
|
production: installConfig.centralConfig.production
|
|
151
|
-
}) : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource unless gateway type is
|
|
151
|
+
}) : installConfig.centralConfig.ampcEnvInfo.name; // Create DiscoveryAgent Resource unless gateway type is Istio. This can be removed when this is available for Istio
|
|
152
152
|
|
|
153
153
|
if (installConfig.gatewayType !== _types.GatewayTypes.ISTIO) {
|
|
154
154
|
if (installConfig.centralConfig.daAgentName != '') {
|
package/dist/common/Kubectl.js
CHANGED
|
@@ -63,10 +63,15 @@ class Kubectl {
|
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
async execKubectl(action, resource) {
|
|
66
|
-
|
|
66
|
+
let {
|
|
67
67
|
stdout,
|
|
68
68
|
stderr
|
|
69
69
|
} = await exec(`kubectl ${action} | awk ${quotes}{print $1}${quotes}`);
|
|
70
|
+
|
|
71
|
+
if (stderr.includes('WARNING')) {
|
|
72
|
+
stderr = '';
|
|
73
|
+
}
|
|
74
|
+
|
|
70
75
|
return stderr ? {
|
|
71
76
|
data: null,
|
|
72
77
|
error: `K8S ${resource}: ${stderr}`
|
package/dist/common/types.js
CHANGED
|
@@ -281,7 +281,7 @@ const GatewayTypeToDataPlane = {
|
|
|
281
281
|
[GatewayTypes.EDGE_GATEWAY_ONLY]: DataPlaneNames.EDGE,
|
|
282
282
|
[GatewayTypes.AWS_GATEWAY]: DataPlaneNames.AWS,
|
|
283
283
|
[GatewayTypes.AZURE_GATEWAY]: DataPlaneNames.AZURE,
|
|
284
|
-
[GatewayTypes.ISTIO]: '
|
|
284
|
+
[GatewayTypes.ISTIO]: 'Istio'
|
|
285
285
|
};
|
|
286
286
|
exports.GatewayTypeToDataPlane = GatewayTypeToDataPlane;
|
|
287
287
|
let AgentResourceKind;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axway/axway-central-cli",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.2",
|
|
4
4
|
"description": "Manage APIs, services and publish to the Unified Catalog",
|
|
5
5
|
"homepage": "https://platform.axway.com",
|
|
6
6
|
"author": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
],
|
|
22
22
|
"repository": {
|
|
23
23
|
"type": "git",
|
|
24
|
-
"url": "https://git.ecd.axway.
|
|
24
|
+
"url": "https://git.ecd.axway.org/apigov/apicentral-cli.git"
|
|
25
25
|
},
|
|
26
26
|
"scripts": {
|
|
27
27
|
"build": "babel src --extensions .ts -d dist --ignore src/**/*.spec.ts,src/**/*.spec.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"name": "central"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@axway/amplify-cli-utils": "^5.0.
|
|
44
|
+
"@axway/amplify-cli-utils": "^5.0.8",
|
|
45
45
|
"chalk": "^4.1.2",
|
|
46
46
|
"cli-kit": "^1.15.0",
|
|
47
47
|
"dayjs": "^1.11.0",
|
|
@@ -51,20 +51,20 @@
|
|
|
51
51
|
"fs-extra": "^10.0.1",
|
|
52
52
|
"g": "^2.0.1",
|
|
53
53
|
"handlebars": "^4.7.7",
|
|
54
|
-
"inquirer": "^8.2.
|
|
54
|
+
"inquirer": "^8.2.2",
|
|
55
55
|
"js-yaml": "^4.1.0",
|
|
56
56
|
"lodash": "^4.17.21",
|
|
57
57
|
"node-cache": "^5.1.2",
|
|
58
|
-
"npm-check-updates": "^12.5.
|
|
58
|
+
"npm-check-updates": "^12.5.8",
|
|
59
59
|
"ora": "^5.4.1",
|
|
60
60
|
"promise-limit": "^2.7.0",
|
|
61
|
-
"semver": "^7.3.
|
|
61
|
+
"semver": "^7.3.6",
|
|
62
62
|
"snooplogg": "^3.0.2",
|
|
63
63
|
"tmp": "^0.2.1"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
66
|
"@babel/cli": "^7.17.6",
|
|
67
|
-
"@babel/core": "^7.17.
|
|
67
|
+
"@babel/core": "^7.17.9",
|
|
68
68
|
"@babel/plugin-proposal-class-properties": "^7.16.7",
|
|
69
69
|
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
|
|
70
70
|
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
|
|
@@ -74,11 +74,11 @@
|
|
|
74
74
|
"@types/chai-as-promised": "^7.1.5",
|
|
75
75
|
"@types/form-data": "^2.5.0",
|
|
76
76
|
"@types/fs-extra": "^9.0.13",
|
|
77
|
-
"@types/inquirer": "^8.2.
|
|
77
|
+
"@types/inquirer": "^8.2.1",
|
|
78
78
|
"@types/js-yaml": "^4.0.5",
|
|
79
|
-
"@types/lodash": "^4.14.
|
|
79
|
+
"@types/lodash": "^4.14.181",
|
|
80
80
|
"@types/mocha": "^9.1.0",
|
|
81
|
-
"@types/node": "^17.0.
|
|
81
|
+
"@types/node": "^17.0.23",
|
|
82
82
|
"@types/rx": "^4.1.2",
|
|
83
83
|
"@types/semver": "^7.3.9",
|
|
84
84
|
"@types/sinon": "^10.0.11",
|
|
@@ -93,11 +93,11 @@
|
|
|
93
93
|
"nock": "^13.2.4",
|
|
94
94
|
"nodemon": "^2.0.15",
|
|
95
95
|
"nyc": "^15.1.0",
|
|
96
|
-
"prettier": "^2.6.
|
|
96
|
+
"prettier": "^2.6.2",
|
|
97
97
|
"sinon": "^11.1.2",
|
|
98
98
|
"source-map-support": "^0.5.21",
|
|
99
99
|
"ts-mocha": "^9.0.2",
|
|
100
|
-
"typescript": "^4.6.
|
|
100
|
+
"typescript": "^4.6.3"
|
|
101
101
|
},
|
|
102
102
|
"jest": {
|
|
103
103
|
"verbose": true,
|