k8ts 0.6.0 → 0.7.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/env/env.d.ts +32 -0
- package/dist/env/env.d.ts.map +1 -0
- package/dist/env/env.js +120 -0
- package/dist/env/env.js.map +1 -0
- package/dist/env/index.d.ts +3 -0
- package/dist/env/index.d.ts.map +1 -0
- package/dist/env/index.js +7 -0
- package/dist/env/index.js.map +1 -0
- package/dist/env/types.d.ts +15 -0
- package/dist/env/types.d.ts.map +1 -0
- package/dist/env/types.js +3 -0
- package/dist/env/types.js.map +1 -0
- package/dist/env/validate-name.d.ts +2 -0
- package/dist/env/validate-name.d.ts.map +1 -0
- package/dist/env/validate-name.js +12 -0
- package/dist/env/validate-name.js.map +1 -0
- package/dist/resources/pod/container/container.d.ts +2 -1
- package/dist/resources/pod/container/container.d.ts.map +1 -1
- package/dist/resources/pod/container/container.js +2 -1
- package/dist/resources/pod/container/container.js.map +1 -1
- package/dist/resources/service/service-port.d.ts.map +1 -1
- package/dist/resources/service/service-port.js +1 -0
- package/dist/resources/service/service-port.js.map +1 -1
- package/dist/resources/service/service.d.ts.map +1 -1
- package/dist/resources/service/service.js +2 -1
- package/dist/resources/service/service.js.map +1 -1
- package/dist/resources/utils/adapters.d.ts +1 -2
- package/dist/resources/utils/adapters.d.ts.map +1 -1
- package/dist/resources/utils/adapters.js +0 -9
- package/dist/resources/utils/adapters.js.map +1 -1
- package/dist/src.tsbuildinfo +1 -1
- package/package.json +5 -4
- package/src/env/env.ts +128 -0
- package/src/env/index.ts +2 -0
- package/src/env/types.ts +17 -0
- package/src/env/validate-name.ts +10 -0
- package/src/resources/pod/container/container.ts +3 -5
- package/src/resources/service/service-port.ts +1 -0
- package/src/resources/service/service.ts +2 -1
- package/src/resources/utils/adapters.ts +1 -11
- package/src/tsconfig.json +1 -1
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { type MapOf } from "immutable";
|
|
2
|
+
import type { CDK } from "../_imports";
|
|
3
|
+
import type { InputEnv, InputEnvMapping } from "./types";
|
|
4
|
+
type _EnvBuilderMap = MapOf<InputEnvMapping>;
|
|
5
|
+
export declare class EnvBuilder {
|
|
6
|
+
private readonly _env;
|
|
7
|
+
constructor(_env: _EnvBuilderMap);
|
|
8
|
+
get values(): _EnvBuilderMap;
|
|
9
|
+
private _envFromSecret;
|
|
10
|
+
private _envFromConfigMap;
|
|
11
|
+
toEnvVars(): ({
|
|
12
|
+
name: string;
|
|
13
|
+
value: string;
|
|
14
|
+
valueFrom?: undefined;
|
|
15
|
+
} | {
|
|
16
|
+
name: string;
|
|
17
|
+
valueFrom: CDK.EnvVarSource;
|
|
18
|
+
value?: undefined;
|
|
19
|
+
})[];
|
|
20
|
+
private _withEnv;
|
|
21
|
+
add(name: string, value: InputEnvMapping[string]): EnvBuilder;
|
|
22
|
+
add(input: InputEnvMapping): EnvBuilder;
|
|
23
|
+
overwrite(name: string, value: string): EnvBuilder;
|
|
24
|
+
overwrite(input: InputEnvMapping): EnvBuilder;
|
|
25
|
+
toObject(): {
|
|
26
|
+
[key: string]: string;
|
|
27
|
+
};
|
|
28
|
+
static make(env?: InputEnv): EnvBuilder;
|
|
29
|
+
}
|
|
30
|
+
export declare function Env(env?: InputEnvMapping): EnvBuilder;
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=env.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/env/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AAE3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAGtC,OAAO,KAAK,EAAc,QAAQ,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAGpE,KAAK,cAAc,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;AAC5C,qBAAa,UAAU;IACP,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,cAAc;IAUjD,IAAI,MAAM,mBAET;IAED,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,iBAAiB;IAUzB,SAAS;;;;;;;;;IA+BT,OAAO,CAAC,QAAQ;IAIhB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,GAAG,UAAU;IAC7D,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU;IAgBvC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU;IAClD,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU;IAU7C,QAAQ;;;IAOR,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ;CAS7B;AAED,wBAAgB,GAAG,CAAC,GAAG,CAAC,EAAE,eAAe,cAExC"}
|
package/dist/env/env.js
ADDED
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EnvBuilder = void 0;
|
|
4
|
+
exports.Env = Env;
|
|
5
|
+
const immutable_1 = require("immutable");
|
|
6
|
+
const what_are_you_1 = require("what-are-you");
|
|
7
|
+
const error_1 = require("../error");
|
|
8
|
+
const kinds_1 = require("../kinds");
|
|
9
|
+
const validate_name_1 = require("./validate-name");
|
|
10
|
+
class EnvBuilder {
|
|
11
|
+
_env;
|
|
12
|
+
constructor(_env) {
|
|
13
|
+
this._env = _env;
|
|
14
|
+
for (const key of _env.keys()) {
|
|
15
|
+
if (!(0, validate_name_1.isValidEnvVarName)(key)) {
|
|
16
|
+
throw new error_1.MakeError("Invalid environment variable name", {
|
|
17
|
+
key: key
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
get values() {
|
|
23
|
+
return this._env;
|
|
24
|
+
}
|
|
25
|
+
_envFromSecret(value) {
|
|
26
|
+
return {
|
|
27
|
+
secretKeyRef: {
|
|
28
|
+
name: value.$ref.name,
|
|
29
|
+
key: value.key,
|
|
30
|
+
optional: value.optional
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
_envFromConfigMap(value) {
|
|
35
|
+
return {
|
|
36
|
+
configMapKeyRef: {
|
|
37
|
+
name: value.$ref.name,
|
|
38
|
+
key: value.key,
|
|
39
|
+
optional: value.optional
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
toEnvVars() {
|
|
44
|
+
return this.values
|
|
45
|
+
.map((value, key) => {
|
|
46
|
+
if (!(0, what_are_you_1.isObject)(value)) {
|
|
47
|
+
return {
|
|
48
|
+
name: key,
|
|
49
|
+
value: `${value}`
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
const resourceValue = value;
|
|
53
|
+
switch (resourceValue.$ref.kind) {
|
|
54
|
+
case kinds_1.api.v1_.Secret:
|
|
55
|
+
return {
|
|
56
|
+
name: key,
|
|
57
|
+
valueFrom: this._envFromSecret(resourceValue)
|
|
58
|
+
};
|
|
59
|
+
case kinds_1.api.v1_.ConfigMap:
|
|
60
|
+
return {
|
|
61
|
+
name: key,
|
|
62
|
+
valueFrom: this._envFromConfigMap(resourceValue)
|
|
63
|
+
};
|
|
64
|
+
default:
|
|
65
|
+
throw new error_1.MakeError("Invalid environment variable reference", {
|
|
66
|
+
key: key,
|
|
67
|
+
value: value
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
})
|
|
71
|
+
.valueSeq()
|
|
72
|
+
.toArray();
|
|
73
|
+
}
|
|
74
|
+
_withEnv(f) {
|
|
75
|
+
return new EnvBuilder(f(this._env));
|
|
76
|
+
}
|
|
77
|
+
add(a, b) {
|
|
78
|
+
const pairs = typeof a === "string" ? [[a, b]] : Object.entries(a);
|
|
79
|
+
const map = (0, immutable_1.Map)(pairs);
|
|
80
|
+
const existingKeys = map
|
|
81
|
+
.keySeq()
|
|
82
|
+
.filter(k => this._env.has(k))
|
|
83
|
+
.toList();
|
|
84
|
+
if (existingKeys.size > 0) {
|
|
85
|
+
throw new error_1.MakeError("Cannot overwrite existing keys using add", {
|
|
86
|
+
keys: existingKeys.toArray()
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
return this._withEnv(env => env.merge(map));
|
|
90
|
+
}
|
|
91
|
+
overwrite(a, b) {
|
|
92
|
+
if (typeof a === "string") {
|
|
93
|
+
return this._withEnv(env => env.set(a, b));
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
const map = (0, immutable_1.Map)(a);
|
|
97
|
+
return this._withEnv(env => env.merge(map));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
toObject() {
|
|
101
|
+
return this._env
|
|
102
|
+
.filter(v => v != null)
|
|
103
|
+
.map(x => `${x}`)
|
|
104
|
+
.toObject();
|
|
105
|
+
}
|
|
106
|
+
static make(env) {
|
|
107
|
+
if (!env) {
|
|
108
|
+
return new EnvBuilder((0, immutable_1.Map)({}));
|
|
109
|
+
}
|
|
110
|
+
if (env instanceof EnvBuilder) {
|
|
111
|
+
return env;
|
|
112
|
+
}
|
|
113
|
+
return new EnvBuilder((0, immutable_1.Map)(env ?? {}).filter(v => v != null));
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
exports.EnvBuilder = EnvBuilder;
|
|
117
|
+
function Env(env) {
|
|
118
|
+
return EnvBuilder.make(env);
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/env/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EnvBuilder = exports.Env = void 0;
|
|
4
|
+
var env_1 = require("./env");
|
|
5
|
+
Object.defineProperty(exports, "Env", { enumerable: true, get: function () { return env_1.Env; } });
|
|
6
|
+
Object.defineProperty(exports, "EnvBuilder", { enumerable: true, get: function () { return env_1.EnvBuilder; } });
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/env/index.ts"],"names":[],"mappings":";;;AAAA,6BAAuC;AAA9B,0FAAA,GAAG,OAAA;AAAE,iGAAA,UAAU,OAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Kind, Refable } from "@k8ts/instruments";
|
|
2
|
+
import type { EnvBuilder } from "./env";
|
|
3
|
+
export type InputEnvValue = string | null | number | boolean | bigint | undefined | EnvVarFrom;
|
|
4
|
+
export type InputEnvMapping = Partial<Record<string, InputEnvValue>>;
|
|
5
|
+
export interface EnvVarFrom<_Kind extends Kind = Kind> {
|
|
6
|
+
$ref: Refable<_Kind>;
|
|
7
|
+
key: string;
|
|
8
|
+
optional?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export type InputEnv = EnvBuilder | InputEnvMapping;
|
|
11
|
+
export type EnvFrom<_Kind extends Kind = Kind> = {
|
|
12
|
+
$ref: Refable<_Kind>;
|
|
13
|
+
prefix?: string;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/env/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAEvC,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,CAAA;AAC9F,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;AACpE,MAAM,WAAW,UAAU,CAAC,KAAK,SAAS,IAAI,GAAG,IAAI;IACjD,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,eAAe,CAAA;AAEnD,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,IAAI,GAAG,IAAI,IAAI;IAC7C,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/env/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-name.d.ts","sourceRoot":"","sources":["../../src/env/validate-name.ts"],"names":[],"mappings":"AAOA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,WAE1C"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isValidEnvVarName = isValidEnvVarName;
|
|
4
|
+
const parjs_1 = require("parjs");
|
|
5
|
+
const combinators_1 = require("parjs/combinators");
|
|
6
|
+
const pEnvVarStartChar = (0, parjs_1.letter)().pipe((0, combinators_1.or)((0, parjs_1.anyCharOf)("_")));
|
|
7
|
+
const pEnvVarChar = pEnvVarStartChar.pipe((0, combinators_1.or)((0, parjs_1.digit)()));
|
|
8
|
+
const pEnvVarName = pEnvVarStartChar.pipe((0, combinators_1.then)(pEnvVarChar.pipe((0, combinators_1.many)())), (0, combinators_1.stringify)());
|
|
9
|
+
function isValidEnvVarName(x) {
|
|
10
|
+
return pEnvVarName.parse(x).isOk;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=validate-name.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-name.js","sourceRoot":"","sources":["../../src/env/validate-name.ts"],"names":[],"mappings":";;AAOA,8CAEC;AATD,iCAAgD;AAChD,mDAA6D;AAE7D,MAAM,gBAAgB,GAAG,IAAA,cAAM,GAAE,CAAC,IAAI,CAAC,IAAA,gBAAE,EAAC,IAAA,iBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC1D,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAA,gBAAE,EAAC,IAAA,aAAK,GAAE,CAAC,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAA,kBAAI,EAAC,WAAW,CAAC,IAAI,CAAC,IAAA,kBAAI,GAAE,CAAC,CAAC,EAAE,IAAA,uBAAS,GAAE,CAAC,CAAA;AAEtF,SAAgB,iBAAiB,CAAC,CAAS;IACvC,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACpC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { Kinded, PortSet, ResourcesSpec, WritableDeep, type CmdBuilder, type
|
|
1
|
+
import { Kinded, PortSet, ResourcesSpec, WritableDeep, type CmdBuilder, type InputPortSetRecord, type TaggedImage } from "@k8ts/instruments";
|
|
2
2
|
import type { CDK } from "../../../_imports";
|
|
3
|
+
import { type InputEnvMapping } from "../../../env";
|
|
3
4
|
import { api } from "../../../kinds";
|
|
4
5
|
import type { ManifestResource } from "../../../node";
|
|
5
6
|
import { SubResource } from "../../../node/sub-resource";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,7 @@ const immutable_1 = require("immutable");
|
|
|
40
40
|
const adapters_1 = require("../../utils/adapters");
|
|
41
41
|
const doddle_1 = require("doddle");
|
|
42
42
|
const lodash_1 = require("lodash");
|
|
43
|
+
const env_1 = require("../../../env");
|
|
43
44
|
const kind_map_1 = require("../../../kind-map");
|
|
44
45
|
const kinds_1 = require("../../../kinds");
|
|
45
46
|
const sub_resource_1 = require("../../../node/sub-resource");
|
|
@@ -109,7 +110,7 @@ var Container;
|
|
|
109
110
|
ports: $ports && (0, adapters_1.toContainerPorts)(instruments_1.PortSet.make($ports)).valueSeq().toArray(),
|
|
110
111
|
resources: self._resources()?.toObject(),
|
|
111
112
|
command: $command?.toArray(),
|
|
112
|
-
env: (0,
|
|
113
|
+
env: (0, env_1.Env)($env).toEnvVars(),
|
|
113
114
|
...self._groupedMounts()
|
|
114
115
|
};
|
|
115
116
|
return container;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-port.d.ts","sourceRoot":"","sources":["../../../src/resources/service/service-port.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,MAAM,IAAI,CAAC,IAAI,SAAS,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvD,yBAAiB,IAAI,CAAC;IAClB,UAAiB,KAAK,CAAC,IAAI,SAAS,MAAM;QACtC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,EAAE,IAAI,CAAA;KACb;IAED,MAAa,IAAI,CAAC,IAAI,SAAS,MAAM;QACrB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;oBAAlB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;QAEvC,IAAI,OAAO,IACsB,OAAO,CAAC,IAAI,CAAC,CAC7C;QAED,IAAI,IAAI,gBAEP;
|
|
1
|
+
{"version":3,"file":"service-port.d.ts","sourceRoot":"","sources":["../../../src/resources/service/service-port.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,MAAM,IAAI,CAAC,IAAI,SAAS,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvD,yBAAiB,IAAI,CAAC;IAClB,UAAiB,KAAK,CAAC,IAAI,SAAS,MAAM;QACtC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,EAAE,IAAI,CAAA;KACb;IAED,MAAa,IAAI,CAAC,IAAI,SAAS,MAAM;QACrB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;oBAAlB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;QAEvC,IAAI,OAAO,IACsB,OAAO,CAAC,IAAI,CAAC,CAC7C;QAED,IAAI,IAAI,gBAEP;QAGD,GAAG,IAAI,GAAG,CAAC,6BAA6B;KAQ3C;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-port.js","sourceRoot":"","sources":["../../../src/resources/service/service-port.ts"],"names":[],"mappings":";;;AAIA,IAAiB,IAAI,
|
|
1
|
+
{"version":3,"file":"service-port.js","sourceRoot":"","sources":["../../../src/resources/service/service-port.ts"],"names":[],"mappings":";;;AAIA,IAAiB,IAAI,CA2BpB;AA3BD,WAAiB,MAAI;IAMjB,MAAa,IAAI;QACQ;QAArB,YAAqB,KAAkB;YAAlB,UAAK,GAAL,KAAK,CAAa;QAAG,CAAC;QAE3C,IAAI,OAAO;YACP,OAAO,IAAI,CAAC,KAAK,CAAC,OAAwB,CAAA;QAC9C,CAAC;QAED,IAAI,IAAI;YACJ,OAAO,IAAI,CAAC,KAAK,CAAA;QACrB,CAAC;QAED,yCAAyC;QACzC,GAAG;YACC,OAAO;gBACH,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;gBAChD,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;gBACnC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ;aACzD,CAAA;QACL,CAAC;KACJ;IApBY,WAAI,OAoBhB,CAAA;AACL,CAAC,EA3BgB,IAAI,oBAAJ,IAAI,QA2BpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/resources/service/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EAGP,KAAK,gBAAgB,EACxB,MAAM,mBAAmB,CAAA;AAK1B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC9C,MAAM,MAAM,OAAO,CAAC,YAAY,SAAS,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AACzF,yBAAiB,OAAO,CAAC;IACrB,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAA;IAC1B,MAAM,QAAQ,QAAQ,GAAG,SAAS,CAAA;IAClC,UAAiB,KAAK,CAAC,WAAW,SAAS,MAAM,EAAE,YAAY,SAAS,WAAW;QAC/E,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACtC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QAC/C,SAAS,EAAE,QAAQ,CAAA;KACtB;IACD,KAAY,UAAU,CAAC,YAAY,SAAS,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG;QAC7E,SAAS,EAAE,YAAY,CAAA;KAC1B,CAAA;IACD,MA2Ba,OAAO,CAAC,YAAY,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,gBAAgB,CAC/E,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAC9B;QACG,SAAS,EAAG,YAAY,CAAA;QACxB,IAAI,+IAAkB;QAEtB,OAAO,KAAK,OAAO,GAElB;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/resources/service/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EAGP,KAAK,gBAAgB,EACxB,MAAM,mBAAmB,CAAA;AAK1B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC9C,MAAM,MAAM,OAAO,CAAC,YAAY,SAAS,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AACzF,yBAAiB,OAAO,CAAC;IACrB,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAA;IAC1B,MAAM,QAAQ,QAAQ,GAAG,SAAS,CAAA;IAClC,UAAiB,KAAK,CAAC,WAAW,SAAS,MAAM,EAAE,YAAY,SAAS,WAAW;QAC/E,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACtC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QAC/C,SAAS,EAAE,QAAQ,CAAA;KACtB;IACD,KAAY,UAAU,CAAC,YAAY,SAAS,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG;QAC7E,SAAS,EAAE,YAAY,CAAA;KAC1B,CAAA;IACD,MA2Ba,OAAO,CAAC,YAAY,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,gBAAgB,CAC/E,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAC9B;QACG,SAAS,EAAG,YAAY,CAAA;QACxB,IAAI,+IAAkB;QAEtB,OAAO,KAAK,OAAO,GAElB;QAED,IAAI,KAAK,sDAQR;QAED,OAAO,CAAC,IAAI,EAAE,YAAY;QAO1B,IAAI,QAAQ,WAEX;QAED,OAAO,CAAC,aAAa;QAcrB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,IAAI,EAAE,YAAY;KAGzD;CACJ"}
|
|
@@ -91,6 +91,7 @@ var Service;
|
|
|
91
91
|
get backend() {
|
|
92
92
|
return this.props.$backend;
|
|
93
93
|
}
|
|
94
|
+
// TODO: Ports force evaluates the backend which is not needed
|
|
94
95
|
get ports() {
|
|
95
96
|
const srcPorts = this.backend.ports.pull();
|
|
96
97
|
const knownPorts = (0, immutable_1.Map)(this.props.$ports)
|
|
@@ -110,7 +111,7 @@ var Service;
|
|
|
110
111
|
return `${this.name}.${this.namespace}.svc.cluster.local`;
|
|
111
112
|
}
|
|
112
113
|
_getPortoPart(port, protocol) {
|
|
113
|
-
const portNumber = this.ports
|
|
114
|
+
const portNumber = this.props.$ports[port];
|
|
114
115
|
if (portNumber === 80 && protocol === "http") {
|
|
115
116
|
return "";
|
|
116
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/resources/service/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAM0B;AAC1B,yCAA+B;AAC/B,6CAAoC;AACpC,uCAAuC;AACvC,6CAAqC;AACrC,uCAAiC;AACjC,qCAA6C;AAC7C,wDAAoD;AAEpD,gDAAkD;AAElD,iDAA8C;AAE9C,IAAiB,OAAO,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/resources/service/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PortMap, PortMapEntry, PortSet, PortSetEntry } from "@k8ts/instruments";
|
|
2
2
|
import { CDK } from "../../_imports";
|
|
3
3
|
export declare function toContainerPort(entry: PortSetEntry): CDK.ContainerPort;
|
|
4
4
|
export declare function toContainerPorts(ports: PortSet<any>): import("immutable").Map<any, CDK.ContainerPort>;
|
|
5
5
|
export declare function toServicePort(entry: PortMapEntry): CDK.ServicePort;
|
|
6
6
|
export declare function toServicePorts(ports: PortMap<any>): import("immutable").List<CDK.ServicePort>;
|
|
7
|
-
export declare function toEnvVars(env: EnvBuilder): import("immutable").Map<string, CDK.EnvVar>;
|
|
8
7
|
//# sourceMappingURL=adapters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../src/resources/utils/adapters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../src/resources/utils/adapters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrF,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,GAAG,CAAC,aAAa,CAQtE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,mDAEnD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,GAAG,CAAC,WAAW,CAOlE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,6CAEjD"}
|
|
@@ -4,7 +4,6 @@ exports.toContainerPort = toContainerPort;
|
|
|
4
4
|
exports.toContainerPorts = toContainerPorts;
|
|
5
5
|
exports.toServicePort = toServicePort;
|
|
6
6
|
exports.toServicePorts = toServicePorts;
|
|
7
|
-
exports.toEnvVars = toEnvVars;
|
|
8
7
|
const _imports_1 = require("../../_imports");
|
|
9
8
|
function toContainerPort(entry) {
|
|
10
9
|
return {
|
|
@@ -29,12 +28,4 @@ function toServicePort(entry) {
|
|
|
29
28
|
function toServicePorts(ports) {
|
|
30
29
|
return ports.values.map(toServicePort).toList();
|
|
31
30
|
}
|
|
32
|
-
function toEnvVars(env) {
|
|
33
|
-
return env.values.map((x, key) => {
|
|
34
|
-
return {
|
|
35
|
-
name: key,
|
|
36
|
-
value: `${x}`
|
|
37
|
-
};
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
31
|
//# sourceMappingURL=adapters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../../src/resources/utils/adapters.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"adapters.js","sourceRoot":"","sources":["../../../src/resources/utils/adapters.ts"],"names":[],"mappings":";;AAEA,0CAQC;AAED,4CAEC;AAED,sCAOC;AAED,wCAEC;AA1BD,6CAAoC;AACpC,SAAgB,eAAe,CAAC,KAAmB;IAC/C,OAAO;QACH,aAAa,EAAE,KAAK,CAAC,IAAI;QACzB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI;KAC7B,CAAA;AACL,CAAC;AAED,SAAgB,gBAAgB,CAAC,KAAmB;IAChD,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAC5C,CAAC;AAED,SAAgB,aAAa,CAAC,KAAmB;IAC7C,OAAO;QACH,IAAI,EAAE,KAAK,CAAC,QAAQ;QACpB,UAAU,EAAE,cAAG,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QAClD,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;KACnB,CAAA;AACL,CAAC;AAED,SAAgB,cAAc,CAAC,KAAmB;IAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAA;AACnD,CAAC"}
|