@or-sdk/deployer 0.13.0 → 0.16.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.
- package/dist/cjs/Deployer.js +5 -4
- package/dist/cjs/Deployer.js.map +1 -1
- package/dist/esm/Deployer.js +5 -4
- package/dist/esm/Deployer.js.map +1 -1
- package/dist/types/types.d.ts +2 -0
- package/package.json +3 -3
- package/src/Deployer.ts +5 -4
- package/src/types.ts +5 -0
package/dist/cjs/Deployer.js
CHANGED
|
@@ -58,11 +58,12 @@ var Deployer = (function (_super) {
|
|
|
58
58
|
__extends(Deployer, _super);
|
|
59
59
|
function Deployer(params) {
|
|
60
60
|
var _this = this;
|
|
61
|
-
var token = params.token, discoveryUrl = params.discoveryUrl;
|
|
61
|
+
var token = params.token, discoveryUrl = params.discoveryUrl, accountId = params.accountId;
|
|
62
62
|
_this = _super.call(this, {
|
|
63
63
|
token: token,
|
|
64
64
|
discoveryUrl: discoveryUrl,
|
|
65
65
|
serviceKey: constants_1.SERVICE_KEY,
|
|
66
|
+
accountId: accountId,
|
|
66
67
|
}) || this;
|
|
67
68
|
return _this;
|
|
68
69
|
}
|
|
@@ -84,7 +85,7 @@ var Deployer = (function (_super) {
|
|
|
84
85
|
interactiveDebug: interactiveDebug,
|
|
85
86
|
role: role,
|
|
86
87
|
};
|
|
87
|
-
route = '/flows/deploy
|
|
88
|
+
route = (this.isCrossAccount ? "/accounts/" + this.currentAccountId : '') + "/flows/deploy";
|
|
88
89
|
return [4, this.callApi({
|
|
89
90
|
method: 'POST',
|
|
90
91
|
route: route,
|
|
@@ -116,7 +117,7 @@ var Deployer = (function (_super) {
|
|
|
116
117
|
role: role,
|
|
117
118
|
deleteLambda: deleteLambda,
|
|
118
119
|
};
|
|
119
|
-
route = '/flows/deploy
|
|
120
|
+
route = (this.isCrossAccount ? "/accounts/" + this.currentAccountId : '') + "/flows/deploy";
|
|
120
121
|
return [4, this.callApi({
|
|
121
122
|
method: 'DELETE',
|
|
122
123
|
route: route,
|
|
@@ -136,7 +137,7 @@ var Deployer = (function (_super) {
|
|
|
136
137
|
switch (_a.label) {
|
|
137
138
|
case 0:
|
|
138
139
|
counter = 0;
|
|
139
|
-
route = "/flows/check/" + flowId + "/" + requestId;
|
|
140
|
+
route = (this.isCrossAccount ? "/accounts/" + this.currentAccountId : '') + "/flows/check/" + flowId + "/" + requestId;
|
|
140
141
|
_a.label = 1;
|
|
141
142
|
case 1:
|
|
142
143
|
counter++;
|
package/dist/cjs/Deployer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/Deployer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA6C;AAO7C,yCAA0C;AAS1C;IAA8B,4BAAI;IAOhC,kBAAY,MAAsB;QAAlC,
|
|
1
|
+
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/Deployer.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Deployer.js
CHANGED
|
@@ -11,11 +11,12 @@ import { Base, timeout } from '@or-sdk/base';
|
|
|
11
11
|
import { SERVICE_KEY } from './constants';
|
|
12
12
|
export class Deployer extends Base {
|
|
13
13
|
constructor(params) {
|
|
14
|
-
const { token, discoveryUrl } = params;
|
|
14
|
+
const { token, discoveryUrl, accountId } = params;
|
|
15
15
|
super({
|
|
16
16
|
token,
|
|
17
17
|
discoveryUrl,
|
|
18
18
|
serviceKey: SERVICE_KEY,
|
|
19
|
+
accountId,
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
22
|
activateFlow({ id, data: { deploy: { role } } }, interactiveDebug = false) {
|
|
@@ -30,7 +31,7 @@ export class Deployer extends Base {
|
|
|
30
31
|
interactiveDebug: interactiveDebug,
|
|
31
32
|
role,
|
|
32
33
|
};
|
|
33
|
-
const route = '/flows/deploy
|
|
34
|
+
const route = `${this.isCrossAccount ? `/accounts/${this.currentAccountId}` : ''}/flows/deploy`;
|
|
34
35
|
const { requestId } = yield this.callApi({
|
|
35
36
|
method: 'POST',
|
|
36
37
|
route,
|
|
@@ -52,7 +53,7 @@ export class Deployer extends Base {
|
|
|
52
53
|
role,
|
|
53
54
|
deleteLambda,
|
|
54
55
|
};
|
|
55
|
-
const route = '/flows/deploy
|
|
56
|
+
const route = `${this.isCrossAccount ? `/accounts/${this.currentAccountId}` : ''}/flows/deploy`;
|
|
56
57
|
const { requestId } = yield this.callApi({
|
|
57
58
|
method: 'DELETE',
|
|
58
59
|
route,
|
|
@@ -64,7 +65,7 @@ export class Deployer extends Base {
|
|
|
64
65
|
pollResult(flowId, requestId) {
|
|
65
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
67
|
let counter = 0;
|
|
67
|
-
const route = `/flows/check/${flowId}/${requestId}`;
|
|
68
|
+
const route = `${this.isCrossAccount ? `/accounts/${this.currentAccountId}` : ''}/flows/check/${flowId}/${requestId}`;
|
|
68
69
|
do {
|
|
69
70
|
counter++;
|
|
70
71
|
yield timeout(1000);
|
package/dist/esm/Deployer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/Deployer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAO7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C,MAAM,OAAO,QAAS,SAAQ,IAAI;IAOhC,YAAY,MAAsB;QAChC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/Deployer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAO7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C,MAAM,OAAO,QAAS,SAAQ,IAAI;IAOhC,YAAY,MAAsB;QAChC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAElD,KAAK,CAAC;YACJ,KAAK;YACL,YAAY;YACZ,UAAU,EAAE,WAAW;YACvB,SAAS;SACV,CAAC,CAAC;IACL,CAAC;IAQY,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAQ,EAAE,gBAAgB,GAAG,KAAK;;YAC1F,IAAI,CAAC,EAAE,EAAE;gBACP,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;aACnC;YAED,MAAM,SAAS,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAEpC,MAAM,IAAI,GAAG;gBACX,MAAM,EAAE,EAAE;gBACV,SAAS;gBACT,gBAAgB,EAAE,gBAAgB;gBAClC,IAAI;aACL,CAAC;YAEF,MAAM,KAAK,GAAG,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAG,eAAe,CAAC;YAElG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBACvC,MAAM,EAAE,MAAM;gBACd,KAAK;gBACL,IAAI;aACL,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,UAAU,CAA+B,EAAE,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;KAAA;IASY,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAQ,EAAE,SAAiB,EAAE,YAAY,GAAG,KAAK;;YAC3G,IAAI,CAAC,EAAE,EAAE;gBACP,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;aACnC;YAED,MAAM,IAAI,GAAG;gBACX,IAAI,EAAE;oBACJ,EAAE;iBACH;gBACD,SAAS;gBACT,IAAI;gBACJ,YAAY;aACb,CAAC;YAEF,MAAM,KAAK,GAAG,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAG,eAAe,CAAC;YAElG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBACvC,MAAM,EAAE,QAAQ;gBAChB,KAAK;gBACL,IAAI;aACL,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,UAAU,CAAiC,EAAE,EAAE,SAAS,CAAC,CAAC;QACxE,CAAC;KAAA;IAEa,UAAU,CAAI,MAAc,EAAE,SAAiB;;YAC3D,IAAI,OAAO,GAAG,CAAC,CAAC;YAEhB,MAAM,KAAK,GAAG,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAG,gBAAgB,MAAM,IAAI,SAAS,EAAE,CAAC;YAExH,GAAG;gBACD,OAAO,EAAE,CAAC;gBACV,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAgB;oBAC/C,MAAM,EAAE,KAAK;oBACb,KAAK;iBACN,CAAC,CAAC;gBAEH,IAAK,MAA+B,CAAC,MAAM,KAAK,SAAS,EAAE;oBACzD,IAAK,MAA6B,CAAC,SAAS,EAAE;wBAC5C,MAAM,MAAM,CAAC;qBACd;oBAED,OAAO,MAAW,CAAC;iBACpB;aACF,QAAQ,OAAO,GAAG,GAAG,EAAE;YAExB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;KAAA;CAEF"}
|
package/dist/types/types.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Token } from '@or-sdk/base';
|
|
|
2
2
|
export declare type DeployerConfig = {
|
|
3
3
|
token: Token;
|
|
4
4
|
discoveryUrl: string;
|
|
5
|
+
accountId?: string;
|
|
5
6
|
};
|
|
6
7
|
export declare type Step = {
|
|
7
8
|
id: string;
|
|
@@ -61,6 +62,7 @@ export declare type Flow = {
|
|
|
61
62
|
};
|
|
62
63
|
botId: string;
|
|
63
64
|
id?: string;
|
|
65
|
+
tags?: string[];
|
|
64
66
|
version: string;
|
|
65
67
|
};
|
|
66
68
|
export declare type Trigger = {
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "0.16.0",
|
|
3
3
|
"name": "@or-sdk/deployer",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@or-sdk/base": "^0.
|
|
27
|
+
"@or-sdk/base": "^0.16.0",
|
|
28
28
|
"lodash": "^4.17.21"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "f855bf3ee6b361c5831479cee5cde6f7702b6ced"
|
|
31
31
|
}
|
package/src/Deployer.ts
CHANGED
|
@@ -22,12 +22,13 @@ export class Deployer extends Base {
|
|
|
22
22
|
* ```
|
|
23
23
|
*/
|
|
24
24
|
constructor(params: DeployerConfig) {
|
|
25
|
-
const { token, discoveryUrl } = params;
|
|
25
|
+
const { token, discoveryUrl, accountId } = params;
|
|
26
26
|
|
|
27
27
|
super({
|
|
28
28
|
token,
|
|
29
29
|
discoveryUrl,
|
|
30
30
|
serviceKey: SERVICE_KEY,
|
|
31
|
+
accountId,
|
|
31
32
|
});
|
|
32
33
|
}
|
|
33
34
|
|
|
@@ -51,7 +52,7 @@ export class Deployer extends Base {
|
|
|
51
52
|
role,
|
|
52
53
|
};
|
|
53
54
|
|
|
54
|
-
const route = '/flows/deploy
|
|
55
|
+
const route = `${ this.isCrossAccount ? `/accounts/${this.currentAccountId}` : '' }/flows/deploy`;
|
|
55
56
|
|
|
56
57
|
const { requestId } = await this.callApi({
|
|
57
58
|
method: 'POST',
|
|
@@ -83,7 +84,7 @@ export class Deployer extends Base {
|
|
|
83
84
|
deleteLambda,
|
|
84
85
|
};
|
|
85
86
|
|
|
86
|
-
const route = '/flows/deploy
|
|
87
|
+
const route = `${ this.isCrossAccount ? `/accounts/${this.currentAccountId}` : '' }/flows/deploy`;
|
|
87
88
|
|
|
88
89
|
const { requestId } = await this.callApi({
|
|
89
90
|
method: 'DELETE',
|
|
@@ -97,7 +98,7 @@ export class Deployer extends Base {
|
|
|
97
98
|
private async pollResult<T>(flowId: string, requestId: string): Promise<T> {
|
|
98
99
|
let counter = 0;
|
|
99
100
|
|
|
100
|
-
const route = `/flows/check/${flowId}/${requestId}`;
|
|
101
|
+
const route = `${ this.isCrossAccount ? `/accounts/${this.currentAccountId}` : '' }/flows/check/${flowId}/${requestId}`;
|
|
101
102
|
|
|
102
103
|
do {
|
|
103
104
|
counter++;
|
package/src/types.ts
CHANGED
|
@@ -10,6 +10,10 @@ export type DeployerConfig = {
|
|
|
10
10
|
* Url of OneReach service discovery api
|
|
11
11
|
*/
|
|
12
12
|
discoveryUrl: string;
|
|
13
|
+
/**
|
|
14
|
+
* Account ID for cross-account requests (super admin only)
|
|
15
|
+
*/
|
|
16
|
+
accountId?: string;
|
|
13
17
|
};
|
|
14
18
|
|
|
15
19
|
export type Step = {
|
|
@@ -74,6 +78,7 @@ export type Flow = {
|
|
|
74
78
|
};
|
|
75
79
|
botId: string;
|
|
76
80
|
id?: string;
|
|
81
|
+
tags?: string[];
|
|
77
82
|
version: string;
|
|
78
83
|
};
|
|
79
84
|
|