@catladder/cli 0.0.0-refactor-cache-1b2d6c36 → 0.0.0-refactor-resolve-references-862e93ac
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +230 -121
- package/dist/bundles/cli/index.js +226 -117
- package/dist/pipeline/src/bash/BashExpression.d.ts +3 -1
- package/dist/pipeline/src/bash/BashExpression.js +10 -3
- package/dist/pipeline/src/bash/BashExpression.js.map +1 -1
- package/dist/pipeline/src/bash/bashYaml.js +25 -2
- package/dist/pipeline/src/bash/bashYaml.js.map +1 -1
- package/dist/pipeline/src/build/cache/createJobCache.js +5 -1
- package/dist/pipeline/src/build/cache/createJobCache.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +1 -1
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.js +20 -10
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/context/resolveReferences.d.ts +0 -3
- package/dist/pipeline/src/context/resolveReferences.js +1 -53
- package/dist/pipeline/src/context/resolveReferences.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +2 -0
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.d.ts +3 -3
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +7 -2
- package/dist/pipeline/src/types/context.d.ts +2 -1
- package/dist/pipeline/src/types/context.js.map +1 -1
- package/dist/pipeline/src/variables/VariableValue.d.ts +3 -0
- package/dist/pipeline/src/variables/VariableValue.js +3 -0
- package/dist/pipeline/src/variables/VariableValue.js.map +1 -0
- package/dist/pipeline/src/variables/VariableValueContainingReferences.d.ts +25 -0
- package/dist/pipeline/src/variables/VariableValueContainingReferences.js +62 -0
- package/dist/pipeline/src/variables/VariableValueContainingReferences.js.map +1 -0
- package/dist/pipeline/src/variables/replaceAllReferences.d.ts +3 -0
- package/dist/pipeline/src/variables/replaceAllReferences.js +25 -0
- package/dist/pipeline/src/variables/replaceAllReferences.js.map +1 -0
- package/dist/pipeline/src/variables/replaceAllReferencesOnce.d.ts +5 -0
- package/dist/pipeline/src/variables/replaceAllReferencesOnce.js +23 -0
- package/dist/pipeline/src/variables/replaceAllReferencesOnce.js.map +1 -0
- package/dist/pipeline/src/variables/replaceReferencesOnce.d.ts +8 -0
- package/dist/pipeline/src/variables/replaceReferencesOnce.js +21 -0
- package/dist/pipeline/src/variables/replaceReferencesOnce.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/pipeline/src/bash/replaceAsync.d.ts +0 -2
- package/dist/pipeline/src/bash/replaceAsync.js +0 -37
- package/dist/pipeline/src/bash/replaceAsync.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export type PredefinedVariables = BasePredefinedVariables & {
|
|
|
21
21
|
HOST_INTERNAL: StringOrBashExpression;
|
|
22
22
|
ROOT_URL_INTERNAL: StringOrBashExpression;
|
|
23
23
|
};
|
|
24
|
-
export declare const getEnvironmentVariables: (ctx: CreateComponentContextContext,
|
|
24
|
+
export declare const getEnvironmentVariables: (ctx: CreateComponentContextContext, shouldResolveReferences?: boolean) => Promise<EnvironmentVariables>;
|
|
25
25
|
export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
|
|
26
26
|
export declare const getSecretVarNameForContext: (context: ComponentContext, key: string) => string;
|
|
27
27
|
export {};
|
|
@@ -9,7 +9,9 @@ const getBuildInfoVariables_1 = require("./getBuildInfoVariables");
|
|
|
9
9
|
const getEnvironmentContext_1 = require("./getEnvironmentContext");
|
|
10
10
|
const resolveReferences_1 = require("./resolveReferences");
|
|
11
11
|
const transformJobOnlyVars_1 = require("./transformJobOnlyVars");
|
|
12
|
+
const replaceAllReferences_1 = require("../variables/replaceAllReferences");
|
|
12
13
|
const envVars_1 = require("./utils/envVars");
|
|
14
|
+
const VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
|
|
13
15
|
const getBasePredefinedVariables = (ctx) => {
|
|
14
16
|
return {
|
|
15
17
|
ENV_SHORT: ctx.env,
|
|
@@ -18,7 +20,7 @@ const getBasePredefinedVariables = (ctx) => {
|
|
|
18
20
|
...(ctx.envType !== "local" ? (0, getBuildInfoVariables_1.getBuildInfoVariables)(ctx) : {}),
|
|
19
21
|
};
|
|
20
22
|
};
|
|
21
|
-
const getEnvironmentVariables = async (ctx,
|
|
23
|
+
const getEnvironmentVariables = async (ctx, shouldResolveReferences = true) => {
|
|
22
24
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
23
25
|
const environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
|
|
24
26
|
const { config, env, componentName } = ctx;
|
|
@@ -81,18 +83,26 @@ const getEnvironmentVariables = async (ctx, alreadyVisited = {}) => {
|
|
|
81
83
|
const legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
|
|
82
84
|
const publicEnvVarsRawWithLegacyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
|
|
83
85
|
const publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRawWithLegacyFromComponents);
|
|
84
|
-
const
|
|
86
|
+
const publicEnvVarsUnresolved = Object.fromEntries(Object.entries(publicEnvVarsRawSanitized).map(([key, value]) => [
|
|
87
|
+
key,
|
|
88
|
+
(0, VariableValueContainingReferences_1.createVariableValueContainingReferencesFromString)(value, {
|
|
89
|
+
componentName: ctx.componentName,
|
|
90
|
+
}),
|
|
91
|
+
]));
|
|
92
|
+
const publicEnvVars = shouldResolveReferences
|
|
93
|
+
? await (0, replaceAllReferences_1.replaceAllReferences)(publicEnvVarsUnresolved, async (otherComponentName) => {
|
|
94
|
+
const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
|
|
95
|
+
...ctx,
|
|
96
|
+
componentName: otherComponentName,
|
|
97
|
+
}, false);
|
|
98
|
+
return otherEnvVars;
|
|
99
|
+
})
|
|
100
|
+
: publicEnvVarsUnresolved;
|
|
101
|
+
const envVars = addIndexVar({
|
|
85
102
|
...predefinedVariables,
|
|
86
103
|
...secretEnvVars,
|
|
87
|
-
...
|
|
104
|
+
...publicEnvVars,
|
|
88
105
|
});
|
|
89
|
-
const envVars = (await (0, resolveReferences_1.resolveReferences)(envVarsRaw, async (otherComponentName, alreadyVisited) => {
|
|
90
|
-
const { envVars: otherEnvVars } = await (0, exports.getEnvironmentVariables)({
|
|
91
|
-
...ctx,
|
|
92
|
-
componentName: otherComponentName,
|
|
93
|
-
}, alreadyVisited);
|
|
94
|
-
return otherEnvVars;
|
|
95
|
-
}, alreadyVisited));
|
|
96
106
|
return {
|
|
97
107
|
envVars,
|
|
98
108
|
secretEnvVarKeys,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAC/B,sCAAyC;AASzC,2DAA6D;AAC7D,0CAAyD;AAEzD,mEAAgE;AAChE,mEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import type { BashExpression } from "../bash/BashExpression";
|
|
2
|
-
import type { UnspecifiedEnvVars } from "..";
|
|
3
|
-
export declare const resolveReferences: (vars: Record<string, string | BashExpression | undefined | null>, getOtherVariables?: (componentName: string, alreadyVisited: Record<string, Record<string, boolean>>) => Promise<UnspecifiedEnvVars>, alreadyVisitedBase?: Record<string, Record<string, boolean>>) => Promise<Record<string, BashExpression>>;
|
|
4
1
|
export declare const translateLegacyFromComponents: (fromComponents: Record<string, Record<string, string>>) => {
|
|
5
2
|
[k: string]: string;
|
|
6
3
|
};
|
|
@@ -1,58 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.translateLegacyFromComponents =
|
|
7
|
-
const lodash_1 = require("lodash");
|
|
8
|
-
const replaceAsync_1 = __importDefault(require("../bash/replaceAsync"));
|
|
9
|
-
// regex to resolve references in catladder variables
|
|
10
|
-
// those expressions have the pattern ${componentName:variableName}
|
|
11
|
-
const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
|
|
12
|
-
const resolveReferences = async (vars, getOtherVariables, alreadyVisitedBase = {}) => {
|
|
13
|
-
/**
|
|
14
|
-
*
|
|
15
|
-
* replace referenced variables with their values in a value string
|
|
16
|
-
*/
|
|
17
|
-
const replaceSingleValue = async (value, alreadyVisited = alreadyVisitedBase) => {
|
|
18
|
-
if (REGEX.test(value.toString())) {
|
|
19
|
-
// we consider variables that got references in it BashExpressions, because the replacement may be one
|
|
20
|
-
return await (0, replaceAsync_1.default)(value, REGEX, async (match, _, componentName, variableName) => {
|
|
21
|
-
var _a, _b;
|
|
22
|
-
if ((_a = alreadyVisited[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) {
|
|
23
|
-
return match; // prevent endless loop
|
|
24
|
-
}
|
|
25
|
-
const newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, {
|
|
26
|
-
[componentName]: {
|
|
27
|
-
[variableName]: true,
|
|
28
|
-
},
|
|
29
|
-
});
|
|
30
|
-
const result = componentName
|
|
31
|
-
? (_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
|
|
32
|
-
: vars[variableName]; // is self reference
|
|
33
|
-
const replaced = result !== null && result !== undefined
|
|
34
|
-
? await replaceSingleValue(result, newAlreadyVisited)
|
|
35
|
-
: match;
|
|
36
|
-
return replaced;
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
return value;
|
|
41
|
-
}
|
|
42
|
-
};
|
|
43
|
-
return Object.fromEntries(await Promise.all(Object.entries(vars).map(async ([key, value]) => {
|
|
44
|
-
if (value === null || value === undefined) {
|
|
45
|
-
return [key, null];
|
|
46
|
-
}
|
|
47
|
-
return [
|
|
48
|
-
key,
|
|
49
|
-
value !== null && value !== undefined
|
|
50
|
-
? await replaceSingleValue(value)
|
|
51
|
-
: null,
|
|
52
|
-
];
|
|
53
|
-
})));
|
|
54
|
-
};
|
|
55
|
-
exports.resolveReferences = resolveReferences;
|
|
3
|
+
exports.translateLegacyFromComponents = void 0;
|
|
56
4
|
const translateLegacyFromComponents = (fromComponents) => {
|
|
57
5
|
return Object.fromEntries(Object.entries(fromComponents).flatMap(([componentName, variables]) => {
|
|
58
6
|
return Object.entries(variables).map(([ourName, otherName]) => [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/resolveReferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/resolveReferences.ts"],"names":[],"mappings":";;;AAAO,MAAM,6BAA6B,GAAG,CAC3C,cAAsD,EACtD,EAAE;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;YAC7D,OAAO;YACP,IAAI,GAAG,aAAa,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG;SAC7C,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,6BAA6B,iCAWxC"}
|
|
@@ -38,6 +38,8 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
|
|
|
38
38
|
timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
|
|
39
39
|
"vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
|
|
40
40
|
"vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
|
|
41
|
+
network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
|
|
42
|
+
subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
|
|
41
43
|
"use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
|
|
42
44
|
"allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
|
|
43
45
|
ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { StringOrBashExpression } from "../../../bash/BashExpression";
|
|
2
1
|
import type { ComponentContext } from "../../../types";
|
|
2
|
+
import type { VariableValue } from "../../../variables/VariableValue";
|
|
3
3
|
export declare const hasKubernetesCloudSQL: (context: ComponentContext) => boolean;
|
|
4
4
|
type CloudSqlValues = {
|
|
5
5
|
enabled: boolean;
|
|
6
6
|
proxyCredentials: string;
|
|
7
7
|
instanceConnectionName: string;
|
|
8
|
-
fullDbName:
|
|
8
|
+
fullDbName: VariableValue;
|
|
9
9
|
dbUser: string;
|
|
10
10
|
};
|
|
11
11
|
export declare const createKubernetesCloudsqlBaseValues: (context: ComponentContext) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,8CAA8D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,8CAA8D;AAG9D,gDAAqD;AACrD,uCAA6C;AAEtC,MAAM,qBAAqB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACjE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAUK,MAAM,kCAAkC,GAAG,CAChD,OAAyB,EAGzB,EAAE;;IACF,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,EAAE,CAAC;IACJ,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,WAAW,EAAE,CAAC;QACjC,MAAM,sBAAsB,GAAG,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,eAAe,IACnE,MAAA,MAAM,CAAC,MAAM,mCAAI,cACnB,IAAI,MAAA,MAAM,CAAC,UAAU,mCAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAEtE,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,UAAU;gBAClB,sBAAsB;gBACtB,gBAAgB;gBAChB,UAAU,EAAE,MAAA,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,mCAAI,EAAE;aAC5D;SACF,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACvC,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,UAAU;gBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,gBAAgB;gBAChB,UAAU,EAAE,IAAA,qBAAa,EACvB,MAAM,EACN,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,UAAU,EAC9B,OAAO,CAAC,IAAI,CACb;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AApDW,QAAA,kCAAkC,sCAoD7C"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { StringOrBashExpression } from "../../bash/BashExpression";
|
|
2
1
|
import type { ComponentContext } from "../../types";
|
|
2
|
+
import type { VariableValue } from "../../variables/VariableValue";
|
|
3
3
|
/**
|
|
4
4
|
* separate by secrets and public.
|
|
5
5
|
* we evalulate the actual values later, but want to store the secrets in kubernetes secrets
|
|
6
6
|
*/
|
|
7
7
|
export declare const createKubeEnv: (context: ComponentContext) => {
|
|
8
|
-
secret: Record<string,
|
|
9
|
-
public: Record<string,
|
|
8
|
+
secret: Record<string, VariableValue>;
|
|
9
|
+
public: Record<string, VariableValue>;
|
|
10
10
|
};
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
export declare const createKubeValues: (context: ComponentContext) => any[] | ({
|
|
3
3
|
env: {
|
|
4
|
-
secret: Record<string, import("../../
|
|
5
|
-
public: Record<string, import("../../
|
|
4
|
+
secret: Record<string, import("../../variables/VariableValue").VariableValue>;
|
|
5
|
+
public: Record<string, import("../../variables/VariableValue").VariableValue>;
|
|
6
6
|
};
|
|
7
7
|
application: false | import("../types/base").AllowUnknownProps<{
|
|
8
8
|
command?: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { VariableValue } from "../../variables/VariableValue";
|
|
2
2
|
export declare const processSecretsAsFiles: <T extends {
|
|
3
3
|
env: {
|
|
4
|
-
secret: Record<string,
|
|
4
|
+
secret: Record<string, VariableValue>;
|
|
5
5
|
};
|
|
6
6
|
} & {
|
|
7
7
|
cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processSecretsAsFiles.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/processSecretsAsFiles.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;
|
|
1
|
+
{"version":3,"file":"processSecretsAsFiles.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/processSecretsAsFiles.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAKvB,MAAM,qBAAqB,GAAG,CAOnC,MAAS,EACN,EAAE;IACL,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,wEAAwE;IACxE,4GAA4G;IAC5G,4KAA4K;IAC5K,OAAO;QACL,GAAG,MAAM;QACT,GAAG,EAAE;YACH,GAAG,MAAM,CAAC,GAAG;YACb,MAAM,EAAE;gBACN,GAAG,IAAA,aAAI,EAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC;gBAChD,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;oBAChC,GAAG,GAAG,UAAU;oBAChB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;iBACvB,CAAC,CACH;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}
|
|
@@ -106,14 +106,19 @@ export type DeployConfigCloudRunService = {
|
|
|
106
106
|
* defaults to gen1 according to gcloud
|
|
107
107
|
*/
|
|
108
108
|
executionEnvironment?: "gen2" | "gen1";
|
|
109
|
+
network?: string;
|
|
109
110
|
/**
|
|
110
|
-
* vpc
|
|
111
|
+
* vpc subnet to use, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--subnet
|
|
111
112
|
*/
|
|
112
|
-
|
|
113
|
+
subnet?: string;
|
|
113
114
|
/**
|
|
114
115
|
* vpc egress, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--vpc-egress
|
|
115
116
|
*/
|
|
116
117
|
vpcEgress?: "all-traffic" | "private-ranges-only";
|
|
118
|
+
/**
|
|
119
|
+
* vpc connector
|
|
120
|
+
*/
|
|
121
|
+
vpcConnector?: string;
|
|
117
122
|
/**
|
|
118
123
|
* Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
|
|
119
124
|
*
|
|
@@ -2,10 +2,11 @@ import type { StringOrBashExpression } from "../bash/BashExpression";
|
|
|
2
2
|
import type { BuildConfigFromWorkspace, BuildConfigStandalone, WorkspaceBuildConfig } from "../build";
|
|
3
3
|
import type { PredefinedVariables, SecretEnvVar } from "../context";
|
|
4
4
|
import type { DeployConfig } from "../deploy";
|
|
5
|
+
import type { VariableValue } from "../variables/VariableValue";
|
|
5
6
|
import type { ComponentConfig, Config, EnvType, PipelineTrigger } from "./config";
|
|
6
7
|
import type { BaseStage, CatladderJob } from "./jobs";
|
|
7
8
|
import type { PipelineType } from "./pipeline";
|
|
8
|
-
export type UnspecifiedEnvVars = Record<string,
|
|
9
|
+
export type UnspecifiedEnvVars = Record<string, VariableValue | undefined | null>;
|
|
9
10
|
export type EnvironmentEnvVars<V extends UnspecifiedEnvVars = UnspecifiedEnvVars> = {
|
|
10
11
|
envVars: V & UnspecifiedEnvVars;
|
|
11
12
|
secretEnvVarKeys: SecretEnvVar[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;AAgMO,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACK,EAAE;IACvD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACQ,EAAE;IAC1D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VariableValue.js","sourceRoot":"","sources":["../../../../../pipeline/src/variables/VariableValue.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { BashExpression } from "../bash/BashExpression";
|
|
2
|
+
export declare class UnresolvableReference {
|
|
3
|
+
reference: VariableReference;
|
|
4
|
+
constructor(reference: VariableReference);
|
|
5
|
+
toString(): string;
|
|
6
|
+
}
|
|
7
|
+
export declare class VariableReference {
|
|
8
|
+
componentName: string;
|
|
9
|
+
variableName: string;
|
|
10
|
+
constructor(componentName: string, variableName: string);
|
|
11
|
+
toString(): string;
|
|
12
|
+
}
|
|
13
|
+
type VariableValuePart = string | BashExpression | VariableReference | UnresolvableReference;
|
|
14
|
+
type MaybeArray<T> = T | T[];
|
|
15
|
+
export declare class VariableValueContainingReferences {
|
|
16
|
+
parts: VariableValuePart[];
|
|
17
|
+
constructor(parts: MaybeArray<VariableValuePart | VariableValueContainingReferences>);
|
|
18
|
+
toString(options?: {
|
|
19
|
+
escapeQuotes: boolean;
|
|
20
|
+
}): string;
|
|
21
|
+
}
|
|
22
|
+
export declare const createVariableValueContainingReferencesFromString: (value: string, options: {
|
|
23
|
+
componentName: string;
|
|
24
|
+
}) => VariableValueContainingReferences;
|
|
25
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createVariableValueContainingReferencesFromString = exports.VariableValueContainingReferences = exports.VariableReference = exports.UnresolvableReference = void 0;
|
|
4
|
+
class UnresolvableReference {
|
|
5
|
+
constructor(reference) {
|
|
6
|
+
this.reference = reference;
|
|
7
|
+
}
|
|
8
|
+
toString() {
|
|
9
|
+
return `Unresolvable reference: ${this.reference.toString()}`;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.UnresolvableReference = UnresolvableReference;
|
|
13
|
+
class VariableReference {
|
|
14
|
+
constructor(componentName, variableName) {
|
|
15
|
+
this.componentName = componentName;
|
|
16
|
+
this.variableName = variableName;
|
|
17
|
+
}
|
|
18
|
+
toString() {
|
|
19
|
+
return `\${${this.componentName}:${this.variableName}}`;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.VariableReference = VariableReference;
|
|
23
|
+
class VariableValueContainingReferences {
|
|
24
|
+
constructor(parts) {
|
|
25
|
+
this.parts = (Array.isArray(parts) ? parts : [parts]).flatMap((part) => part instanceof VariableValueContainingReferences
|
|
26
|
+
? part.parts
|
|
27
|
+
: part === ""
|
|
28
|
+
? []
|
|
29
|
+
: [part]);
|
|
30
|
+
}
|
|
31
|
+
toString(options = { escapeQuotes: false }) {
|
|
32
|
+
return this.parts
|
|
33
|
+
.map((part) => {
|
|
34
|
+
if (typeof part === "string") {
|
|
35
|
+
return options.escapeQuotes ? part.replace(/"/g, '\\"') : part;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
return part.toString();
|
|
39
|
+
}
|
|
40
|
+
})
|
|
41
|
+
.join("");
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.VariableValueContainingReferences = VariableValueContainingReferences;
|
|
45
|
+
// regex to resolve references in catladder variables
|
|
46
|
+
// those expressions have the pattern ${componentName:variableName}
|
|
47
|
+
const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
|
|
48
|
+
const createVariableValueContainingReferencesFromString = (value, options) => {
|
|
49
|
+
const parts = [];
|
|
50
|
+
let match;
|
|
51
|
+
let lastIndex = 0;
|
|
52
|
+
while ((match = REGEX.exec(value)) !== null) {
|
|
53
|
+
const [fullMatch, _, otherComponentName, variableName] = match;
|
|
54
|
+
parts.push(value.slice(lastIndex, match.index));
|
|
55
|
+
parts.push(new VariableReference(otherComponentName || options.componentName, variableName));
|
|
56
|
+
lastIndex = REGEX.lastIndex;
|
|
57
|
+
}
|
|
58
|
+
parts.push(value.slice(lastIndex));
|
|
59
|
+
return new VariableValueContainingReferences(parts);
|
|
60
|
+
};
|
|
61
|
+
exports.createVariableValueContainingReferencesFromString = createVariableValueContainingReferencesFromString;
|
|
62
|
+
//# sourceMappingURL=VariableValueContainingReferences.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VariableValueContainingReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/variables/VariableValueContainingReferences.ts"],"names":[],"mappings":";;;AAEA,MAAa,qBAAqB;IAChC,YAAmB,SAA4B;QAA5B,cAAS,GAAT,SAAS,CAAmB;IAAG,CAAC;IAC5C,QAAQ;QACb,OAAO,2BAA2B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;IAChE,CAAC;CACF;AALD,sDAKC;AACD,MAAa,iBAAiB;IAI5B,YAAY,aAAqB,EAAE,YAAoB;QACrD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,QAAQ;QACb,OAAO,MAAM,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC;IAC1D,CAAC;CACF;AAZD,8CAYC;AASD,MAAa,iCAAiC;IAE5C,YACE,KAAwE;QAExE,IAAI,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACrE,IAAI,YAAY,iCAAiC;YAC/C,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAC,IAAI,KAAK,EAAE;gBACX,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,IAAI,CAAC,CACb,CAAC;IACJ,CAAC;IAEM,QAAQ,CACb,UAAqC,EAAE,YAAY,EAAE,KAAK,EAAE;QAE5D,OAAO,IAAI,CAAC,KAAK;aACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzB,CAAC;QACH,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;CACF;AA3BD,8EA2BC;AAED,qDAAqD;AACrD,mEAAmE;AACnE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AACpC,MAAM,iDAAiD,GAAG,CAC/D,KAAa,EACb,OAAkC,EAClC,EAAE;IACF,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,IAAI,KAAU,CAAC;IACf,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5C,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,kBAAkB,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC;QAE/D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,KAAK,CAAC,IAAI,CACR,IAAI,iBAAiB,CACnB,kBAAkB,IAAI,OAAO,CAAC,aAAa,EAC3C,YAAY,CACb,CACF,CAAC;QACF,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACnC,OAAO,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC,CAAC;AArBW,QAAA,iDAAiD,qDAqB5D"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { VariableValue } from "./VariableValue";
|
|
2
|
+
import type { VariableValueContainingReferences } from "./VariableValueContainingReferences";
|
|
3
|
+
export declare const replaceAllReferences: (values: Record<string, VariableValueContainingReferences>, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | null | undefined>>) => Promise<Record<string, VariableValueContainingReferences>>;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceAllReferences = void 0;
|
|
4
|
+
const VariableValueContainingReferences_1 = require("./VariableValueContainingReferences");
|
|
5
|
+
const replaceAllReferencesOnce_1 = require("./replaceAllReferencesOnce");
|
|
6
|
+
const replaceAllReferences = async (values, getEnvVars) => {
|
|
7
|
+
// replace until there aren't any references left
|
|
8
|
+
let result = values;
|
|
9
|
+
let i = 0;
|
|
10
|
+
while (Object.values(result).some((value) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference))) {
|
|
11
|
+
const replaced = await (0, replaceAllReferencesOnce_1.replaceAllReferencesOnce)(result, getEnvVars);
|
|
12
|
+
result = replaced;
|
|
13
|
+
i++;
|
|
14
|
+
if (i > 1000) {
|
|
15
|
+
const unresolved = Object.entries(result).filter(([key, value]) => value.parts.some((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
|
|
16
|
+
throw new Error("Infinite loop detected in these variables: " +
|
|
17
|
+
unresolved
|
|
18
|
+
.map(([key, value]) => `${key} (last reference: ${value.parts.find((part) => part instanceof VariableValueContainingReferences_1.VariableReference)})`)
|
|
19
|
+
.join(", "));
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return result;
|
|
23
|
+
};
|
|
24
|
+
exports.replaceAllReferences = replaceAllReferences;
|
|
25
|
+
//# sourceMappingURL=replaceAllReferences.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replaceAllReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/variables/replaceAllReferences.ts"],"names":[],"mappings":";;;AAEA,2FAAwE;AACxE,yEAAsE;AAE/D,MAAM,oBAAoB,GAAG,KAAK,EACvC,MAAyD,EACzD,UAE8D,EAC9D,EAAE;IACF,iDAAiD;IAEjD,IAAI,MAAM,GAAG,MAAM,CAAC;IAEpB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OACE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACnC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,qDAAiB,CAAC,CAC9D,EACD,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,mDAAwB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAEpE,MAAM,GAAG,QAAQ,CAAC;QAClB,CAAC,EAAE,CAAC;QACJ,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YACb,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAChE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,qDAAiB,CAAC,CAC9D,CAAC;YAEF,MAAM,IAAI,KAAK,CACb,6CAA6C;gBAC3C,UAAU;qBACP,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,GAAG,GAAG,qBAAqB,KAAK,CAAC,KAAK,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,qDAAiB,CAC5C,GAAG,CACP;qBACA,IAAI,CAAC,IAAI,CAAC,CAChB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAzCW,QAAA,oBAAoB,wBAyC/B"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { VariableValue } from "./VariableValue";
|
|
2
|
+
import type { VariableValueContainingReferences } from "./VariableValueContainingReferences";
|
|
3
|
+
export declare const replaceAllReferencesOnce: (values: Record<string, VariableValueContainingReferences>, getEnvVars: (componentName: string) => Promise<Record<string, VariableValue | undefined | null>>) => Promise<{
|
|
4
|
+
[k: string]: VariableValueContainingReferences;
|
|
5
|
+
}>;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceAllReferencesOnce = void 0;
|
|
4
|
+
const VariableValueContainingReferences_1 = require("./VariableValueContainingReferences");
|
|
5
|
+
const replaceReferencesOnce_1 = require("./replaceReferencesOnce");
|
|
6
|
+
const replaceAllReferencesOnce = async (values, getEnvVars) => {
|
|
7
|
+
const allReferences = Object.values(values).flatMap((value) => value === null || value === void 0 ? void 0 : value.parts.filter((part) => part instanceof VariableValueContainingReferences_1.VariableReference));
|
|
8
|
+
const allComponentsUnique = Array.from(new Set(allReferences.map((reference) => reference.componentName)));
|
|
9
|
+
const allEnvVarsInComponents = Object.fromEntries(await Promise.all(allComponentsUnique.map(async (componentName) => [
|
|
10
|
+
componentName,
|
|
11
|
+
await getEnvVars(componentName),
|
|
12
|
+
])));
|
|
13
|
+
return Object.fromEntries(Object.entries(values).map(([key, value]) => [
|
|
14
|
+
key,
|
|
15
|
+
value !== null && value !== undefined
|
|
16
|
+
? (0, replaceReferencesOnce_1.replaceReferencesOnce)(value, ({ componentName, variableName }) => {
|
|
17
|
+
return allEnvVarsInComponents[componentName][variableName];
|
|
18
|
+
})
|
|
19
|
+
: value,
|
|
20
|
+
]));
|
|
21
|
+
};
|
|
22
|
+
exports.replaceAllReferencesOnce = replaceAllReferencesOnce;
|
|
23
|
+
//# sourceMappingURL=replaceAllReferencesOnce.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replaceAllReferencesOnce.js","sourceRoot":"","sources":["../../../../../pipeline/src/variables/replaceAllReferencesOnce.ts"],"names":[],"mappings":";;;AAEA,2FAAwE;AACxE,mEAAgE;AAEzD,MAAM,wBAAwB,GAAG,KAAK,EAC3C,MAAyD,EACzD,UAE8D,EAC9D,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CACjD,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,qDAAiB,CACrB,CAC3B,CAAC;IAEF,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CACpC,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CACnE,CAAC;IAEF,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAC/C,MAAM,OAAO,CAAC,GAAG,CACf,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,CAAC;QAC/C,aAAa;QACb,MAAM,UAAU,CAAC,aAAa,CAAC;KAChC,CAEA,CACF,CACF,CAAC;IAEF,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3C,GAAG;QACH,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;YACnC,CAAC,CAAC,IAAA,6CAAqB,EAAC,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC/D,OAAO,sBAAsB,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,CAAC;YAC7D,CAAC,CAAC;YACJ,CAAC,CAAC,KAAK;KACV,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,wBAAwB,4BAsCnC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { VariableValue } from "./VariableValue";
|
|
2
|
+
import { VariableValueContainingReferences } from "./VariableValueContainingReferences";
|
|
3
|
+
type Replacer = (args: {
|
|
4
|
+
componentName: string;
|
|
5
|
+
variableName: string;
|
|
6
|
+
}) => VariableValue | null | undefined;
|
|
7
|
+
export declare const replaceReferencesOnce: (value: VariableValueContainingReferences, replacer: Replacer) => VariableValueContainingReferences;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceReferencesOnce = void 0;
|
|
4
|
+
const VariableValueContainingReferences_1 = require("./VariableValueContainingReferences");
|
|
5
|
+
const replaceReferencesOnce = (value, replacer) => {
|
|
6
|
+
const replacedParts = value.parts.map((part) => {
|
|
7
|
+
if (part instanceof VariableValueContainingReferences_1.VariableReference) {
|
|
8
|
+
const result = replacer({
|
|
9
|
+
componentName: part.componentName,
|
|
10
|
+
variableName: part.variableName,
|
|
11
|
+
});
|
|
12
|
+
return result !== null && result !== void 0 ? result : new VariableValueContainingReferences_1.UnresolvableReference(part);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
return part;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
return new VariableValueContainingReferences_1.VariableValueContainingReferences(replacedParts);
|
|
19
|
+
};
|
|
20
|
+
exports.replaceReferencesOnce = replaceReferencesOnce;
|
|
21
|
+
//# sourceMappingURL=replaceReferencesOnce.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replaceReferencesOnce.js","sourceRoot":"","sources":["../../../../../pipeline/src/variables/replaceReferencesOnce.ts"],"names":[],"mappings":";;;AACA,2FAI6C;AAMtC,MAAM,qBAAqB,GAAG,CACnC,KAAwC,EACxC,QAAkB,EAClB,EAAE;IACF,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7C,IAAI,IAAI,YAAY,qDAAiB,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,QAAQ,CAAC;gBACtB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC,CAAC,CAAC;YACH,OAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,yDAAqB,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,qEAAiC,CAAC,aAAa,CAAC,CAAC;AAC9D,CAAC,CAAC;AAjBW,QAAA,qBAAqB,yBAiBhC"}
|