@ductape/sdk 0.1.16 → 0.1.17
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/api/urls.js +10 -0
- package/dist/api/urls.js.map +1 -1
- package/dist/clients/products.client.js +2 -1
- package/dist/clients/products.client.js.map +1 -1
- package/dist/cloud/cloud-broker-link.util.js +9 -3
- package/dist/cloud/cloud-broker-link.util.js.map +1 -1
- package/dist/cloud/cloud-database-link.util.js +12 -5
- package/dist/cloud/cloud-database-link.util.js.map +1 -1
- package/dist/cloud/cloud-graph-link.util.js +10 -4
- package/dist/cloud/cloud-graph-link.util.js.map +1 -1
- package/dist/cloud/cloud-vector-link.util.js +9 -3
- package/dist/cloud/cloud-vector-link.util.js.map +1 -1
- package/dist/cloud/types/cloud.types.d.ts +6 -0
- package/dist/products/services/products.service.js +65 -54
- package/dist/products/services/products.service.js.map +1 -1
- package/dist/products/validators/joi-validators/create.productDatabase.validator.js +5 -0
- package/dist/products/validators/joi-validators/create.productDatabase.validator.js.map +1 -1
- package/dist/products/validators/joi-validators/create.productGraph.validator.js +27 -16
- package/dist/products/validators/joi-validators/create.productGraph.validator.js.map +1 -1
- package/dist/products/validators/joi-validators/create.productMessageBrokers.validator.js +10 -1
- package/dist/products/validators/joi-validators/create.productMessageBrokers.validator.js.map +1 -1
- package/dist/products/validators/joi-validators/create.productVector.validator.js +6 -2
- package/dist/products/validators/joi-validators/create.productVector.validator.js.map +1 -1
- package/dist/types/processor.types.d.ts +7 -1
- package/dist/types/processor.types.js.map +1 -1
- package/dist/types/productsBuilder.types.d.ts +22 -0
- package/dist/types/productsBuilder.types.js.map +1 -1
- package/package.json +1 -1
package/dist/api/urls.js
CHANGED
|
@@ -37,6 +37,16 @@ const urls = {
|
|
|
37
37
|
},
|
|
38
38
|
};
|
|
39
39
|
function getUrlForEnvironment(environment, serviceName) {
|
|
40
|
+
var _a;
|
|
41
|
+
if (typeof process !== 'undefined' && process.env) {
|
|
42
|
+
const serviceKey = serviceName.replace(/[^a-z0-9]/gi, '_').toUpperCase();
|
|
43
|
+
const perService = process.env[`DUCTAPE_${serviceKey}_BASE_URL`];
|
|
44
|
+
const apiBase = process.env.DUCTAPE_API_BASE_URL;
|
|
45
|
+
const override = (_a = (perService || apiBase)) === null || _a === void 0 ? void 0 : _a.trim();
|
|
46
|
+
if (override) {
|
|
47
|
+
return override.replace(/\/+$/, '');
|
|
48
|
+
}
|
|
49
|
+
}
|
|
40
50
|
return urls[serviceName][environment];
|
|
41
51
|
}
|
|
42
52
|
//https://api.ductape.app/users/api/v1/users/v1/create
|
package/dist/api/urls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urls.js","sourceRoot":"","sources":["../../src/api/urls.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AAmCb,
|
|
1
|
+
{"version":3,"file":"urls.js","sourceRoot":"","sources":["../../src/api/urls.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,8 @@ const productsClient = (environment) => {
|
|
|
20
20
|
return instance;
|
|
21
21
|
instance = axios_1.default.create({
|
|
22
22
|
baseURL: (0, urls_1.getUrlForEnvironment)(environment, 'integrations'),
|
|
23
|
-
|
|
23
|
+
// Default high enough for cloud RDS/Cloud SQL provision; per-request overrides still apply.
|
|
24
|
+
timeout: 900000,
|
|
24
25
|
withCredentials: false,
|
|
25
26
|
});
|
|
26
27
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"products.client.js","sourceRoot":"","sources":["../../src/clients/products.client.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0D;AAC1D,sCAAmD;AAGnD,MAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CAAC;AACtC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;AACpC,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAoC,EAAE,EAAE;IACxE,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,cAAc,GAAG,IAAI,GAAG,EAAyB,CAAC;AAEjD,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,EAAE;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,IAAA,2BAAoB,EAAC,WAAW,EAAE,cAAc,CAAC;QAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"products.client.js","sourceRoot":"","sources":["../../src/clients/products.client.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0D;AAC1D,sCAAmD;AAGnD,MAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CAAC;AACtC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;AACpC,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAoC,EAAE,EAAE;IACxE,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,cAAc,GAAG,IAAI,GAAG,EAAyB,CAAC;AAEjD,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,EAAE;IACrD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,IAAI,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,IAAA,2BAAoB,EAAC,WAAW,EAAE,cAAc,CAAC;QAC1D,4FAA4F;QAC5F,OAAO,EAAE,MAAO;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC,CAAC;IACH,aAAa;IACb,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACtD,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB"}
|
|
@@ -16,6 +16,8 @@ function draftToBrokerEnv(draft, cloudTag, slug) {
|
|
|
16
16
|
slug,
|
|
17
17
|
type: draftEnv.type,
|
|
18
18
|
config: config,
|
|
19
|
+
provisionStatus: draftEnv.provisionStatus,
|
|
20
|
+
provisionError: draftEnv.provisionError ? String(draftEnv.provisionError) : undefined,
|
|
19
21
|
};
|
|
20
22
|
}
|
|
21
23
|
function brokerResourceMatches(resources, queueName) {
|
|
@@ -62,18 +64,22 @@ async function materializeCloudLinkedBrokerEnv(env, ctx) {
|
|
|
62
64
|
result = await ctx.cloudApi.importResource(Object.assign(Object.assign({}, baseInput), { resourceId: queueName }), ctx.auth);
|
|
63
65
|
}
|
|
64
66
|
else {
|
|
65
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', queueName, topicName: queueName, region,
|
|
67
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false, queueName, topicName: queueName, region,
|
|
66
68
|
location, namespaceName: cfg.namespaceName ? String(cfg.namespaceName) : undefined }), ctx.auth);
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
else {
|
|
70
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', region,
|
|
72
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false, region,
|
|
71
73
|
location }), ctx.auth);
|
|
72
74
|
}
|
|
73
75
|
const draft = (_a = result.componentDraft) === null || _a === void 0 ? void 0 : _a.draft;
|
|
74
76
|
if (!draft) {
|
|
75
77
|
throw new Error('Cloud broker link did not return a component draft');
|
|
76
78
|
}
|
|
77
|
-
|
|
79
|
+
const envDraft = draftToBrokerEnv(draft, cloudTag, env.slug);
|
|
80
|
+
if (draft.provisionStatus === 'provisioning' || envDraft.provisionStatus === 'provisioning') {
|
|
81
|
+
envDraft.provisionStatus = 'provisioning';
|
|
82
|
+
}
|
|
83
|
+
return envDraft;
|
|
78
84
|
}
|
|
79
85
|
//# sourceMappingURL=cloud-broker-link.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-broker-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-broker-link.util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cloud-broker-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-broker-link.util.ts"],"names":[],"mappings":";;AAoDA,0EA2EC;AA7HD,qEAA+D;AAG/D,SAAS,gBAAgB,CACvB,KAA8B,EAC9B,QAAgB,EAChB,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,IAML,CAAC;IACf,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9D,MAAM,MAAM,qBAAQ,QAAQ,CAAC,MAAM,CAAE,CAAC;IACtC,OAAO,MAAM,CAAC,iBAAiB,CAAC;IAChC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IACxB,MAAM,CAAC,QAAQ,GAAG,kBAAkB,CAAC;IAErC,OAAO;QACL,IAAI;QACJ,IAAI,EAAE,QAAQ,CAAC,IAAkC;QACjD,MAAM,EAAE,MAAiD;QACzD,eAAe,EAAE,QAAQ,CAAC,eAAwD;QAClF,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;KACtF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,SAAgG,EAChG,SAAiB;;IAEjB,OAAO,CACL,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI,CAAC,CAAC,EAAE,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5D,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,IAAI,CAAC;QACjE,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,mCAAI,KAAK,CACZ,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,+BAA+B,CACnD,GAAuB,EACvB,GAKC;;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,MAA4C,CAAC;IAC7D,MAAM,QAAQ,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAA2B,CAAC;IAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,IAAA,4CAAmB,EAAC,gBAAgB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE9D,MAAM,SAAS,GAAG;QAChB,OAAO;QACP,aAAa,EAAE,gBAAyB;QACxC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,YAAY,EAAE,GAAG,CAAC,SAAS;QAC3B,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,KAAK,EAAE,QAAQ;KAChB,CAAC;IAEF,IAAI,MAAM,CAAC;IACX,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChG,IAAI,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;YACvD,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,cAAc,iCACnC,SAAS,KAAE,UAAU,EAAE,SAAS,KACrC,GAAG,CAAC,IAAI,CACT,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,iBAAiB,iCAEtC,SAAS,KACZ,QAAQ,EAAE,SAAS,EACnB,YAAY,EAAE,KAAK,EACnB,SAAS,EACT,SAAS,EAAE,SAAS,EACpB,MAAM;gBACN,QAAQ,EACR,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,KAE1E,GAAG,CAAC,IAAI,CACT,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,iBAAiB,iCAEtC,SAAS,KACZ,QAAQ,EAAE,SAAS,EACnB,YAAY,EAAE,KAAK,EACnB,MAAM;YACN,QAAQ,KAEV,GAAG,CAAC,IAAI,CACT,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,cAAc,0CAAE,KAA4C,CAAC;IAClF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,KAAK,CAAC,eAAe,KAAK,cAAc,IAAI,QAAQ,CAAC,eAAe,KAAK,cAAc,EAAE,CAAC;QAC5F,QAAQ,CAAC,eAAe,GAAG,cAAc,CAAC;IAC5C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -19,11 +19,14 @@ function draftToDatabaseEnv(draft, cloudTag, slug) {
|
|
|
19
19
|
const draftEnv = envs.find((e) => e.slug === slug) || envs[0];
|
|
20
20
|
return {
|
|
21
21
|
slug,
|
|
22
|
-
connection_url: String(draftEnv.connection_url
|
|
22
|
+
connection_url: draftEnv.connection_url ? String(draftEnv.connection_url) : '',
|
|
23
23
|
description: draftEnv.description ? String(draftEnv.description) : undefined,
|
|
24
|
-
authMode:
|
|
24
|
+
authMode: draftEnv.authMode ? draftEnv.authMode : undefined,
|
|
25
25
|
cloud: cloudTag,
|
|
26
26
|
region: draftEnv.region ? String(draftEnv.region) : undefined,
|
|
27
|
+
instance: draftEnv.instance ? String(draftEnv.instance) : undefined,
|
|
28
|
+
provisionStatus: draftEnv.provisionStatus,
|
|
29
|
+
provisionError: draftEnv.provisionError ? String(draftEnv.provisionError) : undefined,
|
|
27
30
|
};
|
|
28
31
|
}
|
|
29
32
|
async function materializeCloudLinkedDatabaseEnv(env, ctx) {
|
|
@@ -53,12 +56,16 @@ async function materializeCloudLinkedDatabaseEnv(env, ctx) {
|
|
|
53
56
|
const listed = await ctx.cloudApi.listResources({ cloud: cloudTag, service, region }, ctx.auth);
|
|
54
57
|
const exists = (_a = listed.resources) === null || _a === void 0 ? void 0 : _a.some((r) => r.id === effectiveInstance || r.name === effectiveInstance);
|
|
55
58
|
const result = exists
|
|
56
|
-
? await ctx.cloudApi.importResource(Object.assign(Object.assign({}, baseInput), { resourceId: effectiveInstance }), ctx.auth)
|
|
57
|
-
: await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default' }), provisionInput(effectiveInstance)), ctx.auth);
|
|
59
|
+
? await ctx.cloudApi.importResource(Object.assign(Object.assign(Object.assign({}, baseInput), { resourceId: effectiveInstance }), (env.masterPassword ? { masterPassword: String(env.masterPassword) } : {})), ctx.auth)
|
|
60
|
+
: await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false }), provisionInput(effectiveInstance)), ctx.auth);
|
|
58
61
|
const draft = (_b = result.componentDraft) === null || _b === void 0 ? void 0 : _b.draft;
|
|
59
62
|
if (!draft) {
|
|
60
63
|
throw new Error('Cloud database link did not return a component draft');
|
|
61
64
|
}
|
|
62
|
-
|
|
65
|
+
const envDraft = draftToDatabaseEnv(draft, cloudTag, env.slug);
|
|
66
|
+
if (draft.provisionStatus === 'provisioning' || envDraft.provisionStatus === 'provisioning') {
|
|
67
|
+
envDraft.provisionStatus = 'provisioning';
|
|
68
|
+
}
|
|
69
|
+
return envDraft;
|
|
63
70
|
}
|
|
64
71
|
//# sourceMappingURL=cloud-database-link.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-database-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-database-link.util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cloud-database-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-database-link.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ function draftToGraphEnv(draft, cloudTag, slug) {
|
|
|
11
11
|
const draftEnv = envs.find((e) => e.slug === slug) || envs[0];
|
|
12
12
|
return {
|
|
13
13
|
slug,
|
|
14
|
-
connection_url: String(draftEnv.connection_url
|
|
14
|
+
connection_url: draftEnv.connection_url ? String(draftEnv.connection_url) : '',
|
|
15
15
|
authMode: 'cloud_connection',
|
|
16
16
|
cloud: cloudTag,
|
|
17
17
|
region: draftEnv.region ? String(draftEnv.region) : undefined,
|
|
@@ -19,6 +19,8 @@ function draftToGraphEnv(draft, cloudTag, slug) {
|
|
|
19
19
|
password: draftEnv.password ? String(draftEnv.password) : undefined,
|
|
20
20
|
database: draftEnv.database ? String(draftEnv.database) : undefined,
|
|
21
21
|
iamAuth: draftEnv.iamAuth === true,
|
|
22
|
+
provisionStatus: draftEnv.provisionStatus,
|
|
23
|
+
provisionError: draftEnv.provisionError ? String(draftEnv.provisionError) : undefined,
|
|
22
24
|
};
|
|
23
25
|
}
|
|
24
26
|
async function materializeCloudLinkedGraphEnv(env, ctx) {
|
|
@@ -48,7 +50,7 @@ async function materializeCloudLinkedGraphEnv(env, ctx) {
|
|
|
48
50
|
result = await ctx.cloudApi.importResource(Object.assign(Object.assign({}, baseInput), { resourceId: instance }), ctx.auth);
|
|
49
51
|
}
|
|
50
52
|
else {
|
|
51
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default' }), vpcFields({
|
|
53
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false }), vpcFields({
|
|
52
54
|
clusterIdentifier: instance,
|
|
53
55
|
instance,
|
|
54
56
|
accountName: instance,
|
|
@@ -58,12 +60,16 @@ async function materializeCloudLinkedGraphEnv(env, ctx) {
|
|
|
58
60
|
}
|
|
59
61
|
}
|
|
60
62
|
else {
|
|
61
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default' }), vpcFields({ region, location: region })), ctx.auth);
|
|
63
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false }), vpcFields({ region, location: region })), ctx.auth);
|
|
62
64
|
}
|
|
63
65
|
const draft = (_b = result.componentDraft) === null || _b === void 0 ? void 0 : _b.draft;
|
|
64
66
|
if (!draft) {
|
|
65
67
|
throw new Error('Cloud graph link did not return a component draft');
|
|
66
68
|
}
|
|
67
|
-
|
|
69
|
+
const envDraft = draftToGraphEnv(draft, cloudTag, env.slug);
|
|
70
|
+
if (draft.provisionStatus === 'provisioning' || envDraft.provisionStatus === 'provisioning') {
|
|
71
|
+
envDraft.provisionStatus = 'provisioning';
|
|
72
|
+
}
|
|
73
|
+
return envDraft;
|
|
68
74
|
}
|
|
69
75
|
//# sourceMappingURL=cloud-graph-link.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-graph-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-graph-link.util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cloud-graph-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-graph-link.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ function draftToVectorEnv(draft, cloudTag, slug) {
|
|
|
17
17
|
region: draftEnv.region ? String(draftEnv.region) : undefined,
|
|
18
18
|
index: draftEnv.index ? String(draftEnv.index) : undefined,
|
|
19
19
|
namespace: draftEnv.namespace ? String(draftEnv.namespace) : undefined,
|
|
20
|
+
provisionStatus: draftEnv.provisionStatus,
|
|
21
|
+
provisionError: draftEnv.provisionError ? String(draftEnv.provisionError) : undefined,
|
|
20
22
|
};
|
|
21
23
|
}
|
|
22
24
|
async function materializeCloudLinkedVectorEnv(env, ctx) {
|
|
@@ -45,16 +47,20 @@ async function materializeCloudLinkedVectorEnv(env, ctx) {
|
|
|
45
47
|
result = await ctx.cloudApi.importResource(Object.assign(Object.assign({}, baseInput), { resourceId: instance }), ctx.auth);
|
|
46
48
|
}
|
|
47
49
|
else {
|
|
48
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', instance, serviceName: instance, region, location: region }), ctx.auth);
|
|
50
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false, instance, serviceName: instance, region, location: region }), ctx.auth);
|
|
49
51
|
}
|
|
50
52
|
}
|
|
51
53
|
else {
|
|
52
|
-
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', region, location: region }), ctx.auth);
|
|
54
|
+
result = await ctx.cloudApi.provisionResource(Object.assign(Object.assign({}, baseInput), { template: 'default', waitForReady: false, region, location: region }), ctx.auth);
|
|
53
55
|
}
|
|
54
56
|
const draft = (_b = result.componentDraft) === null || _b === void 0 ? void 0 : _b.draft;
|
|
55
57
|
if (!draft) {
|
|
56
58
|
throw new Error('Cloud vector link did not return a component draft');
|
|
57
59
|
}
|
|
58
|
-
|
|
60
|
+
const envDraft = draftToVectorEnv(draft, cloudTag, env.slug);
|
|
61
|
+
if (draft.provisionStatus === 'provisioning' || envDraft.provisionStatus === 'provisioning') {
|
|
62
|
+
envDraft.provisionStatus = 'provisioning';
|
|
63
|
+
}
|
|
64
|
+
return envDraft;
|
|
59
65
|
}
|
|
60
66
|
//# sourceMappingURL=cloud-vector-link.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-vector-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-vector-link.util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cloud-vector-link.util.js","sourceRoot":"","sources":["../../src/cloud/cloud-vector-link.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -169,6 +169,8 @@ export interface IImportCloudResourceInput {
|
|
|
169
169
|
productTag: string;
|
|
170
170
|
componentTag: string;
|
|
171
171
|
envSlug: string;
|
|
172
|
+
/** Required when importing existing RDS / Cloud SQL / PostgreSQL — AWS does not return passwords */
|
|
173
|
+
masterPassword?: string;
|
|
172
174
|
}
|
|
173
175
|
/** Service-specific provision fields (top-level on provision input, not nested under params). */
|
|
174
176
|
export interface ICloudProvisionFields {
|
|
@@ -203,6 +205,8 @@ export interface IProvisionCloudResourceInput extends ICloudProvisionFields {
|
|
|
203
205
|
productTag: string;
|
|
204
206
|
componentTag: string;
|
|
205
207
|
envSlug: string;
|
|
208
|
+
/** When false, start cloud create and return immediately (databases only). Default true. */
|
|
209
|
+
waitForReady?: boolean;
|
|
206
210
|
/** @deprecated Put provision fields on the input root instead */
|
|
207
211
|
params?: Record<string, unknown>;
|
|
208
212
|
}
|
|
@@ -220,6 +224,8 @@ export interface IImportCloudResourceResult {
|
|
|
220
224
|
}
|
|
221
225
|
export interface IProvisionCloudResourceResult extends IImportCloudResourceResult {
|
|
222
226
|
provisioned: boolean;
|
|
227
|
+
/** True when provision was accepted but cloud resource is not ready yet */
|
|
228
|
+
pending?: boolean;
|
|
223
229
|
}
|
|
224
230
|
/** Runtime short-lived credentials (proxy / connector broker) */
|
|
225
231
|
export interface ICloudRuntimeCredentialsInput {
|
|
@@ -1353,15 +1353,12 @@ class ProductsBuilderService {
|
|
|
1353
1353
|
const auth = this.getUserAccess();
|
|
1354
1354
|
const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
|
|
1355
1355
|
const productTag = this.product.tag;
|
|
1356
|
-
const materializedEnvs = []
|
|
1357
|
-
|
|
1358
|
-
|
|
1359
|
-
|
|
1360
|
-
|
|
1361
|
-
|
|
1362
|
-
brokerTag: data.tag,
|
|
1363
|
-
}));
|
|
1364
|
-
}
|
|
1356
|
+
const materializedEnvs = await Promise.all((data.envs || []).map((env) => (0, cloud_broker_link_util_1.materializeCloudLinkedBrokerEnv)(env, {
|
|
1357
|
+
cloudApi,
|
|
1358
|
+
auth,
|
|
1359
|
+
productTag,
|
|
1360
|
+
brokerTag: data.tag,
|
|
1361
|
+
})));
|
|
1365
1362
|
data.envs = materializedEnvs;
|
|
1366
1363
|
console.log(`${logPrefix} Validating schema...`);
|
|
1367
1364
|
await validators_1.CreateMessageBrokerSchema.validateAsync(data);
|
|
@@ -1375,10 +1372,12 @@ class ProductsBuilderService {
|
|
|
1375
1372
|
throw new Error(`Env ${env.slug} does not exist`);
|
|
1376
1373
|
}
|
|
1377
1374
|
console.log(`${logPrefix} Env ${env.slug} exists, verified`);
|
|
1378
|
-
|
|
1379
|
-
|
|
1380
|
-
|
|
1381
|
-
|
|
1375
|
+
const isProvisioning = env.provisionStatus === 'provisioning';
|
|
1376
|
+
if (!isProvisioning) {
|
|
1377
|
+
console.log(`${logPrefix} Processing secrets for env: ${env.slug}...`);
|
|
1378
|
+
env.config = await this.processMessageBrokerConfigSecrets(env.config, env.type, data.tag, env.slug);
|
|
1379
|
+
console.log(`${logPrefix} Secrets processed for env: ${env.slug}`);
|
|
1380
|
+
}
|
|
1382
1381
|
console.log(`${logPrefix} Encrypting config for env: ${env.slug}...`);
|
|
1383
1382
|
env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
|
|
1384
1383
|
console.log(`${logPrefix} Config encrypted for env: ${env.slug}`);
|
|
@@ -1386,6 +1385,10 @@ class ProductsBuilderService {
|
|
|
1386
1385
|
}
|
|
1387
1386
|
data.envs = processedEnvs;
|
|
1388
1387
|
console.log(`${logPrefix} All environments processed: ${processedEnvs.length}`);
|
|
1388
|
+
const hasProvisioningEnv = data.envs.some((env) => env.provisionStatus === 'provisioning');
|
|
1389
|
+
if (hasProvisioningEnv) {
|
|
1390
|
+
data.provisionStatus = 'provisioning';
|
|
1391
|
+
}
|
|
1389
1392
|
const envs = await this.fetchEnvs();
|
|
1390
1393
|
console.log(`${logPrefix} Product has ${envs.length} environments defined`);
|
|
1391
1394
|
for (const env of envs) {
|
|
@@ -1779,15 +1782,12 @@ class ProductsBuilderService {
|
|
|
1779
1782
|
const auth = this.getUserAccess();
|
|
1780
1783
|
const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
|
|
1781
1784
|
const productTag = this.product.tag;
|
|
1782
|
-
const materializedEnvs = []
|
|
1783
|
-
|
|
1784
|
-
|
|
1785
|
-
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
vectorTag: data.tag,
|
|
1789
|
-
}));
|
|
1790
|
-
}
|
|
1785
|
+
const materializedEnvs = await Promise.all((data.envs || []).map((env) => (0, cloud_vector_link_util_1.materializeCloudLinkedVectorEnv)(env, {
|
|
1786
|
+
cloudApi,
|
|
1787
|
+
auth,
|
|
1788
|
+
productTag,
|
|
1789
|
+
vectorTag: data.tag,
|
|
1790
|
+
})));
|
|
1791
1791
|
data.envs = materializedEnvs;
|
|
1792
1792
|
await validators_1.CreateProductVectorSchema.validateAsync(data);
|
|
1793
1793
|
const processedEnvs = [];
|
|
@@ -1796,12 +1796,12 @@ class ProductsBuilderService {
|
|
|
1796
1796
|
slug: env.slug,
|
|
1797
1797
|
hasApiKey: !!env.apiKey,
|
|
1798
1798
|
hasEndpoint: !!env.endpoint,
|
|
1799
|
+
provisionStatus: env.provisionStatus,
|
|
1799
1800
|
});
|
|
1800
1801
|
const exists = await this.fetchEnv(env.slug);
|
|
1801
1802
|
if (!exists) {
|
|
1802
1803
|
throw new Error(`Env ${env.slug} does not exist`);
|
|
1803
1804
|
}
|
|
1804
|
-
// Store API key as secret and encrypt
|
|
1805
1805
|
if (env.apiKey) {
|
|
1806
1806
|
console.log('[ProductsService.createVector] Converting API key to secret for env:', env.slug);
|
|
1807
1807
|
const originalApiKey = env.apiKey;
|
|
@@ -1830,6 +1830,10 @@ class ProductsBuilderService {
|
|
|
1830
1830
|
}
|
|
1831
1831
|
data.envs = processedEnvs;
|
|
1832
1832
|
console.log('[ProductsService.createVector] All envs processed, total:', processedEnvs.length);
|
|
1833
|
+
const hasProvisioningEnv = data.envs.some((env) => env.provisionStatus === 'provisioning');
|
|
1834
|
+
if (hasProvisioningEnv) {
|
|
1835
|
+
data.provisionStatus = 'provisioning';
|
|
1836
|
+
}
|
|
1833
1837
|
const envs = await this.fetchEnvs();
|
|
1834
1838
|
for (const env of envs) {
|
|
1835
1839
|
const exists = data.envs.findIndex((vecEnv) => vecEnv.slug === env.slug);
|
|
@@ -4239,16 +4243,15 @@ class ProductsBuilderService {
|
|
|
4239
4243
|
const auth = this.getUserAccess();
|
|
4240
4244
|
const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
|
|
4241
4245
|
const productTag = this.product.tag;
|
|
4242
|
-
|
|
4243
|
-
|
|
4244
|
-
|
|
4245
|
-
|
|
4246
|
-
|
|
4247
|
-
|
|
4248
|
-
|
|
4249
|
-
|
|
4250
|
-
}
|
|
4251
|
-
data.envs = materializedEnvs;
|
|
4246
|
+
data.envs = (await Promise.all((data.envs || []).map(async (env) => (0, cloud_database_link_util_1.materializeCloudLinkedDatabaseEnv)(env, {
|
|
4247
|
+
cloudApi,
|
|
4248
|
+
auth,
|
|
4249
|
+
productTag,
|
|
4250
|
+
databaseTag: data.tag,
|
|
4251
|
+
})))).map((env) => {
|
|
4252
|
+
const _a = env, { masterPassword: _mp, importExisting: _ie } = _a, rest = __rest(_a, ["masterPassword", "importExisting"]);
|
|
4253
|
+
return rest;
|
|
4254
|
+
});
|
|
4252
4255
|
await validators_1.CreateProductDatabaseSchema.validateAsync(data);
|
|
4253
4256
|
const processedEnvs = [];
|
|
4254
4257
|
for (const env of data.envs) {
|
|
@@ -4256,10 +4259,16 @@ class ProductsBuilderService {
|
|
|
4256
4259
|
if (!exists) {
|
|
4257
4260
|
throw new Error(`Env ${env.slug} does not exist`);
|
|
4258
4261
|
}
|
|
4259
|
-
|
|
4262
|
+
if (env.connection_url) {
|
|
4263
|
+
env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
|
|
4264
|
+
}
|
|
4260
4265
|
processedEnvs.push(env);
|
|
4261
4266
|
}
|
|
4262
4267
|
data.envs = processedEnvs;
|
|
4268
|
+
const hasProvisioningEnv = data.envs.some((env) => env.provisionStatus === 'provisioning');
|
|
4269
|
+
if (hasProvisioningEnv) {
|
|
4270
|
+
data.provisionStatus = 'provisioning';
|
|
4271
|
+
}
|
|
4263
4272
|
const envs = await this.fetchEnvs();
|
|
4264
4273
|
for (const env of envs) {
|
|
4265
4274
|
const exists = data.envs.findIndex((dbEnv) => dbEnv.slug === env.slug);
|
|
@@ -4400,15 +4409,12 @@ class ProductsBuilderService {
|
|
|
4400
4409
|
const auth = this.getUserAccess();
|
|
4401
4410
|
const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
|
|
4402
4411
|
const productTag = this.product.tag;
|
|
4403
|
-
const materializedEnvs = []
|
|
4404
|
-
|
|
4405
|
-
|
|
4406
|
-
|
|
4407
|
-
|
|
4408
|
-
|
|
4409
|
-
graphTag: data.tag,
|
|
4410
|
-
}));
|
|
4411
|
-
}
|
|
4412
|
+
const materializedEnvs = await Promise.all((data.envs || []).map((env) => (0, cloud_graph_link_util_1.materializeCloudLinkedGraphEnv)(env, {
|
|
4413
|
+
cloudApi,
|
|
4414
|
+
auth,
|
|
4415
|
+
productTag,
|
|
4416
|
+
graphTag: data.tag,
|
|
4417
|
+
})));
|
|
4412
4418
|
data.envs = materializedEnvs;
|
|
4413
4419
|
await validators_1.CreateProductGraphSchema.validateAsync(data);
|
|
4414
4420
|
const processedEnvs = [];
|
|
@@ -4418,22 +4424,23 @@ class ProductsBuilderService {
|
|
|
4418
4424
|
hasConnectionUrl: !!env.connection_url,
|
|
4419
4425
|
hasUsername: !!env.username,
|
|
4420
4426
|
hasPassword: !!env.password,
|
|
4427
|
+
provisionStatus: env.provisionStatus,
|
|
4421
4428
|
});
|
|
4422
4429
|
const exists = await this.fetchEnv(env.slug);
|
|
4423
4430
|
if (!exists) {
|
|
4424
4431
|
throw new Error(`Env ${env.slug} does not exist`);
|
|
4425
4432
|
}
|
|
4426
|
-
|
|
4427
|
-
|
|
4428
|
-
|
|
4429
|
-
|
|
4430
|
-
|
|
4431
|
-
|
|
4432
|
-
|
|
4433
|
-
|
|
4434
|
-
|
|
4435
|
-
|
|
4436
|
-
|
|
4433
|
+
if (env.connection_url) {
|
|
4434
|
+
console.log('[ProductsService.createGraph] Converting connection URL to secret for env:', env.slug);
|
|
4435
|
+
const originalUrl = env.connection_url;
|
|
4436
|
+
env.connection_url = await this.storeGraphConnectionUrlAsSecret(env.connection_url, data.tag, env.slug);
|
|
4437
|
+
console.log('[ProductsService.createGraph] Connection URL after secret conversion:', {
|
|
4438
|
+
wasConverted: originalUrl !== env.connection_url,
|
|
4439
|
+
isSecretRef: (_c = env.connection_url) === null || _c === void 0 ? void 0 : _c.startsWith('$Secret{'),
|
|
4440
|
+
});
|
|
4441
|
+
env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
|
|
4442
|
+
console.log('[ProductsService.createGraph] Connection URL encrypted');
|
|
4443
|
+
}
|
|
4437
4444
|
if (env.username) {
|
|
4438
4445
|
console.log('[ProductsService.createGraph] Encrypting username for env:', env.slug);
|
|
4439
4446
|
env.username = (0, processor_utils_1.encrypt)(env.username, this.product.private_key);
|
|
@@ -4447,6 +4454,10 @@ class ProductsBuilderService {
|
|
|
4447
4454
|
}
|
|
4448
4455
|
data.envs = processedEnvs;
|
|
4449
4456
|
console.log('[ProductsService.createGraph] All envs processed, total:', processedEnvs.length);
|
|
4457
|
+
const hasProvisioningEnv = data.envs.some((env) => env.provisionStatus === 'provisioning');
|
|
4458
|
+
if (hasProvisioningEnv) {
|
|
4459
|
+
data.provisionStatus = 'provisioning';
|
|
4460
|
+
}
|
|
4450
4461
|
const envs = await this.fetchEnvs();
|
|
4451
4462
|
for (const env of envs) {
|
|
4452
4463
|
const exists = data.envs.findIndex((graphEnv) => graphEnv.slug === env.slug);
|