typekro 0.40.0 → 0.41.0
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/.tsbuildinfo +1 -1
- package/dist/alchemy/resolver.d.ts.map +1 -1
- package/dist/alchemy/resolver.js +3 -2
- package/dist/alchemy/resolver.js.map +1 -1
- package/dist/alchemy/resource-registration.d.ts.map +1 -1
- package/dist/alchemy/resource-registration.js +4 -3
- package/dist/alchemy/resource-registration.js.map +1 -1
- package/dist/core/aspects/apply.d.ts.map +1 -1
- package/dist/core/aspects/apply.js +6 -4
- package/dist/core/aspects/apply.js.map +1 -1
- package/dist/core/aspects/primitives.d.ts.map +1 -1
- package/dist/core/aspects/primitives.js +2 -1
- package/dist/core/aspects/primitives.js.map +1 -1
- package/dist/core/aspects/values-merge.d.ts +13 -11
- package/dist/core/aspects/values-merge.d.ts.map +1 -1
- package/dist/core/aspects/values-merge.js +44 -41
- package/dist/core/aspects/values-merge.js.map +1 -1
- package/dist/core/deployment/direct-factory.d.ts.map +1 -1
- package/dist/core/deployment/direct-factory.js +4 -3
- package/dist/core/deployment/direct-factory.js.map +1 -1
- package/dist/core/deployment/kro-factory.d.ts.map +1 -1
- package/dist/core/deployment/kro-factory.js +2 -1
- package/dist/core/deployment/kro-factory.js.map +1 -1
- package/dist/core/deployment/kro-instance-safety.d.ts.map +1 -1
- package/dist/core/deployment/kro-instance-safety.js +2 -1
- package/dist/core/deployment/kro-instance-safety.js.map +1 -1
- package/dist/core/planning/canonical.d.ts.map +1 -1
- package/dist/core/planning/canonical.js +2 -1
- package/dist/core/planning/canonical.js.map +1 -1
- package/dist/core/planning/materialization.d.ts.map +1 -1
- package/dist/core/planning/materialization.js +3 -2
- package/dist/core/planning/materialization.js.map +1 -1
- package/dist/core/planning/planner.d.ts.map +1 -1
- package/dist/core/planning/planner.js +2 -1
- package/dist/core/planning/planner.js.map +1 -1
- package/dist/core/proxy/create-resource.d.ts.map +1 -1
- package/dist/core/proxy/create-resource.js +4 -3
- package/dist/core/proxy/create-resource.js.map +1 -1
- package/dist/core/references/resolver.d.ts.map +1 -1
- package/dist/core/references/resolver.js +4 -2
- package/dist/core/references/resolver.js.map +1 -1
- package/dist/core/serialization/cel-references.d.ts.map +1 -1
- package/dist/core/serialization/cel-references.js +2 -1
- package/dist/core/serialization/cel-references.js.map +1 -1
- package/dist/core/serialization/yaml.d.ts.map +1 -1
- package/dist/core/serialization/yaml.js +3 -2
- package/dist/core/serialization/yaml.js.map +1 -1
- package/dist/factories/clickhouse/compositions/clickhouse-cluster.d.ts.map +1 -1
- package/dist/factories/clickhouse/compositions/clickhouse-cluster.js +5 -0
- package/dist/factories/clickhouse/compositions/clickhouse-cluster.js.map +1 -1
- package/dist/factories/clickhouse/resources/installation.d.ts.map +1 -1
- package/dist/factories/clickhouse/resources/installation.js +18 -2
- package/dist/factories/clickhouse/resources/installation.js.map +1 -1
- package/dist/factories/clickhouse/types.d.ts +28 -0
- package/dist/factories/clickhouse/types.d.ts.map +1 -1
- package/dist/factories/clickhouse/types.js +43 -0
- package/dist/factories/clickhouse/types.js.map +1 -1
- package/dist/factories/clickhouse/utils/index.d.ts +1 -0
- package/dist/factories/clickhouse/utils/index.d.ts.map +1 -1
- package/dist/factories/clickhouse/utils/index.js +1 -0
- package/dist/factories/clickhouse/utils/index.js.map +1 -1
- package/dist/factories/clickhouse/utils/server-settings.d.ts +18 -0
- package/dist/factories/clickhouse/utils/server-settings.d.ts.map +1 -0
- package/dist/factories/clickhouse/utils/server-settings.js +159 -0
- package/dist/factories/clickhouse/utils/server-settings.js.map +1 -0
- package/dist/factories/clickhouse/utils/system-logs.d.ts +7 -1
- package/dist/factories/clickhouse/utils/system-logs.d.ts.map +1 -1
- package/dist/factories/clickhouse/utils/system-logs.js +101 -10
- package/dist/factories/clickhouse/utils/system-logs.js.map +1 -1
- package/dist/factories/clickstack/utils/helm-values-mapper.d.ts.map +1 -1
- package/dist/factories/clickstack/utils/helm-values-mapper.js +0 -3
- package/dist/factories/clickstack/utils/helm-values-mapper.js.map +1 -1
- package/dist/shared/own-property.d.ts +15 -0
- package/dist/shared/own-property.d.ts.map +1 -0
- package/dist/shared/own-property.js +26 -0
- package/dist/shared/own-property.js.map +1 -0
- package/dist/utils/helpers.d.ts.map +1 -1
- package/dist/utils/helpers.js +2 -1
- package/dist/utils/helpers.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../src/core/aspects/primitives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../src/core/aspects/primitives.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,17 +6,19 @@ export interface ValuesMergeExpression {
|
|
|
6
6
|
export declare function isValuesMergeExpression(value: unknown): value is ValuesMergeExpression;
|
|
7
7
|
export declare function mergeValuesExpression(base: unknown, overlay: unknown): ValuesMergeExpression;
|
|
8
8
|
/**
|
|
9
|
-
* True for
|
|
10
|
-
*
|
|
11
|
-
* resource reference, a CEL expression, a mixed
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
*
|
|
19
|
-
*
|
|
9
|
+
* True for an object a chart-values deep merge may merge into, recurse
|
|
10
|
+
* through or rebuild: a plain object (prototype `Object.prototype` or `null`)
|
|
11
|
+
* that is not a schema or resource reference, a CEL expression, a mixed
|
|
12
|
+
* template or a merge node, and carries no own symbol key.
|
|
13
|
+
*
|
|
14
|
+
* Anything else is an opaque leaf that a later layer replaces whole. The
|
|
15
|
+
* symbol check matters for the planning markers (`sensitiveValue`,
|
|
16
|
+
* `externalInput`, `artifactOutput`): they are plain frozen objects recognised
|
|
17
|
+
* only by a symbol brand, and rebuilding one from its string keys drops it.
|
|
18
|
+
*
|
|
19
|
+
* Static merges (the chart values mappers) and deferred ones
|
|
20
|
+
* ({@link materializeValuesMergeExpressions}) both use this rule, so the same
|
|
21
|
+
* layers give the same result either way.
|
|
20
22
|
*/
|
|
21
23
|
export declare function isMergeableValuesObject(value: unknown): value is Record<string, unknown>;
|
|
22
24
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"values-merge.d.ts","sourceRoot":"","sources":["../../../src/core/aspects/values-merge.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;CACvC;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,qBAAqB,CAMtF;AAYD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,qBAAqB,CAU5F;AAED
|
|
1
|
+
{"version":3,"file":"values-merge.d.ts","sourceRoot":"","sources":["../../../src/core/aspects/values-merge.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;CACvC;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,qBAAqB,CAMtF;AAYD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,qBAAqB,CAU5F;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkBxF;AAwBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,MAAM,EAAE,OAAO,GACd,OAAO,CAwBT;AAsBD;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsDzE"}
|
|
@@ -25,43 +25,52 @@ export function mergeValuesExpression(base, overlay) {
|
|
|
25
25
|
return { __typekroValuesMerge: true, base, overlays: [overlay] };
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
|
-
* True for
|
|
29
|
-
*
|
|
30
|
-
* resource reference, a CEL expression, a mixed
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
28
|
+
* True for an object a chart-values deep merge may merge into, recurse
|
|
29
|
+
* through or rebuild: a plain object (prototype `Object.prototype` or `null`)
|
|
30
|
+
* that is not a schema or resource reference, a CEL expression, a mixed
|
|
31
|
+
* template or a merge node, and carries no own symbol key.
|
|
32
|
+
*
|
|
33
|
+
* Anything else is an opaque leaf that a later layer replaces whole. The
|
|
34
|
+
* symbol check matters for the planning markers (`sensitiveValue`,
|
|
35
|
+
* `externalInput`, `artifactOutput`): they are plain frozen objects recognised
|
|
36
|
+
* only by a symbol brand, and rebuilding one from its string keys drops it.
|
|
37
|
+
*
|
|
38
|
+
* Static merges (the chart values mappers) and deferred ones
|
|
39
|
+
* ({@link materializeValuesMergeExpressions}) both use this rule, so the same
|
|
40
|
+
* layers give the same result either way.
|
|
34
41
|
*/
|
|
35
|
-
export function
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return (isValuesMergeExpression(value) ||
|
|
42
|
+
export function isMergeableValuesObject(value) {
|
|
43
|
+
if (!value ||
|
|
44
|
+
typeof value !== 'object' ||
|
|
45
|
+
Array.isArray(value) ||
|
|
46
|
+
isValuesMergeExpression(value) ||
|
|
41
47
|
isKubernetesRef(value) ||
|
|
42
48
|
isResourceReference(value) ||
|
|
43
49
|
isCelExpression(value) ||
|
|
44
|
-
isMixedTemplate(value)
|
|
45
|
-
|
|
50
|
+
isMixedTemplate(value)) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
const prototype = Object.getPrototypeOf(value);
|
|
54
|
+
return ((prototype === Object.prototype || prototype === null) &&
|
|
55
|
+
Object.getOwnPropertySymbols(value).length === 0);
|
|
46
56
|
}
|
|
47
|
-
/**
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
*/
|
|
51
|
-
export function isMergeableValuesObject(value) {
|
|
52
|
-
return (!!value && typeof value === 'object' && !Array.isArray(value) && !isOpaqueValuesLeaf(value));
|
|
57
|
+
/** An object that carries an own symbol key: a branded value such as a planning marker. */
|
|
58
|
+
function isSymbolBranded(value) {
|
|
59
|
+
return !!value && typeof value === 'object' && Object.getOwnPropertySymbols(value).length > 0;
|
|
53
60
|
}
|
|
54
61
|
/**
|
|
55
|
-
* True when a chart-values argument cannot be
|
|
62
|
+
* True when a chart-values argument cannot be merged at build time: a
|
|
56
63
|
* whole-object schema/resource reference, a CEL expression, a mixed template,
|
|
57
|
-
*
|
|
64
|
+
* an existing runtime merge node, or a symbol-branded value such as a
|
|
65
|
+
* planning marker, which must reach the plan stage whole.
|
|
58
66
|
*/
|
|
59
67
|
function isOpaqueChartValues(value) {
|
|
60
68
|
return (isValuesMergeExpression(value) ||
|
|
61
69
|
isKubernetesRef(value) ||
|
|
62
70
|
isResourceReference(value) ||
|
|
63
71
|
isCelExpression(value) ||
|
|
64
|
-
isMixedTemplate(value)
|
|
72
|
+
isMixedTemplate(value) ||
|
|
73
|
+
isSymbolBranded(value));
|
|
65
74
|
}
|
|
66
75
|
/**
|
|
67
76
|
* Layer a factory's static chart defaults UNDER caller-supplied values.
|
|
@@ -85,7 +94,7 @@ export function withChartValueDefaults(defaults, values) {
|
|
|
85
94
|
// the overlay chain so the defaults sit underneath it rather than being
|
|
86
95
|
// replaced by it — dropping `base` here is what lost the defaults before.
|
|
87
96
|
const overlays = overlaysOf(values);
|
|
88
|
-
return
|
|
97
|
+
return isMergeableValuesObject(values.base)
|
|
89
98
|
? {
|
|
90
99
|
__typekroValuesMerge: true,
|
|
91
100
|
base: { ...defaults, ...values.base },
|
|
@@ -99,31 +108,23 @@ export function withChartValueDefaults(defaults, values) {
|
|
|
99
108
|
}
|
|
100
109
|
if (isOpaqueChartValues(values))
|
|
101
110
|
return mergeValuesExpression(defaults, values);
|
|
102
|
-
if (
|
|
111
|
+
if (isMergeableValuesObject(values))
|
|
103
112
|
return { ...defaults, ...values };
|
|
104
113
|
// Nothing to layer the defaults under: `undefined`, or an argument that is
|
|
105
114
|
// not a values object at all. The defaults stand alone rather than being
|
|
106
115
|
// dropped.
|
|
107
116
|
return { ...defaults };
|
|
108
117
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
isResourceReference(value) ||
|
|
116
|
-
isCelExpression(value) ||
|
|
117
|
-
isMixedTemplate(value)) {
|
|
118
|
-
return false;
|
|
119
|
-
}
|
|
120
|
-
const prototype = Object.getPrototypeOf(value);
|
|
121
|
-
return prototype === Object.prototype || prototype === null;
|
|
122
|
-
}
|
|
118
|
+
/**
|
|
119
|
+
* One deferred merge step. Objects that pass {@link isMergeableValuesObject}
|
|
120
|
+
* merge key by key, recursing only on keys the overlay owns; anything else is
|
|
121
|
+
* an atomic leaf and the overlay replaces it whole. `undefined` results are
|
|
122
|
+
* dropped.
|
|
123
|
+
*/
|
|
123
124
|
function mergeMaterializedValues(base, overlay) {
|
|
124
125
|
if (overlay === undefined)
|
|
125
126
|
return base;
|
|
126
|
-
if (!
|
|
127
|
+
if (!isMergeableValuesObject(base) || !isMergeableValuesObject(overlay))
|
|
127
128
|
return overlay;
|
|
128
129
|
return Object.fromEntries(Array.from(new Set([...Object.keys(base), ...Object.keys(overlay)])).flatMap((key) => {
|
|
129
130
|
const merged = Object.hasOwn(overlay, key)
|
|
@@ -171,7 +172,9 @@ export function materializeValuesMergeExpressions(value) {
|
|
|
171
172
|
});
|
|
172
173
|
return changed ? materialized : current;
|
|
173
174
|
}
|
|
174
|
-
|
|
175
|
+
// The same atomic-leaf rule as the merge step: a symbol-branded value or a
|
|
176
|
+
// non-plain object is returned as it is, never rebuilt.
|
|
177
|
+
if (!isMergeableValuesObject(current))
|
|
175
178
|
return current;
|
|
176
179
|
if (visiting.has(current)) {
|
|
177
180
|
throw new TypeError('Circular value tree containing a TypeKro values merge expression.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"values-merge.js","sourceRoot":"","sources":["../../../src/core/aspects/values-merge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AAQpC,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,OAAO,CACL,CAAC,CAAC,KAAK;QACP,OAAO,KAAK,KAAK,QAAQ;QACxB,KAA4C,CAAC,oBAAoB,KAAK,IAAI,CAC5E,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAC,IAA2B;IAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvD,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAE,IAA8B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAa,EAAE,OAAgB;IACnE,IAAI,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO;YACL,oBAAoB,EAAE,IAAI;YAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;SACzC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;AACnE,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"values-merge.js","sourceRoot":"","sources":["../../../src/core/aspects/values-merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-factory.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/direct-factory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAyCzE,OAAO,EAYL,KAAK,gCAAgC,EACtC,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EACd,aAAa,EACb,oCAAoC,EACpC,kCAAkC,EAClC,sBAAsB,EACtB,4BAA4B,EAC5B,+BAA+B,EAC/B,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAyB,QAAQ,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAcpG,UAAU,oBAAoB;IAC5B,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC1C,cAAc,EAAE;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"direct-factory.d.ts","sourceRoot":"","sources":["../../../src/core/deployment/direct-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ import { SINGLETON_SPEC_FINGERPRINT_ANNOTATION } from './resource-tagging.js';
|
|
|
38
38
|
import { extractSerializableKubeConfigOptions, generateInstanceName, getSingletonInstanceName, validateSpec, } from './shared-utilities.js';
|
|
39
39
|
import { assertNoDeployedSingletonSpecDrift, assertNoDiscoveredSingletonSpecDrift, singletonSpecFingerprintAnnotationValue, } from './singleton-owner-drift.js';
|
|
40
40
|
import { DirectDeploymentStrategy } from './strategies/index.js';
|
|
41
|
+
import { setOwnProperty } from '../../shared/own-property.js';
|
|
41
42
|
function deployedResourceDeletionIdentity(resource) {
|
|
42
43
|
const clusterScoped = getMetadataField(resource.manifest, 'scope') === 'cluster';
|
|
43
44
|
return deletionTarget(resource.manifest.apiVersion, resource.kind, resource.name, clusterScoped ? undefined : resource.namespace);
|
|
@@ -980,7 +981,7 @@ export class DirectResourceFactoryImpl {
|
|
|
980
981
|
continue;
|
|
981
982
|
}
|
|
982
983
|
if (value !== undefined)
|
|
983
|
-
manifest
|
|
984
|
+
setOwnProperty(manifest, key, value);
|
|
984
985
|
}
|
|
985
986
|
// JSON round-trip strips non-serializable values (functions, symbols, proxies)
|
|
986
987
|
// that may remain in resolved resources before safe YAML serialization.
|
|
@@ -1795,7 +1796,7 @@ export class DirectResourceFactoryImpl {
|
|
|
1795
1796
|
if (value !== null && typeof value === 'object') {
|
|
1796
1797
|
const resolved = {};
|
|
1797
1798
|
for (const [key, val] of Object.entries(value)) {
|
|
1798
|
-
resolved
|
|
1799
|
+
setOwnProperty(resolved, key, this.deepResolveKubernetesRefs(val, `${path}.${key}`));
|
|
1799
1800
|
}
|
|
1800
1801
|
return resolved;
|
|
1801
1802
|
}
|
|
@@ -1941,7 +1942,7 @@ export class DirectResourceFactoryImpl {
|
|
|
1941
1942
|
this.logger.trace('Traversing object', { path, keys: Object.keys(resource) });
|
|
1942
1943
|
const resolved = {};
|
|
1943
1944
|
for (const [key, value] of Object.entries(resource)) {
|
|
1944
|
-
resolved
|
|
1945
|
+
setOwnProperty(resolved, key, this.resolveSchemaReferencesToValues(value, spec, `${path}.${key}`));
|
|
1945
1946
|
}
|
|
1946
1947
|
// Debug: Check if id field is being preserved
|
|
1947
1948
|
const resourceRecord = resource;
|