@osaas/cli 4.27.1 → 4.27.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.
- package/dist/admin/instance.d.ts.map +1 -1
- package/dist/admin/instance.js +10 -10
- package/dist/admin/instance.js.map +1 -1
- package/package.json +2 -2
- package/src/admin/instance.ts +18 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/admin/instance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/admin/instance.ts"],"names":[],"mappings":"AAQA,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,EAAE,CAAC,CAQnB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,iBAQpB;AAED,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,iBAchB;AAED,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAkBpD"}
|
package/dist/admin/instance.js
CHANGED
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getInstancesToRemove = exports.suspendInstanceForTenant = exports.removeInstanceForTenant = exports.listInstancesForTenant = void 0;
|
|
4
4
|
const client_core_1 = require("@osaas/client-core");
|
|
5
5
|
const token_1 = require("./token");
|
|
6
|
-
const subscription_1 = require("./subscription");
|
|
7
6
|
async function listInstancesForTenant(tenantId, serviceId, environment) {
|
|
8
7
|
const pat = (0, token_1.generatePat)(tenantId, 'osc-admin');
|
|
9
8
|
const ctx = new client_core_1.Context({ personalAccessToken: pat, environment });
|
|
@@ -32,15 +31,16 @@ async function suspendInstanceForTenant(tenantId, serviceId, name, environment,
|
|
|
32
31
|
}
|
|
33
32
|
exports.suspendInstanceForTenant = suspendInstanceForTenant;
|
|
34
33
|
async function getInstancesToRemove(tenantId, environment) {
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
34
|
+
const instancesUrl = `https://deploy.svc.${environment}.osaas.io/instances/${tenantId}`;
|
|
35
|
+
const instances = await (0, client_core_1.createFetch)(instancesUrl, {
|
|
36
|
+
headers: {
|
|
37
|
+
Authorization: `Bearer ${(0, token_1.apiKey)()}`
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
return instances.map(({ serviceId, instanceName }) => ({
|
|
41
|
+
serviceId,
|
|
42
|
+
instance: instanceName
|
|
43
|
+
}));
|
|
44
44
|
}
|
|
45
45
|
exports.getInstancesToRemove = getInstancesToRemove;
|
|
46
46
|
//# sourceMappingURL=instance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../src/admin/instance.ts"],"names":[],"mappings":";;;AAAA,oDAK4B;AAC5B,mCAA8C;
|
|
1
|
+
{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../src/admin/instance.ts"],"names":[],"mappings":";;;AAAA,oDAK4B;AAC5B,mCAA8C;AAEvC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,SAAiB,EACjB,WAAmB;IAEnB,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE/C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,mBAAmB,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IACnE,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAEtE,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAa,EAAC,GAAG,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAC1E,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAZD,wDAYC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,QAAgB,EAChB,SAAiB,EACjB,IAAY,EACZ,WAAmB;IAEnB,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE/C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,mBAAmB,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IACnE,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAEtE,MAAM,IAAA,4BAAc,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;AACjE,CAAC;AAZD,0DAYC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,QAAgB,EAChB,SAAiB,EACjB,IAAY,EACZ,WAAmB,EACnB,MAAe;IAEf,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,cAAc,SAAS,IAAI,IAAI,EAAE,EACjC,sBAAsB,WAAW,WAAW,CAC7C,CAAC;IACF,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE;QAC5B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,IAAA,cAAM,GAAE,EAAE;SACpC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;KAC7E,CAAC,CAAC;AACL,CAAC;AAnBD,4DAmBC;AAEM,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,WAAmB;IAEnB,MAAM,YAAY,GAAG,sBAAsB,WAAW,uBAAuB,QAAQ,EAAE,CAAC;IACxF,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAW,EAOjC,YAAY,EAAE;QACd,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,IAAA,cAAM,GAAE,EAAE;SACpC;KACF,CAAC,CAAC;IACH,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,SAAS;QACT,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC,CAAC;AACN,CAAC;AArBD,oDAqBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/cli",
|
|
3
|
-
"version": "4.27.
|
|
3
|
+
"version": "4.27.2",
|
|
4
4
|
"description": "Open Source Cloud CLI",
|
|
5
5
|
"author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "95e06fc41d97c621992e984e921530eb72ef98a6"
|
|
41
41
|
}
|
package/src/admin/instance.ts
CHANGED
|
@@ -5,7 +5,6 @@ import {
|
|
|
5
5
|
removeInstance
|
|
6
6
|
} from '@osaas/client-core';
|
|
7
7
|
import { generatePat, apiKey } from './token';
|
|
8
|
-
import { listSubscriptionsForTenant } from './subscription';
|
|
9
8
|
|
|
10
9
|
export async function listInstancesForTenant(
|
|
11
10
|
tenantId: string,
|
|
@@ -59,18 +58,22 @@ export async function suspendInstanceForTenant(
|
|
|
59
58
|
export async function getInstancesToRemove(
|
|
60
59
|
tenantId: string,
|
|
61
60
|
environment: string
|
|
62
|
-
) {
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
61
|
+
): Promise<{ serviceId: string; instance: string }[]> {
|
|
62
|
+
const instancesUrl = `https://deploy.svc.${environment}.osaas.io/instances/${tenantId}`;
|
|
63
|
+
const instances = await createFetch<
|
|
64
|
+
Array<{
|
|
65
|
+
tenantId: string;
|
|
66
|
+
serviceId: string;
|
|
67
|
+
instanceName: string;
|
|
68
|
+
created: string;
|
|
69
|
+
}>
|
|
70
|
+
>(instancesUrl, {
|
|
71
|
+
headers: {
|
|
72
|
+
Authorization: `Bearer ${apiKey()}`
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
return instances.map(({ serviceId, instanceName }) => ({
|
|
76
|
+
serviceId,
|
|
77
|
+
instance: instanceName
|
|
78
|
+
}));
|
|
76
79
|
}
|