@catladder/cli 0.0.0-next-e2e4f00a → 0.0.0-next-de346530

package/dist/bundles/cli/index.js

@@ -4231,7 +4231,7 @@ const constants_1 = __nccwpck_require__(82786);
 const writeBuildInfo_1 = __nccwpck_require__(99578);
 const writeDotEnv_1 = __nccwpck_require__(48052);
 const createAppBuildJob = (context, { script, variables, runnerVariables, cache, ...def }) => {
-    var _a, _b;
+    var _a;
     return (0, lodash_1.merge)({
         name: constants_1.APP_BUILD_JOB_NAME,
         envMode: "jobPerEnv",
@@ -4245,14 +4245,13 @@ const createAppBuildJob = (context, { script, variables, runnerVariables, cache,
                 ? {
                     ...context.environment.envVars,
                     ...context.environment.jobOnlyVars.build.envVars,
-                    ...((_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {}),
                 }
                 : {}),
         },
         runnerVariables: {
             ...constants_1.RUNNER_BUILD_RESOURCE_VARIABLES,
             ...(runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}),
-            ...((_b = context.build.config.runnerVariables) !== null && _b !== void 0 ? _b : {}),
+            ...((_a = context.build.config.runnerVariables) !== null && _a !== void 0 ? _a : {}),
         },
         script: [
             ...(context.type === "component"
@@ -4652,7 +4651,7 @@ const RUNNER_CUSTOM_TEST_VARIABLES = {
     KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 const createCustomTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
@@ -4666,7 +4665,6 @@ const createCustomTestJobs = (context) => {
         variables: {
             APP_PATH: context.build.dir,
             ...context.environment.jobOnlyVars.build.envVars,
-            ...((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
         },
         runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
         services: buildConfig.jobServices,
@@ -4679,29 +4677,29 @@ const createCustomTestJobs = (context) => {
         ? {
             name: "🛡 audit",
             ...base,
-            image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage,
+            image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage,
             cache: undefined,
-            script: [...(0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)],
+            script: [...(0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)],
             allow_failure: true,
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts),
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.artifactsReports, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifacts),
         }
         : null;
     const lintJob = buildConfig.lint
         ? {
             name: "👮 lint",
             ...base,
-            image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
-            script: [...(0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifactsReports, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifacts),
+            image: (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.command)],
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.artifactsReports, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifacts),
         }
         : null;
     const testJob = buildConfig.test
         ? {
             name: "🧪 test",
             ...base,
-            image: (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
-            script: [...(0, utils_1.ensureArray)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifactsReports, (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.artifacts),
+            image: (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.command)],
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.artifactsReports, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifacts),
         }
         : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
@@ -5003,7 +5001,7 @@ const createNodeBuildJobDefinition = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context);
     return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
         prescript: yarnInstall,
-        cache: [...(0, cache_1.getNodeCache)(context), ...(0, cache_1.getNextCache)(context)],
+        cache: (0, cache_1.getNodeCache)(context),
     });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
@@ -5038,7 +5036,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getWorkspaceDefaultCaches = exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
+exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 const lodash_1 = __nccwpck_require__(23255);
 const path_1 = __nccwpck_require__(71017);
 const slugify_1 = __importDefault(__nccwpck_require__(44035));
@@ -5087,35 +5085,9 @@ const getNodeCache = (context, policy = "pull-push") => {
     return [
         ...(0, exports.getYarnCache)(context, policy),
         ...(0, exports.getNodeModulesCache)(context, policy),
-        ...(context.type === "workspace" ? (0, exports.getWorkspaceDefaultCaches)(context) : []),
     ];
 };
 exports.getNodeCache = getNodeCache;
-const getNextCache = (context) => {
-    const paths = context.build
-        .getComponentDirs("direct")
-        .map((c) => (0, path_1.join)(c, ".next/cache"));
-    return [
-        {
-            pathMode: "absolute",
-            key: "next-cache",
-            policy: "pull-push",
-            paths,
-        },
-    ];
-};
-exports.getNextCache = getNextCache;
-const getWorkspaceDefaultCaches = (context) => {
-    return [
-        {
-            // turbo repo
-            key: "turbo",
-            policy: "pull-push",
-            paths: [".turbo"],
-        },
-    ];
-};
-exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;
 //# sourceMappingURL=cache.js.map
 
 /***/ }),
@@ -5240,7 +5212,7 @@ const constants_1 = __nccwpck_require__(31765);
 const yarn_1 = __nccwpck_require__(45043);
 const createJobCache_1 = __nccwpck_require__(10340);
 const createNodeTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
@@ -5258,7 +5230,6 @@ const createNodeTestJobs = (context) => {
             ...(context.type === "component"
                 ? {
                     ...context.environment.jobOnlyVars.build.envVars,
-                    ...((_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {}),
                 }
                 : {}),
         },
@@ -5273,48 +5244,48 @@ const createNodeTestJobs = (context) => {
         ? {
             name: "🛡 audit",
             ...base,
-            image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
+            image: (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage,
             cache: undefined, // audit does not need yarn install and no cache
             script: [
                 `cd ${context.build.dir}`,
-                ...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
+                ...((_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : [
                     context.packageManagerInfo.isClassic
                         ? "yarn audit"
                         : "yarn npm audit --environment production", // yarn 2
                 ]),
             ],
             allow_failure: true,
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts),
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts),
         }
         : null;
     const lintJob = buildConfig.lint !== false
         ? {
             name: "👮 lint",
             ...base,
-            image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
+            image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
             cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
             script: [
                 ...(0, yarn_1.ensureNodeVersion)(context),
                 `cd ${context.build.dir}`,
                 ...yarnInstall,
-                ...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]),
+                ...((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : ["yarn lint"]),
             ],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts),
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifactsReports, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifacts),
         }
         : null;
     const testJob = buildConfig.test !== false
         ? {
             name: "🧪 test",
             ...base,
-            image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
+            image: (_p = (_o = buildConfig.test) === null || _o === void 0 ? void 0 : _o.jobImage) !== null && _p !== void 0 ? _p : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
             cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
             script: [
                 ...(0, yarn_1.ensureNodeVersion)(context),
                 `cd ${context.build.dir}`,
                 ...yarnInstall,
-                ...((_s = (0, utils_1.ensureArrayOrNull)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]),
+                ...((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["yarn test"]),
             ],
-            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts),
+            ...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.artifactsReports, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifacts),
         }
         : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
@@ -5430,7 +5401,6 @@ const createRailsBuildJobs = (context) => {
         dockerBuild: {
             variables: {
                 ...context.environment.jobOnlyVars.build.envVars,
-                ...context.build.config.extraVars,
             },
             // custom script
             script: [
@@ -5478,7 +5448,7 @@ exports.createRailsTestJobs = void 0;
 const __1 = __nccwpck_require__(10603);
 const utils_1 = __nccwpck_require__(32497);
 const createRailsTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
@@ -5492,7 +5462,6 @@ const createRailsTestJobs = (context) => {
     const base = {
         variables: {
             ...context.environment.jobOnlyVars.build.envVars,
-            ...((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
         },
         stage: "test",
         needs: [],
@@ -5516,10 +5485,10 @@ const createRailsTestJobs = (context) => {
             name: "🛡 audit",
             ...base,
             cache: undefined, // audit does not need bundle install and no cache
-            image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
+            image: (_c = (_b = (_a = buildConfig.audit) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : buildConfig.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
             script: [
                 `cd ${context.build.dir}`,
-                ...((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
+                ...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
                     "gem install bundler-audit",
                     "bundle audit check",
                 ]),
@@ -5532,11 +5501,11 @@ const createRailsTestJobs = (context) => {
             name: "👮 lint",
             ...base,
             cache: bundlerCache,
-            image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
+            image: (_h = (_g = (_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.jobImage) !== null && _g !== void 0 ? _g : buildConfig.jobImage) !== null && _h !== void 0 ? _h : defaultImage,
             script: [
                 `cd ${context.build.dir}`,
                 ...bundlerInstall,
-                ...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
+                ...((_k = (0, utils_1.ensureArrayOrNull)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)) !== null && _k !== void 0 ? _k : [
                     "bundle exec rubocop",
                 ]),
             ],
@@ -5547,11 +5516,11 @@ const createRailsTestJobs = (context) => {
             name: "🧪 test",
             ...base,
             cache: bundlerCache,
-            image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage,
+            image: (_o = (_m = (_l = buildConfig.test) === null || _l === void 0 ? void 0 : _l.jobImage) !== null && _m !== void 0 ? _m : buildConfig.jobImage) !== null && _o !== void 0 ? _o : defaultImage,
             script: [
                 `cd ${context.build.dir}`,
                 ...bundlerInstall,
-                ...((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
+                ...((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : [
                     "bundle exec rspec",
                 ]),
             ],
@@ -5868,7 +5837,6 @@ const createComponentContext = async (ctx) => {
     const context = {
         type: "component",
         name: ctx.componentName,
-        componentName: ctx.componentName,
         env: ctx.env,
         fullConfig: ctx.config,
         componentConfig,
@@ -6041,7 +6009,6 @@ const getEnvironment = async (ctx) => {
         slugPrefix: envContext.environmentSlugPrefix,
         reviewSlug: envContext.reviewSlug,
         slug: envContext.environmentSlug,
-        shortName: env,
         ...variables,
     };
 };
@@ -6101,7 +6068,6 @@ exports.getEnvironmentContext = getEnvironmentContext;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironmentVariables = void 0;
-const lodash_1 = __nccwpck_require__(23255);
 const deploy_1 = __nccwpck_require__(68483);
 const BashExpression_1 = __nccwpck_require__(42376);
 const types_1 = __nccwpck_require__(84466);
@@ -6119,7 +6085,7 @@ const getBasePredefinedVariables = (ctx) => {
     };
 };
 const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g;
     const environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const { config, env, componentName } = ctx;
     const { envConfigRaw, deployConfigRaw, buildConfigRaw, envType } = environmentContext;
@@ -6136,12 +6102,8 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
             ...basePredefinedVariables,
             ENV_SHORT: "local",
             ROOT_URL: url,
-            // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-            ...((0, types_1.isStandaloneBuildConfig)(buildConfigRaw) &&
-                buildConfigRaw.type === "rails"
-                ? {}
-                : { HOST: host }),
-            HOST_INTERNAL: host,
+            HOSTNAME: host,
+            HOSTNAME_INTERNAL: host,
             ROOT_URL_INTERNAL: "http://" + host,
             PORT: port.toString(),
         };
@@ -6150,8 +6112,8 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
         const additionalEnvVars = deployConfigRaw
             ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext)
             : {};
-        const HOST_INTERNAL = (_b = additionalEnvVars.HOST_INTERNAL) !== null && _b !== void 0 ? _b : "unknown-host.example.com";
-        host = (_c = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _c !== void 0 ? _c : HOST_INTERNAL;
+        const HOSTNAME_INTERNAL = (_b = additionalEnvVars.HOSTNAME_INTERNAL) !== null && _b !== void 0 ? _b : "unknown-host.example.com";
+        host = (_c = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _c !== void 0 ? _c : HOSTNAME_INTERNAL;
         url = (0, BashExpression_1.joinBashExpressions)(["https://", host]);
         predefinedVariables = {
             ...basePredefinedVariables,
@@ -6159,12 +6121,10 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
             ...((0, types_1.isStandaloneBuildConfig)(buildConfigRaw) &&
                 buildConfigRaw.type === "rails"
                 ? {}
-                : { HOST: host }),
+                : { HOSTNAME: host }),
             ROOT_URL: url,
-            HOST_INTERNAL,
-            /**@deprecated */
-            HOST_CANONICAL: HOST_INTERNAL, // legacy alias for HOST_INTERNAL
-            ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOST_INTERNAL]),
+            HOSTNAME_INTERNAL,
+            ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOSTNAME_INTERNAL]),
             ...additionalEnvVars,
         };
     }
@@ -6177,10 +6137,7 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
         ...additionalSecretKeys,
     ];
     const secretEnvVars = (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys);
-    // this is deprecated, we now support: $componentname:FOO
-    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 publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRaw);
     const envVarsRaw = addIndexVar({
         ...predefinedVariables,
         ...secretEnvVars,
@@ -6319,7 +6276,7 @@ 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;
+exports.resolveReferences = void 0;
 const lodash_1 = __nccwpck_require__(23255);
 const replaceAsync_1 = __importDefault(__nccwpck_require__(72233));
 // regex to resolve references in catladder variables
@@ -6369,15 +6326,6 @@ const resolveReferences = async (vars, getOtherVariables, alreadyVisitedBase = {
     })));
 };
 exports.resolveReferences = resolveReferences;
-const translateLegacyFromComponents = (fromComponents) => {
-    return Object.fromEntries(Object.entries(fromComponents).flatMap(([componentName, variables]) => {
-        return Object.entries(variables).map(([ourName, otherName]) => [
-            ourName,
-            "${" + componentName + ":" + otherName + "}",
-        ]);
-    }));
-};
-exports.translateLegacyFromComponents = translateLegacyFromComponents;
 //# sourceMappingURL=resolveReferences.js.map
 
 /***/ }),
@@ -6483,7 +6431,7 @@ const stop_1 = __nccwpck_require__(82846);
 const variables_1 = __nccwpck_require__(82422);
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 const createDeployJob = (context, jobDefinition) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const hasDocker = (0, docker_1.requiresDockerBuild)(context);
     const isStoppable = (0, utils_1.contextIsStoppable)(context);
     const autoStop = context.environment.envType === "review"
@@ -6562,13 +6510,12 @@ const createDeployJob = (context, jobDefinition) => {
             ...context.environment.envVars,
             ...(hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
             ...context.environment.jobOnlyVars.deploy.envVars,
-            ...(deployConfig ? (_e = deployConfig.extraVars) !== null && _e !== void 0 ? _e : {} : {}),
             ...jobDefinition.variables,
         },
         runnerVariables: {
             ...variables_1.DEPLOY_RUNNER_VARIABLES,
-            ...((_f = jobDefinition.runnerVariables) !== null && _f !== void 0 ? _f : {}),
-            ...(deployConfig ? (_g = deployConfig.runnerVariables) !== null && _g !== void 0 ? _g : {} : {}),
+            ...((_e = jobDefinition.runnerVariables) !== null && _e !== void 0 ? _e : {}),
+            ...(deployConfig ? (_f = deployConfig.runnerVariables) !== null && _f !== void 0 ? _f : {} : {}),
         },
         environment: isStoppable
             ? {
@@ -7417,7 +7364,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
     ],
     getAdditionalEnvVars: (ctx) => {
         const { fullName, env, componentName, deployConfigRaw } = ctx;
-        const HOST_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
+        const HOSTNAME_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
             fullName,
             (0, BashExpression_1.getBashVariable)((0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)),
         ], "-").toLowerCase();
@@ -7428,7 +7375,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
             ]))
             : {};
         return {
-            HOST_INTERNAL,
+            HOSTNAME_INTERNAL,
             ...getCloudSqlVariables(ctx),
             ...jobTriggers,
             DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
@@ -7840,7 +7787,7 @@ const hasKubernetesCloudSQL = (context) => {
 };
 exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
 const createKubernetesCloudsqlBaseValues = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
         throw new Error("cannot get cloud sql config");
@@ -7850,23 +7797,11 @@ const createKubernetesCloudsqlBaseValues = (context) => {
         throw new Error("cannot get cloud sql config");
     }
     const proxyCredentials = `$${(0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials")}`;
-    if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
-        const instanceConnectionName = `${(_c = config.projectId) !== null && _c !== void 0 ? _c : "skynet-164509"}:${(_d = config.region) !== null && _d !== void 0 ? _d : "europe-west6"}:${(_e = config.instanceId) !== null && _e !== void 0 ? _e : context.environment.envVars.KUBE_NAMESPACE}`;
-        return {
-            cloudsql: {
-                enabled: config.enabled,
-                dbUser: "postgres",
-                instanceConnectionName,
-                proxyCredentials,
-                fullDbName: (_f = context.environment.envVars.KUBE_APP_NAME) !== null && _f !== void 0 ? _f : "",
-            },
-        };
-    }
-    else if (config.type === "unmanaged") {
+    if (config.type === "unmanaged") {
         return {
             cloudsql: {
                 enabled: config.enabled,
-                dbUser: (_g = config.dbUser) !== null && _g !== void 0 ? _g : "postgres",
+                dbUser: (_c = config.dbUser) !== null && _c !== void 0 ? _c : "postgres",
                 instanceConnectionName: config.instanceConnectionName,
                 proxyCredentials,
                 fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.name),
@@ -7928,8 +7863,6 @@ const createKubernetesDeployJobs = (context) => {
                 ...((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : []),
             ].join(" "),
             COMPONENT_NAME: context.name,
-            /** @deprecated */
-            BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID,
         },
     };
     const clusterName = `kube-${context.environment.fullName}`;
@@ -8013,7 +7946,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
         const domainCanonical = (deployConfigRaw && ((_a = deployConfigRaw.cluster) === null || _a === void 0 ? void 0 : _a.domainCanonical)) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
             fullConfig.domainCanonical ||
             "panter.cloud";
-        const HOST_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
+        const HOSTNAME_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
             componentSlug,
             ...(envType === "review" && reviewSlug ? [reviewSlug] : []),
             env,
@@ -8025,7 +7958,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
             KUBE_NAMESPACE,
             KUBE_APP_NAME,
             KUBE_APP_NAME_PREFIX,
-            HOST_INTERNAL,
+            HOSTNAME_INTERNAL,
         };
     },
 };
@@ -8098,7 +8031,6 @@ const types_1 = __nccwpck_require__(75781);
 const cloudSql_1 = __nccwpck_require__(45129);
 const kubeEnv_1 = __nccwpck_require__(66769);
 const mongodb_1 = __nccwpck_require__(24139);
-const processSecretsAsFiles_1 = __nccwpck_require__(6089);
 const createAppConfig = (context, application) => {
     if (application === false) {
         return {
@@ -8155,11 +8087,11 @@ const createKubeValues = (context) => {
         : {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled)
         ? (0, mongodb_1.createMongodbBaseConfig)(context)
         : {});
-    const kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, {
+    const kubeValues = (0, utils_1.mergeWithMergingArrays)(defaultKubeValues, {
         jobs: removeFalsy(jobs),
         cronjobs: removeFalsy(cronjobs),
         ...rest,
-    }));
+    });
     return kubeValues;
 };
 exports.createKubeValues = createKubeValues;
@@ -8278,40 +8210,6 @@ exports.createMongodbBaseConfig = createMongodbBaseConfig;
 
 /***/ }),
 
-/***/ 6089:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.processSecretsAsFiles = void 0;
-const lodash_1 = __nccwpck_require__(23255);
-const processSecretsAsFiles = (values) => {
-    if (!values.secretsAsFile || values.secretsAsFile.length === 0) {
-        return values;
-    }
-    // the initial idea was that we "shadow" secrets that we mount as files,
-    // but there is a weird kubernetes  issue with that (https://github.com/kubernetes/kubernetes/issues/46861),
-    // so instead we rename the secrets and append _content, so that inside kuberentes, we can use the original name to contain the path and name+_content as the actual content
-    return {
-        ...values,
-        env: {
-            ...values.env,
-            secret: {
-                ...(0, lodash_1.omit)(values.env.secret, values.secretsAsFile),
-                ...Object.fromEntries(values.secretsAsFile.map((key) => [
-                    key + "_content",
-                    values.env.secret[key],
-                ])),
-            },
-        },
-    };
-};
-exports.processSecretsAsFiles = processSecretsAsFiles;
-//# sourceMappingURL=processSecretsAsFiles.js.map
-
-/***/ }),
-
 /***/ 44986:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -8888,7 +8786,7 @@ const getFullReferencedJobNameFromWorkspace = (referencedJobName, workspaceName,
 const getJobName = (need) => (0, lodash_1.isObject)(need) ? need.job : need;
 const makeGitlabJob = (context, job, allJobs, baseRules) => {
     var _a, _b;
-    const { environment, envMode, needsStages, needsOtherComponent, name, needs, jobTags, script, variables, runnerVariables, when, ...rest } = job;
+    const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, ...rest } = job;
     const stage = envMode === "stagePerEnv" ? `${job.stage} ${context.env}` : job.stage;
     const deduplicatedGitlabNeeds = getGitlabNeeds(context, job, allJobs);
     const fullJobName = getFullJobName({
@@ -9012,7 +8910,7 @@ function deduplicateNeeds(needs) {
         ? [...new Map(needs.map((n) => [(0, lodash_1.isObject)(n) ? n.job : n, n])).values()]
         : undefined;
 }
-function getGitlabNeedsForComponentJob(context, { needsStages, needs, needsOtherComponent }, allJobs) {
+function getGitlabNeedsForComponentJob(context, { needsStages, needs }, allJobs) {
     const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap((n) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const componentName = context.name;
@@ -9046,8 +8944,6 @@ function getGitlabNeedsForComponentJob(context, { needsStages, needs, needsOther
     const cleanedNeeds = [
         ...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []),
         ...(needs !== null && needs !== void 0 ? needs : []),
-        // pull in legacy needs from other component, which is now identical to needs
-        ...(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []),
     ];
     return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map((n) => {
         var _a;

package/dist/pipeline/src/build/base/createAppBuildJob.js

@@ -11,7 +11,7 @@ const constants_1 = require("./constants");
 const writeBuildInfo_1 = require("./writeBuildInfo");
 const writeDotEnv_1 = require("./writeDotEnv");
 const createAppBuildJob = (context, { script, variables, runnerVariables, cache, ...def }) => {
-    var _a, _b;
+    var _a;
     return (0, lodash_1.merge)({
         name: constants_1.APP_BUILD_JOB_NAME,
         envMode: "jobPerEnv",
@@ -25,14 +25,13 @@ const createAppBuildJob = (context, { script, variables, runnerVariables, cache,
                 ? {
                     ...context.environment.envVars,
                     ...context.environment.jobOnlyVars.build.envVars,
-                    ...((_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {}),
                 }
                 : {}),
         },
         runnerVariables: {
             ...constants_1.RUNNER_BUILD_RESOURCE_VARIABLES,
             ...(runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}),
-            ...((_b = context.build.config.runnerVariables) !== null && _b !== void 0 ? _b : {}),
+            ...((_a = context.build.config.runnerVariables) !== null && _a !== void 0 ? _a : {}),
         },
         script: [
             ...(context.type === "component"

package/dist/pipeline/src/build/base/createAppBuildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAGhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAGhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;iBACjD;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,iBAAiB,qBA8C5B"}