@catladder/cli 0.0.0-refactor-cache-5eaa74d2 → 0.0.0-refactor-resolve-references-90442171

package/dist/bundles/catenv/index.js

@@ -751,12 +751,13 @@ exports.getProjectNamespace = getProjectNamespace;
 /***/ }),
 
 /***/ 2376:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
 /**
  * this class represents a string that can be evaluated in bash scripts.
  *
@@ -772,6 +773,9 @@ class BashExpression {
     toString() {
         return this.value.toString();
     }
+    replace(searchValue, replacer) {
+        return new BashExpression(this.value.toString().replace(searchValue, replacer));
+    }
     /**
      *
      * @returns a bash expression to lowercase the string
@@ -825,10 +829,13 @@ const bashEscape = (value) => {
     if (value instanceof BashExpression) {
         return value.toString(); // no need to escape bash expressions, as we want them to evaluate
     }
+    if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+        return value.toString({
+            escapeQuotes: true,
+        });
+    }
     // we wrap it in double quotes, so we need to escape them
-    if (typeof value === "string")
-        return value.replace(/"/g, '\\"');
-    return value;
+    return value === null || value === void 0 ? void 0 : value.toString().replace(/"/g, '\\"');
 };
 exports.bashEscape = bashEscape;
 //# sourceMappingURL=BashExpression.js.map
@@ -861,6 +868,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
 const yaml_1 = __nccwpck_require__(8033);
 const BashExpression_1 = __nccwpck_require__(2376);
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
 const bashExpressionType = {
     tag: "",
     resolve: (str) => {
@@ -871,10 +879,30 @@ const bashExpressionType = {
         // we create a BLOCK_LITERAL
         // but because bash will interpret the value, it may resolve to a multiline string
         // so we need to indent every line using sed
-        return "|-\n" + node.value.transformWithCommand(`sed 's/^/${ctx.indent}/'`);
+        return "|-\n" + indentNewlinesInBashExpression(node.value, ctx.indent);
     },
     identify: (v) => v instanceof BashExpression_1.BashExpression,
 };
+const indentNewlinesInBashExpression = (expression, indent) => {
+    return expression.transformWithCommand(`sed 's/^/${indent}/'`);
+};
+const variableContainingReferences = {
+    tag: "",
+    resolve: (str) => {
+        // not really needed,but let's make typescript happy
+        return new VariableValueContainingReferences_1.VariableValueContainingReferences(str);
+    },
+    stringify(node, ctx) {
+        const value = node.value;
+        const stringified = value.parts
+            .map((part) => part instanceof BashExpression_1.BashExpression
+            ? indentNewlinesInBashExpression(part, ctx.indent)
+            : part.toString())
+            .join("");
+        return "|-\n" + ctx.indent + stringified;
+    },
+    identify: (v) => v instanceof VariableValueContainingReferences_1.VariableValueContainingReferences,
+};
 /***
  * creates a yaml string that can be used in bash scripts
  * it handles BashExpressions correctly so that they can be evaluated in bash
@@ -883,7 +911,7 @@ const yamlBashString = (value) => {
     return (0, yaml_1.stringify)(value, {
         defaultStringType: "BLOCK_LITERAL",
         defaultKeyType: "PLAIN",
-        customTags: [bashExpressionType],
+        customTags: [bashExpressionType, variableContainingReferences],
         aliasDuplicateObjects: false,
         lineWidth: 0,
     });
@@ -928,50 +956,6 @@ exports.getInjectVarsScript = getInjectVarsScript;
 
 /***/ }),
 
-/***/ 2233:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-const BashExpression_1 = __nccwpck_require__(2376);
-// from https://github.com/dsblv/string-replace-async/blob/main/index.js
-// and adjusted a bit
-async function replaceAsync(string, searchValue, replacer) {
-    const wasBashExpression = string instanceof BashExpression_1.BashExpression;
-    try {
-        // 1. Run fake pass of `replace`, collect values from `replacer` calls
-        // 2. Resolve them with `Promise.all`
-        // 3. Run `replace` with resolved values
-        const values = [];
-        String.prototype.replace.call(string.toString(), searchValue, function (...args) {
-            // eslint-disable-next-line prefer-spread
-            const result = replacer.apply(undefined, args);
-            values.push(result);
-            return "";
-        });
-        const resolvedValues = await Promise.all(values);
-        const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
-        const result = String.prototype.replace.call(string.toString(), searchValue, function () {
-            var _a, _b;
-            return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
-        });
-        if (wasBashExpression || containsBashExpression) {
-            return new BashExpression_1.BashExpression(result);
-        }
-        else {
-            return result;
-        }
-    }
-    catch (error) {
-        return Promise.reject(error);
-    }
-}
-exports["default"] = replaceAsync;
-//# sourceMappingURL=replaceAsync.js.map
-
-/***/ }),
-
 /***/ 8774:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -1297,14 +1281,18 @@ exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDot
 /***/ }),
 
 /***/ 340:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createJobCacheFromConfig = exports.createJobCacheFromCacheConfigs = void 0;
 const path_1 = __nccwpck_require__(1017);
 const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(673);
+const slugify_1 = __importDefault(__nccwpck_require__(7548));
 const createJobCacheFromCacheConfigs = (context, caches) => {
     if (caches.length === 0)
         return undefined;
@@ -1333,7 +1321,7 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
             ? key
             : typeof key === "string"
                 ? (scope === "buildDir" // really edge case...
-                    ? baseDir
+                    ? (0, slugify_1.default)(baseDir)
                     : context.name) +
                     "-" +
                     key
@@ -1642,7 +1630,7 @@ const getDockerJobBaseProps = () => {
         services: [
             {
                 name: "docker:24.0.6-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
-                command: ["--tls=false"],
+                command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"],
             },
         ],
         variables: {},
@@ -1872,7 +1860,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 const lodash_1 = __nccwpck_require__(3255);
 const path_1 = __nccwpck_require__(1017);
-const slugify_1 = __importDefault(__nccwpck_require__(4035));
+const slugify_1 = __importDefault(__nccwpck_require__(7548));
 const getYarnCache = (context, policy = "pull-push") => {
     const componentIsInWorkspace = context.type === "component" &&
         context.packageManagerInfo.componentIsInWorkspace;
@@ -2940,7 +2928,9 @@ const getBuildInfoVariables_1 = __nccwpck_require__(7827);
 const getEnvironmentContext_1 = __nccwpck_require__(3663);
 const resolveReferences_1 = __nccwpck_require__(3115);
 const transformJobOnlyVars_1 = __nccwpck_require__(1552);
+const replaceAllReferences_1 = __nccwpck_require__(4035);
 const envVars_1 = __nccwpck_require__(6296);
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
 const getBasePredefinedVariables = (ctx) => {
     return {
         ENV_SHORT: ctx.env,
@@ -2949,7 +2939,7 @@ const getBasePredefinedVariables = (ctx) => {
         ...(ctx.envType !== "local" ? (0, getBuildInfoVariables_1.getBuildInfoVariables)(ctx) : {}),
     };
 };
-const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
+const getEnvironmentVariables = async (ctx, shouldResolveReferences = true) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const { config, env, componentName } = ctx;
@@ -3012,18 +3002,26 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
     const legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
     const publicEnvVarsRawWithLegacyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
     const publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRawWithLegacyFromComponents);
-    const envVarsRaw = addIndexVar({
+    const publicEnvVarsUnresolved = Object.fromEntries(Object.entries(publicEnvVarsRawSanitized).map(([key, value]) => [
+        key,
+        (0, VariableValueContainingReferences_1.createVariableValueContainingReferencesFromString)(value, {
+            componentName: ctx.componentName,
+        }),
+    ]));
+    const publicEnvVars = shouldResolveReferences
+        ? await (0, replaceAllReferences_1.replaceAllReferences)(publicEnvVarsUnresolved, async (otherComponentName) => {
+            const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
+                ...ctx,
+                componentName: otherComponentName,
+            }, false);
+            return otherEnvVars;
+        })
+        : publicEnvVarsUnresolved;
+    const envVars = addIndexVar({
         ...predefinedVariables,
         ...secretEnvVars,
-        ...publicEnvVarsRawSanitized,
+        ...publicEnvVars,
     });
-    const envVars = (await (0, resolveReferences_1.resolveReferences)(envVarsRaw, async (otherComponentName, alreadyVisited) => {
-        const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
-            ...ctx,
-            componentName: otherComponentName,
-        }, alreadyVisited);
-        return otherEnvVars;
-    }, alreadyVisited));
     return {
         envVars,
         secretEnvVarKeys,
@@ -3062,7 +3060,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getLabels = void 0;
-const slugify_1 = __importDefault(__nccwpck_require__(4035));
+const slugify_1 = __importDefault(__nccwpck_require__(7548));
 const sanitize = (value) => {
     if (!value)
         return value;
@@ -3142,64 +3140,12 @@ __exportStar(__nccwpck_require__(5133), exports);
 /***/ }),
 
 /***/ 3115:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.translateLegacyFromComponents = exports.resolveReferences = void 0;
-const lodash_1 = __nccwpck_require__(3255);
-const replaceAsync_1 = __importDefault(__nccwpck_require__(2233));
-// regex to resolve references in catladder variables
-// those expressions have the pattern ${componentName:variableName}
-const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
-const resolveReferences = async (vars, getOtherVariables, alreadyVisitedBase = {}) => {
-    /**
-     *
-     * replace referenced variables with their values in a value string
-     */
-    const replaceSingleValue = async (value, alreadyVisited = alreadyVisitedBase) => {
-        if (REGEX.test(value.toString())) {
-            // we consider variables that got references in it  BashExpressions, because the replacement may be one
-            return await (0, replaceAsync_1.default)(value, REGEX, async (match, _, componentName, variableName) => {
-                var _a, _b;
-                if ((_a = alreadyVisited[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) {
-                    return match; // prevent endless loop
-                }
-                const newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, {
-                    [componentName]: {
-                        [variableName]: true,
-                    },
-                });
-                const result = componentName
-                    ? (_b = (await (getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, newAlreadyVisited).then((r) => r === null || r === void 0 ? void 0 : r[variableName])))) !== null && _b !== void 0 ? _b : null
-                    : vars[variableName]; // is self reference
-                const replaced = result !== null && result !== undefined
-                    ? await replaceSingleValue(result, newAlreadyVisited)
-                    : match;
-                return replaced;
-            });
-        }
-        else {
-            return value;
-        }
-    };
-    return Object.fromEntries(await Promise.all(Object.entries(vars).map(async ([key, value]) => {
-        if (value === null || value === undefined) {
-            return [key, null];
-        }
-        return [
-            key,
-            value !== null && value !== undefined
-                ? await replaceSingleValue(value)
-                : null,
-        ];
-    })));
-};
-exports.resolveReferences = resolveReferences;
+exports.translateLegacyFromComponents = void 0;
 const translateLegacyFromComponents = (fromComponents) => {
     return Object.fromEntries(Object.entries(fromComponents).flatMap(([componentName, variables]) => {
         return Object.entries(variables).map(([ourName, otherName]) => [
@@ -3935,6 +3881,8 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
         timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
         "vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
         "vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
+        network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
+        subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
         "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
         "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
         ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
@@ -4846,7 +4794,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.KUBERNETES_DEPLOY_TYPE = void 0;
-const slugify_1 = __importDefault(__nccwpck_require__(4035));
+const slugify_1 = __importDefault(__nccwpck_require__(7548));
 const __1 = __nccwpck_require__(8483);
 const BashExpression_1 = __nccwpck_require__(2376);
 const additionalSecretKeys_1 = __nccwpck_require__(436);
@@ -6651,6 +6599,165 @@ exports.writeYamlfile = writeYamlfile;
 
 /***/ }),
 
+/***/ 1592:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createVariableValueContainingReferencesFromString = exports.VariableValueContainingReferences = exports.VariableReference = exports.UnresolvableReference = void 0;
+class UnresolvableReference {
+    constructor(reference) {
+        this.reference = reference;
+    }
+    toString() {
+        return `Unresolvable reference: ${this.reference.toString()}`;
+    }
+}
+exports.UnresolvableReference = UnresolvableReference;
+class VariableReference {
+    constructor(componentName, variableName) {
+        this.componentName = componentName;
+        this.variableName = variableName;
+    }
+    toString() {
+        return `\${${this.componentName}:${this.variableName}}`;
+    }
+}
+exports.VariableReference = VariableReference;
+class VariableValueContainingReferences {
+    constructor(parts) {
+        this.parts = (Array.isArray(parts) ? parts : [parts]).flatMap((part) => part instanceof VariableValueContainingReferences
+            ? part.parts
+            : part === ""
+                ? []
+                : [part]);
+    }
+    toString(options = { escapeQuotes: false }) {
+        return this.parts
+            .map((part) => {
+            if (typeof part === "string") {
+                return options.escapeQuotes ? part.replace(/"/g, '\\"') : part;
+            }
+            else {
+                return part.toString();
+            }
+        })
+            .join("");
+    }
+}
+exports.VariableValueContainingReferences = VariableValueContainingReferences;
+// regex to resolve references in catladder variables
+// those expressions have the pattern ${componentName:variableName}
+const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
+const createVariableValueContainingReferencesFromString = (value, options) => {
+    const parts = [];
+    let match;
+    let lastIndex = 0;
+    while ((match = REGEX.exec(value)) !== null) {
+        const [fullMatch, _, otherComponentName, variableName] = match;
+        parts.push(value.slice(lastIndex, match.index));
+        parts.push(new VariableReference(otherComponentName || options.componentName, variableName));
+        lastIndex = REGEX.lastIndex;
+    }
+    parts.push(value.slice(lastIndex));
+    return new VariableValueContainingReferences(parts);
+};
+exports.createVariableValueContainingReferencesFromString = createVariableValueContainingReferencesFromString;
+//# sourceMappingURL=VariableValueContainingReferences.js.map
+
+/***/ }),
+
+/***/ 4035:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.replaceAllReferences = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
+const replaceAllReferencesOnce_1 = __nccwpck_require__(2726);
+const replaceAllReferences = async (values, getEnvVars) => {
+    // replace until there aren't any references left
+    let result = values;
+    let i = 0;
+    while (Object.values(result).some((value) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference))) {
+        const replaced = await (0, replaceAllReferencesOnce_1.replaceAllReferencesOnce)(result, getEnvVars);
+        result = replaced;
+        i++;
+        if (i > 1000) {
+            const unresolved = Object.entries(result).filter(([key, value]) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
+            throw new Error("Infinite loop detected in these variables: " +
+                unresolved
+                    .map(([key, value]) => `${key} (last reference: ${value.parts.find((part) => part instanceof VariableValueContainingReferences_1.VariableReference)})`)
+                    .join(", "));
+        }
+    }
+    return result;
+};
+exports.replaceAllReferences = replaceAllReferences;
+//# sourceMappingURL=replaceAllReferences.js.map
+
+/***/ }),
+
+/***/ 2726:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.replaceAllReferencesOnce = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
+const replaceReferencesOnce_1 = __nccwpck_require__(8666);
+const replaceAllReferencesOnce = async (values, getEnvVars) => {
+    const allReferences = Object.values(values).flatMap((value) => value === null || value === void 0 ? void 0 : value.parts.filter((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
+    const allComponentsUnique = Array.from(new Set(allReferences.map((reference) => reference.componentName)));
+    const allEnvVarsInComponents = Object.fromEntries(await Promise.all(allComponentsUnique.map(async (componentName) => [
+        componentName,
+        await getEnvVars(componentName),
+    ])));
+    return Object.fromEntries(Object.entries(values).map(([key, value]) => [
+        key,
+        value !== null && value !== undefined
+            ? (0, replaceReferencesOnce_1.replaceReferencesOnce)(value, ({ componentName, variableName }) => {
+                return allEnvVarsInComponents[componentName][variableName];
+            })
+            : value,
+    ]));
+};
+exports.replaceAllReferencesOnce = replaceAllReferencesOnce;
+//# sourceMappingURL=replaceAllReferencesOnce.js.map
+
+/***/ }),
+
+/***/ 8666:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.replaceReferencesOnce = void 0;
+const VariableValueContainingReferences_1 = __nccwpck_require__(1592);
+const replaceReferencesOnce = (value, replacer) => {
+    const replacedParts = value.parts.map((part) => {
+        if (part instanceof VariableValueContainingReferences_1.VariableReference) {
+            const result = replacer({
+                componentName: part.componentName,
+                variableName: part.variableName,
+            });
+            return result !== null && result !== void 0 ? result : new VariableValueContainingReferences_1.UnresolvableReference(part);
+        }
+        else {
+            return part;
+        }
+    });
+    return new VariableValueContainingReferences_1.VariableValueContainingReferences(replacedParts);
+};
+exports.replaceReferencesOnce = replaceReferencesOnce;
+//# sourceMappingURL=replaceReferencesOnce.js.map
+
+/***/ }),
+
 /***/ 5763:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
@@ -39770,7 +39877,7 @@ module.exports = safer
 
 /***/ }),
 
-/***/ 4035:
+/***/ 7548:
 /***/ (function(module) {