@ductape/sdk 0.1.11 → 0.1.13

package/dist/products/services/products.service.js

@@ -21,6 +21,12 @@ const userApi_service_1 = require("../../api/services/userApi.service");
 const inputs_service_1 = __importDefault(require("../../inputs/inputs.service"));
 const inputs_utils_create_1 = require("../../inputs/utils/inputs.utils.create");
 const enums_1 = require("../../types/enums");
+const cloudApi_service_1 = require("../../api/services/cloudApi.service");
+const storage_cloud_link_util_1 = require("../../storage/storage-cloud-link.util");
+const cloud_broker_link_util_1 = require("../../cloud/cloud-broker-link.util");
+const cloud_database_link_util_1 = require("../../cloud/cloud-database-link.util");
+const cloud_graph_link_util_1 = require("../../cloud/cloud-graph-link.util");
+const cloud_vector_link_util_1 = require("../../cloud/cloud-vector-link.util");
 const productsBuilder_types_1 = require("../../types/productsBuilder.types");
 const validators_1 = require("../validators");
 const objects_utils_1 = require("../utils/objects.utils");
@@ -59,6 +65,7 @@ class ProductsBuilderService {
         this.token = token;
         this.access_key = access_key || null;
         this.workspace_private_key = workspace_private_key !== null && workspace_private_key !== void 0 ? workspace_private_key : null;
+        this.env_type = env_type;
         this.userApi = new userApi_service_1.UserApiService(env_type, redis_client);
         this.productApi = new productsApi_service_1.ProductsApiService(env_type, redis_client);
         this.workspaceApi = new workspaceApi_service_1.WorkspaceApiService(env_type, redis_client);
@@ -215,6 +222,34 @@ class ProductsBuilderService {
         const healthchecks = await this.productApi.fetchProductComponents(this.product_id, 'healthcheck', this.getUserAccess());
         return healthchecks;
     }
+    /** Validate quota/fallback provider references a registered product healthcheck component. */
+    async validateProviderHealthcheckTag(option) {
+        if (!option.healthcheck)
+            return;
+        const healthchecks = await this.fetchProductHealthchecks();
+        const found = healthchecks.some((h) => h.tag === option.healthcheck);
+        if (!found) {
+            throw new Error(`Product healthcheck "${option.healthcheck}" not found. Register it first (e.g. npm run test:healthchecks:populate).`);
+        }
+        if (!option.check_interval) {
+            option.check_interval = 10000;
+        }
+    }
+    /** Keep in-memory product component arrays in sync after component CRUD (components API can lag). */
+    mergeProductComponent(kind, item) {
+        if (!this.product || !(item === null || item === void 0 ? void 0 : item.tag))
+            return;
+        const key = kind === 'healthcheck' ? 'healthchecks' : kind === 'quota' ? 'quota' : 'fallbacks';
+        const list = Array.isArray(this.product[key])
+            ? [...this.product[key]]
+            : [];
+        const idx = list.findIndex((c) => c.tag === item.tag);
+        if (idx >= 0)
+            list[idx] = Object.assign(Object.assign({}, list[idx]), item);
+        else
+            list.push(item);
+        this.product[key] = list;
+    }
     /**
      * Create a healthcheck from a schema (e.g. from resilience health.define/create).
      * Persists as product component so processor healthcheck workers and health.list/fetch see it.
@@ -1048,19 +1083,7 @@ class ProductsBuilderService {
                             throw new Error(`Cannot find action ${d.event} on app ${app.tag} version ${app.version}`);
                         }
                         if (d.healthcheck) {
-                            const action = version.actions.find((action) => action.tag === d.healthcheck);
-                            if (!d.check_interval) {
-                                d.check_interval = 10000;
-                            }
-                            if (!action) {
-                                throw new Error(`Cannot find healthcheck action ${d.healthcheck} on app ${app.tag} version ${app.version}`);
-                            }
-                            if (action.headers.data.length > 0 ||
-                                action.body.data.length > 0 ||
-                                action.params.data.length > 0 ||
-                                action.query.data.length > 0) {
-                                throw new Error('Healthcheck action is expected to have no headers, body, params or query');
-                            }
+                            await this.validateProviderHealthcheckTag(d);
                         }
                     }
                     d.last_checked = new Date();
@@ -1068,6 +1091,7 @@ class ProductsBuilderService {
                     d.last_available = true;
                 }));
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.QUOTA, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
+                this.mergeProductComponent('quota', data);
             }
         }
         catch (e) {
@@ -1097,19 +1121,7 @@ class ProductsBuilderService {
                                 throw new Error(`Cannot find action ${d.event} on app ${app.tag} version ${app.version}`);
                             }
                             if (d.healthcheck) {
-                                const action = version.actions.find((action) => action.tag === d.healthcheck);
-                                if (!d.check_interval) {
-                                    d.check_interval = 10000;
-                                }
-                                if (!action) {
-                                    throw new Error(`Cannot find healthcheck action ${d.healthcheck} on app ${app.tag} version ${app.version}`);
-                                }
-                                if (action.headers.data.length > 0 ||
-                                    action.body.data.length > 0 ||
-                                    action.params.data.length > 0 ||
-                                    action.query.data.length > 0) {
-                                    throw new Error('Healthcheck action is expected to have no headers, body, params or query');
-                                }
+                                await this.validateProviderHealthcheckTag(d);
                             }
                         }
                         d.last_checked = new Date();
@@ -1128,12 +1140,19 @@ class ProductsBuilderService {
         }
     }
     async fetchQuotas(version) {
+        var _a;
         const components = await this.productApi.fetchProductComponents(this.product_id, 'quota', this.getUserAccess());
-        return components;
+        if (Array.isArray(components) && components.length > 0) {
+            return components;
+        }
+        return Array.isArray((_a = this.product) === null || _a === void 0 ? void 0 : _a.quota) ? this.product.quota : [];
     }
     async fetchQuota(tag, version) {
+        var _a, _b, _c;
         const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'quota', tag, this.getUserAccess());
-        return component;
+        if (component)
+            return component;
+        return (_c = ((_b = (_a = this.product) === null || _a === void 0 ? void 0 : _a.quota) !== null && _b !== void 0 ? _b : []).find((q) => q.tag === tag)) !== null && _c !== void 0 ? _c : null;
     }
     async deleteQuota(tag) {
         try {
@@ -1171,19 +1190,7 @@ class ProductsBuilderService {
                             throw new Error(`Cannot find action ${d.event} on app ${app.tag} version ${app.version}`);
                         }
                         if (d.healthcheck) {
-                            const action = version.actions.find((action) => action.tag === d.healthcheck);
-                            if (!d.check_interval) {
-                                d.check_interval = 10000;
-                            }
-                            if (!action) {
-                                throw new Error(`Cannot find healthcheck action ${d.healthcheck} on app ${app.tag} version ${app.version}`);
-                            }
-                            if (action.headers.data.length > 0 ||
-                                action.body.data.length > 0 ||
-                                action.params.data.length > 0 ||
-                                action.query.data.length > 0) {
-                                throw new Error('Healthcheck action is expected to have no headers, body, params or query');
-                            }
+                            await this.validateProviderHealthcheckTag(d);
                         }
                     }
                     d.last_checked = new Date();
@@ -1191,6 +1198,7 @@ class ProductsBuilderService {
                     d.last_available = true;
                 }));
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.FALLBACK, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
+                this.mergeProductComponent('fallback', data);
             }
         }
         catch (e) {
@@ -1217,19 +1225,7 @@ class ProductsBuilderService {
                                 throw new Error(`Cannot find action ${d.event} on app ${app.tag} version ${app.version}`);
                             }
                             if (d.healthcheck) {
-                                const action = version.actions.find((action) => action.tag === d.healthcheck);
-                                if (!d.check_interval) {
-                                    d.check_interval = 10000;
-                                }
-                                if (!action) {
-                                    throw new Error(`Cannot find healthcheck action ${d.healthcheck} on app ${app.tag} version ${app.version}`);
-                                }
-                                if (action.headers.data.length > 0 ||
-                                    action.body.data.length > 0 ||
-                                    action.params.data.length > 0 ||
-                                    action.query.data.length > 0) {
-                                    throw new Error('Healthcheck action is expected to have no headers, body, params or query');
-                                }
+                                await this.validateProviderHealthcheckTag(d);
                             }
                         }
                         d.last_checked = new Date();
@@ -1248,12 +1244,19 @@ class ProductsBuilderService {
         }
     }
     async fetchFallbacks(version) {
+        var _a;
         const components = await this.productApi.fetchProductComponents(this.product_id, 'fallback', this.getUserAccess());
-        return components;
+        if (Array.isArray(components) && components.length > 0) {
+            return components;
+        }
+        return Array.isArray((_a = this.product) === null || _a === void 0 ? void 0 : _a.fallback) ? this.product.fallback : [];
     }
     async fetchFallback(tag, version) {
+        var _a, _b, _c;
         const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'fallback', tag, this.getUserAccess());
-        return component;
+        if (component)
+            return component;
+        return (_c = ((_b = (_a = this.product) === null || _a === void 0 ? void 0 : _a.fallback) !== null && _b !== void 0 ? _b : []).find((f) => f.tag === tag)) !== null && _c !== void 0 ? _c : null;
     }
     async deleteFallback(tag) {
         try {
@@ -1347,6 +1350,19 @@ class ProductsBuilderService {
         const existingBroker = await this.fetchMessageBroker(data.tag);
         if (!existingBroker) {
             console.log(`${logPrefix} Broker ${data.tag} does not exist, proceeding with creation`);
+            const auth = this.getUserAccess();
+            const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+            const productTag = this.product.tag;
+            const materializedEnvs = [];
+            for (const env of data.envs || []) {
+                materializedEnvs.push(await (0, cloud_broker_link_util_1.materializeCloudLinkedBrokerEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    brokerTag: data.tag,
+                }));
+            }
+            data.envs = materializedEnvs;
             console.log(`${logPrefix} Validating schema...`);
             await validators_1.CreateMessageBrokerSchema.validateAsync(data);
             console.log(`${logPrefix} Schema validation passed`);
@@ -1407,6 +1423,17 @@ class ProductsBuilderService {
             console.log(`${logPrefix} Existing broker found with ${((_b = messageBroker.envs) === null || _b === void 0 ? void 0 : _b.length) || 0} environments`);
             const { _id, envs } = messageBroker;
             console.log(`${logPrefix} Broker ID: ${_id}`);
+            if (data.envs && data.envs.length > 0) {
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
+                data.envs = await Promise.all(data.envs.map(async (env) => (0, cloud_broker_link_util_1.materializeCloudLinkedBrokerEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    brokerTag: data.tag || tag,
+                })));
+            }
             console.log(`${logPrefix} Validating update schema...`);
             await validators_1.UpdateMessageBrokerSchema.validateAsync(data);
             console.log(`${logPrefix} Schema validation passed`);
@@ -1415,7 +1442,7 @@ class ProductsBuilderService {
                 throw new Error(`tag ${tag} is in use`);
             }
             const processedEnvs = [];
-            for (const env of data.envs) {
+            for (const env of data.envs || []) {
                 console.log(`${logPrefix} Processing env: ${env.slug} (type: ${env.type})`);
                 const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
@@ -1570,6 +1597,19 @@ class ProductsBuilderService {
     }
     async createStorage(data, throwErrorIfExists = false) {
         if (!(await this.fetchStorage(data.tag))) {
+            const auth = this.getUserAccess();
+            const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+            const productTag = this.product.tag;
+            const materializedEnvs = [];
+            for (const env of data.envs || []) {
+                materializedEnvs.push(await (0, storage_cloud_link_util_1.materializeCloudLinkedStorageEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    storageTag: data.tag,
+                }));
+            }
+            data.envs = materializedEnvs;
             await create_productStorage_validator_1.CreateProductStorageSchema.validateAsync(data);
             const processedEnvs = [];
             for (const env of data.envs) {
@@ -1608,11 +1648,22 @@ class ProductsBuilderService {
                 throw new Error(`Storage ${tag} not found`);
             }
             const { _id, envs } = storage;
-            await create_productStorage_validator_1.UpdateProductStorageSchema.validateAsync(data); // Change to update;
             if (data.tag && await this.fetchStorage(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
             // Only process envs if they are provided in the update
+            if (data.envs && data.envs.length > 0) {
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
+                data.envs = await Promise.all(data.envs.map(async (env) => (0, storage_cloud_link_util_1.materializeCloudLinkedStorageEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    storageTag: data.tag || tag,
+                })));
+            }
+            await create_productStorage_validator_1.UpdateProductStorageSchema.validateAsync(data);
             if (data.envs && data.envs.length > 0) {
                 data.envs = await Promise.all(data.envs.map(async (env) => {
                     const exists = await this.fetchEnv(env.slug);
@@ -1725,6 +1776,19 @@ class ProductsBuilderService {
             productTag: (_b = this.product) === null || _b === void 0 ? void 0 : _b.tag,
         });
         if (!(await this.fetchVector(data.tag))) {
+            const auth = this.getUserAccess();
+            const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+            const productTag = this.product.tag;
+            const materializedEnvs = [];
+            for (const env of data.envs || []) {
+                materializedEnvs.push(await (0, cloud_vector_link_util_1.materializeCloudLinkedVectorEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    vectorTag: data.tag,
+                }));
+            }
+            data.envs = materializedEnvs;
             await validators_1.CreateProductVectorSchema.validateAsync(data);
             const processedEnvs = [];
             for (const env of data.envs) {
@@ -1810,43 +1874,52 @@ class ProductsBuilderService {
             }
             if (data.envs) {
                 console.log('[ProductsService.updateVector] Processing envs update');
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
                 data.envs = await Promise.all(data.envs.map(async (env) => {
                     var _a, _b;
+                    const materialized = await (0, cloud_vector_link_util_1.materializeCloudLinkedVectorEnv)(env, {
+                        cloudApi,
+                        auth,
+                        productTag,
+                        vectorTag: data.tag || tag,
+                    });
                     console.log('[ProductsService.updateVector] Processing env:', {
                         slug: env.slug,
                         hasApiKey: !!env.apiKey,
                         hasEndpoint: !!env.endpoint,
                     });
-                    const exists = await this.fetchEnv(env.slug);
+                    const exists = await this.fetchEnv(materialized.slug);
                     if (!exists) {
-                        throw new Error(`Env ${env.slug} does not exist`);
+                        throw new Error(`Env ${materialized.slug} does not exist`);
                     }
                     // Store API key as secret and encrypt
-                    if (env.apiKey) {
-                        console.log('[ProductsService.updateVector] Converting API key to secret for env:', env.slug);
-                        const originalApiKey = env.apiKey;
-                        env.apiKey = await this.storeVectorApiKeyAsSecret(env.apiKey, data.tag || tag, env.slug);
+                    if (materialized.apiKey) {
+                        console.log('[ProductsService.updateVector] Converting API key to secret for env:', materialized.slug);
+                        const originalApiKey = materialized.apiKey;
+                        materialized.apiKey = await this.storeVectorApiKeyAsSecret(materialized.apiKey, data.tag || tag, materialized.slug);
                         console.log('[ProductsService.updateVector] API key after secret conversion:', {
-                            wasConverted: originalApiKey !== env.apiKey,
-                            isSecretRef: (_a = env.apiKey) === null || _a === void 0 ? void 0 : _a.startsWith('$Secret{'),
+                            wasConverted: originalApiKey !== materialized.apiKey,
+                            isSecretRef: (_a = materialized.apiKey) === null || _a === void 0 ? void 0 : _a.startsWith('$Secret{'),
                         });
-                        env.apiKey = (0, processor_utils_1.encrypt)(env.apiKey, this.product.private_key);
+                        materialized.apiKey = (0, processor_utils_1.encrypt)(materialized.apiKey, this.product.private_key);
                         console.log('[ProductsService.updateVector] API key encrypted');
                     }
                     // Store endpoint as secret and encrypt
-                    if (env.endpoint) {
-                        console.log('[ProductsService.updateVector] Converting endpoint to secret for env:', env.slug);
-                        const originalEndpoint = env.endpoint;
-                        env.endpoint = await this.storeVectorEndpointAsSecret(env.endpoint, data.tag || tag, env.slug);
+                    if (materialized.endpoint) {
+                        console.log('[ProductsService.updateVector] Converting endpoint to secret for env:', materialized.slug);
+                        const originalEndpoint = materialized.endpoint;
+                        materialized.endpoint = await this.storeVectorEndpointAsSecret(materialized.endpoint, data.tag || tag, materialized.slug);
                         console.log('[ProductsService.updateVector] Endpoint after secret conversion:', {
-                            wasConverted: originalEndpoint !== env.endpoint,
-                            isSecretRef: (_b = env.endpoint) === null || _b === void 0 ? void 0 : _b.startsWith('$Secret{'),
+                            wasConverted: originalEndpoint !== materialized.endpoint,
+                            isSecretRef: (_b = materialized.endpoint) === null || _b === void 0 ? void 0 : _b.startsWith('$Secret{'),
                         });
-                        env.endpoint = (0, processor_utils_1.encrypt)(env.endpoint, this.product.private_key);
+                        materialized.endpoint = (0, processor_utils_1.encrypt)(materialized.endpoint, this.product.private_key);
                         console.log('[ProductsService.updateVector] Endpoint encrypted');
                     }
-                    console.log('[ProductsService.updateVector] Env processed successfully:', env.slug);
-                    return env;
+                    console.log('[ProductsService.updateVector] Env processed successfully:', materialized.slug);
+                    return materialized;
                 }));
                 const overwrite = [];
                 const newEnvs = [];
@@ -2527,18 +2600,26 @@ class ProductsBuilderService {
         }
     }
     async fetchAppWebhooks(access_tag) {
+        var _a;
         try {
             const app = await this.fetchThirdPartyAppByAccessTag(access_tag);
             if (!app) {
                 throw new Error(`App with access tag ${access_tag} not found`);
             }
             const version = app.versions.find((version) => version.tag === app.version);
-            //const status = await this.webhooksApi.fetchWebhooks({access_tag, app_tag: app.tag, version: app.version}, this.getUserAccess())
-            console.log(status);
             if (!version) {
                 throw new Error(`Required app version not found`);
             }
-            return version.webhooks;
+            try {
+                const withConfig = await this.webhooksApi.fetchWebhooks({ access_tag, app_tag: app.tag, version: app.version }, this.getUserAccess());
+                if (Array.isArray(withConfig) && withConfig.length > 0) {
+                    return withConfig;
+                }
+            }
+            catch (_b) {
+                // Fall back to app definition webhooks when runtime service is unavailable
+            }
+            return (_a = version.webhooks) !== null && _a !== void 0 ? _a : [];
         }
         catch (e) {
             throw e;
@@ -4017,11 +4098,11 @@ class ProductsBuilderService {
         return datapoint;
     }
     async fetchThirdPartyAppByAccessTag(access_tag) {
+        const cached = this.thirdPartyApps.find((item) => access_tag === item.access_tag);
+        if (cached) {
+            return Object.assign(Object.assign({}, cached.app), { version: cached.version });
+        }
         try {
-            const app = this.thirdPartyApps.find((item) => access_tag === item.access_tag);
-            if (app) {
-                return Object.assign(Object.assign({}, app.app), { version: app.version });
-            }
             const access = await this.appApi.fetchAccessByTag(access_tag, this.getUserAccess());
             if (!access) {
                 throw new Error(`Access to app ${access_tag} not found`);
@@ -4030,10 +4111,57 @@ class ProductsBuilderService {
             this.thirdPartyApps.push({ access_tag, app: appData, version: access.version });
             return Object.assign(Object.assign({}, appData), { version: access.version });
         }
-        catch (e) {
-            throw e;
+        catch (primaryError) {
+            const resolved = await this.fetchThirdPartyAppByAppTagFallback(access_tag);
+            if (resolved) {
+                this.thirdPartyApps.push({
+                    access_tag,
+                    app: resolved,
+                    version: resolved.version,
+                });
+                return resolved;
+            }
+            throw primaryError;
         }
     }
+    /**
+     * When workspace access-tag lookup fails (common for product-scoped tags like ductape:paystack:ductape),
+     * resolve the app via product-linked components or fetchAppByTag.
+     */
+    async fetchThirdPartyAppByAppTagFallback(access_tag) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const appTag = await this.resolveAppTagFromAccessReference(access_tag);
+        if (!appTag)
+            return null;
+        const appData = await this.appApi.fetchAppByTag(appTag, this.getUserAccess());
+        if (!appData)
+            return null;
+        const version = (_g = (_d = (_a = (typeof appData.version === 'string'
+            ? appData.version
+            : undefined)) !== null && _a !== void 0 ? _a : (_c = (_b = appData.versions) === null || _b === void 0 ? void 0 : _b.find((v) => v.tag === 'ductape')) === null || _c === void 0 ? void 0 : _c.tag) !== null && _d !== void 0 ? _d : (_f = (_e = appData.versions) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.tag) !== null && _g !== void 0 ? _g : 'ductape';
+        return Object.assign(Object.assign({}, appData), { version });
+    }
+    async resolveAppTagFromAccessReference(access_tag) {
+        if (this.product_id) {
+            const productApps = (await this.productApi.fetchProductComponents(this.product_id, 'app', this.getUserAccess()));
+            const linked = productApps.find((a) => {
+                var _a;
+                return a.access_tag === access_tag ||
+                    a.app_tag === access_tag ||
+                    ((_a = a.access_tag) === null || _a === void 0 ? void 0 : _a.startsWith(`${access_tag}:`));
+            });
+            if (linked === null || linked === void 0 ? void 0 : linked.app_tag)
+                return linked.app_tag;
+        }
+        // Heuristic: product access tags are often `{app_tag}:{workspace}` — try app tag prefix
+        if (access_tag.includes(':')) {
+            const parts = access_tag.split(':');
+            if (parts.length >= 2) {
+                return `${parts[0]}:${parts[1]}`;
+            }
+        }
+        return access_tag;
+    }
     fetchThirdPartyAppActionByTag(actions, action_tag) {
         const action = actions.find((action) => action.tag === action_tag);
         if (!action) {
@@ -4107,8 +4235,20 @@ class ProductsBuilderService {
     }
     async createDatabase(data, throwErrorIfExists = false) {
         try {
-            // TODO: figure out a way to check if this has run before, halt if it has
             if (!(await this.fetchDatabase(data.tag))) {
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
+                const materializedEnvs = [];
+                for (const env of data.envs || []) {
+                    materializedEnvs.push(await (0, cloud_database_link_util_1.materializeCloudLinkedDatabaseEnv)(env, {
+                        cloudApi,
+                        auth,
+                        productTag,
+                        databaseTag: data.tag,
+                    }));
+                }
+                data.envs = materializedEnvs;
                 await validators_1.CreateProductDatabaseSchema.validateAsync(data);
                 const processedEnvs = [];
                 for (const env of data.envs) {
@@ -4145,20 +4285,36 @@ class ProductsBuilderService {
                 throw new Error(`Database  ${tag} not found`);
             }
             const { _id, envs } = db;
-            await validators_1.UpdateProductDatabaseSchema.validateAsync(data); // Change to update;
             if (data.tag && this.fetchDatabase(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
-            data.envs = await Promise.all(data.envs.map(async (env) => {
-                const exists = await this.fetchEnv(env.slug);
-                if (!exists) {
-                    throw new Error(`Env ${env.slug} does not exist`);
-                }
-                if (env.connection_url) {
-                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
-                }
-                return env;
-            }));
+            if (data.envs && data.envs.length > 0) {
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
+                data.envs = await Promise.all(data.envs.map(async (env) => (0, cloud_database_link_util_1.materializeCloudLinkedDatabaseEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    databaseTag: data.tag || tag,
+                })));
+            }
+            await validators_1.UpdateProductDatabaseSchema.validateAsync(data);
+            if (data.envs && data.envs.length > 0) {
+                data.envs = await Promise.all(data.envs.map(async (env) => {
+                    const exists = await this.fetchEnv(env.slug);
+                    if (!exists) {
+                        throw new Error(`Env ${env.slug} does not exist`);
+                    }
+                    if (env.connection_url) {
+                        env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
+                    }
+                    return env;
+                }));
+            }
+            if (!data.envs) {
+                data.envs = [];
+            }
             const overwrite = [];
             const newEnvs = [];
             data.envs.map((dataEnv) => {
@@ -4241,6 +4397,19 @@ class ProductsBuilderService {
         });
         try {
             if (!(await this.fetchGraph(data.tag))) {
+                const auth = this.getUserAccess();
+                const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+                const productTag = this.product.tag;
+                const materializedEnvs = [];
+                for (const env of data.envs || []) {
+                    materializedEnvs.push(await (0, cloud_graph_link_util_1.materializeCloudLinkedGraphEnv)(env, {
+                        cloudApi,
+                        auth,
+                        productTag,
+                        graphTag: data.tag,
+                    }));
+                }
+                data.envs = materializedEnvs;
                 await validators_1.CreateProductGraphSchema.validateAsync(data);
                 const processedEnvs = [];
                 for (const env of data.envs) {
@@ -4321,41 +4490,50 @@ class ProductsBuilderService {
                 throw new Error(`tag ${tag} is in use`);
             }
             console.log('[ProductsService.updateGraph] Processing envs update');
+            const auth = this.getUserAccess();
+            const cloudApi = new cloudApi_service_1.CloudApiService(this.env_type);
+            const productTag = this.product.tag;
             data.envs = await Promise.all(data.envs.map(async (env) => {
                 var _a;
+                const materialized = await (0, cloud_graph_link_util_1.materializeCloudLinkedGraphEnv)(env, {
+                    cloudApi,
+                    auth,
+                    productTag,
+                    graphTag: data.tag || tag,
+                });
                 console.log('[ProductsService.updateGraph] Processing env:', {
-                    slug: env.slug,
-                    hasConnectionUrl: !!env.connection_url,
-                    hasUsername: !!env.username,
-                    hasPassword: !!env.password,
+                    slug: materialized.slug,
+                    hasConnectionUrl: !!materialized.connection_url,
+                    hasUsername: !!materialized.username,
+                    hasPassword: !!materialized.password,
                 });
-                const exists = await this.fetchEnv(env.slug);
+                const exists = await this.fetchEnv(materialized.slug);
                 if (!exists) {
-                    throw new Error(`Env ${env.slug} does not exist`);
+                    throw new Error(`Env ${materialized.slug} does not exist`);
                 }
-                if (env.connection_url) {
+                if (materialized.connection_url) {
                     // Store connection URL as secret
-                    console.log('[ProductsService.updateGraph] Converting connection URL to secret for env:', env.slug);
-                    const originalUrl = env.connection_url;
-                    env.connection_url = await this.storeGraphConnectionUrlAsSecret(env.connection_url, data.tag || tag, env.slug);
+                    console.log('[ProductsService.updateGraph] Converting connection URL to secret for env:', materialized.slug);
+                    const originalUrl = materialized.connection_url;
+                    materialized.connection_url = await this.storeGraphConnectionUrlAsSecret(materialized.connection_url, data.tag || tag, materialized.slug);
                     console.log('[ProductsService.updateGraph] Connection URL after secret conversion:', {
-                        wasConverted: originalUrl !== env.connection_url,
-                        isSecretRef: (_a = env.connection_url) === null || _a === void 0 ? void 0 : _a.startsWith('$Secret{'),
+                        wasConverted: originalUrl !== materialized.connection_url,
+                        isSecretRef: (_a = materialized.connection_url) === null || _a === void 0 ? void 0 : _a.startsWith('$Secret{'),
                     });
-                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
+                    materialized.connection_url = (0, processor_utils_1.encrypt)(materialized.connection_url, this.product.private_key);
                     console.log('[ProductsService.updateGraph] Connection URL encrypted');
                 }
                 // Encrypt username and password if provided
-                if (env.username) {
-                    console.log('[ProductsService.updateGraph] Encrypting username for env:', env.slug);
-                    env.username = (0, processor_utils_1.encrypt)(env.username, this.product.private_key);
+                if (materialized.username) {
+                    console.log('[ProductsService.updateGraph] Encrypting username for env:', materialized.slug);
+                    materialized.username = (0, processor_utils_1.encrypt)(materialized.username, this.product.private_key);
                 }
-                if (env.password) {
-                    console.log('[ProductsService.updateGraph] Encrypting password for env:', env.slug);
-                    env.password = (0, processor_utils_1.encrypt)(env.password, this.product.private_key);
+                if (materialized.password) {
+                    console.log('[ProductsService.updateGraph] Encrypting password for env:', materialized.slug);
+                    materialized.password = (0, processor_utils_1.encrypt)(materialized.password, this.product.private_key);
                 }
-                console.log('[ProductsService.updateGraph] Env processed successfully:', env.slug);
-                return env;
+                console.log('[ProductsService.updateGraph] Env processed successfully:', materialized.slug);
+                return materialized;
             }));
             const overwrite = [];
             const newEnvs = [];