@otwld/nx-argo 0.0.14 → 0.0.15-staging.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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { join, resolve } from 'node:path';
|
|
3
3
|
import { parseDocument } from 'yaml';
|
|
4
|
-
import { assertEnvironment, assertLabel, githubUrlFor, isRecord, namespaceFor, repositoryFromWorkspaceRoot,
|
|
4
|
+
import { assertEnvironment, assertLabel, githubUrlFor, isRecord, namespaceFor, repositoryFromWorkspaceRoot, } from '../names.js';
|
|
5
5
|
const environments = ['staging', 'production'];
|
|
6
6
|
const executor = async (_options, context) => {
|
|
7
7
|
try {
|
|
@@ -36,7 +36,7 @@ function validateBundle(root, repository, deployable, environment) {
|
|
|
36
36
|
if (!existsSync(join(directory, name)))
|
|
37
37
|
throw new Error(`[nx-argo] Missing ${environment}/${name}.`);
|
|
38
38
|
const state = yaml(join(directory, 'state.yaml'));
|
|
39
|
-
|
|
39
|
+
yaml(join(directory, 'values.yaml'));
|
|
40
40
|
if (!isRecord(state) ||
|
|
41
41
|
state['deployable'] !== deployable ||
|
|
42
42
|
typeof state['registered'] !== 'boolean' ||
|
|
@@ -50,7 +50,6 @@ function validateBundle(root, repository, deployable, environment) {
|
|
|
50
50
|
if (state['registered'] === true &&
|
|
51
51
|
(!state['chart']['repository'] || !state['chart']['version']))
|
|
52
52
|
throw new Error(`[nx-argo] Registered ${environment} requires chart repository and version.`);
|
|
53
|
-
validateIngressValues(values, repository, deployable, environment);
|
|
54
53
|
const policyPath = join(directory, 'image-updater.yaml');
|
|
55
54
|
if (existsSync(policyPath))
|
|
56
55
|
validatePolicy(yaml(policyPath), repository, deployable, environment);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/executors/validate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,2BAA2B,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/executors/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { addProjectConfiguration, getProjects, joinPathFragments, readProjectConfiguration, } from '@nx/devkit';
|
|
2
2
|
import { parseDocument, stringify } from 'yaml';
|
|
3
|
-
import { assertLabel, githubUrlFor, hostnameFor, namespaceFor, repositoryFromWorkspaceRoot,
|
|
3
|
+
import { assertLabel, githubUrlFor, hostnameFor, namespaceFor, repositoryFromWorkspaceRoot, } from '../names.js';
|
|
4
4
|
const environments = ['staging', 'production'];
|
|
5
5
|
export default async function registerGenerator(tree, options) {
|
|
6
6
|
const deployable = requiredLabel(options.deployable, 'deployable');
|
|
@@ -20,8 +20,6 @@ export default async function registerGenerator(tree, options) {
|
|
|
20
20
|
const document = parseDocument(values);
|
|
21
21
|
if (document.errors.length)
|
|
22
22
|
throw new Error(`[nx-argo] ${chartValues} is not valid YAML.`);
|
|
23
|
-
for (const environment of environments)
|
|
24
|
-
validateIngressValues(document.toJS(), repository, deployable, environment);
|
|
25
23
|
addProjectConfiguration(tree, projectName, {
|
|
26
24
|
root,
|
|
27
25
|
projectType: 'application',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/generators/register.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,iBAAiB,EACjB,wBAAwB,GAEzB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EACL,WAAW,EACX,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,2BAA2B,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/generators/register.ts"],"names":[],"mappings":"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"}
|
package/src/names.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ export declare function assertEnvironment(value: string): asserts value is 'stag
|
|
|
3
3
|
export declare function namespaceFor(repository: string, deployable: string, environment: string): string;
|
|
4
4
|
export declare function hostnameFor(repository: string, deployable: string, service: string, environment: string): string;
|
|
5
5
|
export declare function assertHostname(value: string, field: string): void;
|
|
6
|
-
export declare function validateIngressValues(value: unknown, repository: string, deployable: string, environment: 'staging' | 'production', owner?: string): void;
|
|
7
6
|
export declare function isRecord(value: unknown): value is Record<string, unknown>;
|
|
8
7
|
/** Resolves the consumer repository identity from its workspace directory. */
|
|
9
8
|
export declare function repositoryFromWorkspaceRoot(workspaceRoot: string): string;
|
package/src/names.js
CHANGED
|
@@ -30,47 +30,6 @@ export function assertHostname(value, field) {
|
|
|
30
30
|
if (!hostname.test(value))
|
|
31
31
|
throw new Error(`[nx-argo] ${field} must be a lower-case DNS hostname of at most 253 characters.`);
|
|
32
32
|
}
|
|
33
|
-
export function validateIngressValues(value, repository, deployable, environment, owner = deployable) {
|
|
34
|
-
if (validateIngressTree(value, repository, deployable, environment, owner) === 0) {
|
|
35
|
-
throw new Error('[nx-argo] values must contain at least one ingress.hosts block.');
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
function validateIngressTree(value, repository, deployable, environment, owner) {
|
|
39
|
-
if (!isRecord(value))
|
|
40
|
-
return 0;
|
|
41
|
-
let ingressCount = 0;
|
|
42
|
-
for (const [key, child] of Object.entries(value)) {
|
|
43
|
-
if (key === 'ingress' && isRecord(child)) {
|
|
44
|
-
validateIngressBlock(child, repository, deployable, environment, owner);
|
|
45
|
-
ingressCount += 1;
|
|
46
|
-
continue;
|
|
47
|
-
}
|
|
48
|
-
if (isRecord(child)) {
|
|
49
|
-
ingressCount += validateIngressTree(child, repository, deployable, environment, key);
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
return ingressCount;
|
|
53
|
-
}
|
|
54
|
-
function validateIngressBlock(ingress, repository, deployable, environment, owner) {
|
|
55
|
-
assertLabel(owner, 'ingress service');
|
|
56
|
-
if (!Array.isArray(ingress['hosts']))
|
|
57
|
-
throw new Error('[nx-argo] ingress.hosts must be an array.');
|
|
58
|
-
const expected = hostnameFor(repository, deployable, owner, environment);
|
|
59
|
-
const includesDefault = ingress['hosts'].some((host) => {
|
|
60
|
-
const name = ingressHostName(host);
|
|
61
|
-
assertHostname(name, 'ingress host');
|
|
62
|
-
return name === expected;
|
|
63
|
-
});
|
|
64
|
-
if (!includesDefault)
|
|
65
|
-
throw new Error(`[nx-argo] ingress.hosts for ${owner} must include default host ${expected}.`);
|
|
66
|
-
}
|
|
67
|
-
function ingressHostName(host) {
|
|
68
|
-
if (typeof host === 'string')
|
|
69
|
-
return host;
|
|
70
|
-
if (isRecord(host) && typeof host['host'] === 'string')
|
|
71
|
-
return host['host'];
|
|
72
|
-
throw new Error('[nx-argo] ingress.hosts entries require a host string.');
|
|
73
|
-
}
|
|
74
33
|
export function isRecord(value) {
|
|
75
34
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
76
35
|
}
|
package/src/names.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/names.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,KAAK,GAAG,mCAAmC,CAAC;AAClD,MAAM,QAAQ,GACZ,uEAAuE,CAAC;AAE1E,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,KAAa;IACtD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,2DAA2D,CAC9E,CAAC;AACN,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,KAAa;IAEb,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,YAAY;QAC/C,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC5E,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,UAAkB,EAClB,UAAkB,EAClB,WAAmB;IAEnB,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,GAAG,UAAU,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;IAC/D,WAAW,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC5C,OAAO,SAAS,CAAC;AACnB,CAAC;AACD,MAAM,UAAU,WAAW,CACzB,UAAkB,EAClB,UAAkB,EAClB,OAAe,EACf,WAAmB;IAEnB,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,GAAG,UAAU,IAAI,UAAU,IAAI,OAAO,IAAI,WAAW,YAAY,CAAC;IAChF,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AACD,MAAM,UAAU,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,+DAA+D,CAClF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/names.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,KAAK,GAAG,mCAAmC,CAAC;AAClD,MAAM,QAAQ,GACZ,uEAAuE,CAAC;AAE1E,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,KAAa;IACtD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,2DAA2D,CAC9E,CAAC;AACN,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,KAAa;IAEb,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,YAAY;QAC/C,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC5E,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,UAAkB,EAClB,UAAkB,EAClB,WAAmB;IAEnB,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,GAAG,UAAU,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;IAC/D,WAAW,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC5C,OAAO,SAAS,CAAC;AACnB,CAAC;AACD,MAAM,UAAU,WAAW,CACzB,UAAkB,EAClB,UAAkB,EAClB,OAAe,EACf,WAAmB;IAEnB,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,GAAG,UAAU,IAAI,UAAU,IAAI,OAAO,IAAI,WAAW,YAAY,CAAC;IAChF,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AACD,MAAM,UAAU,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,aAAa,KAAK,+DAA+D,CAClF,CAAC;AACN,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,2BAA2B,CAAC,aAAqB;IAC/D,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IACpD,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,YAAY,CAAC,UAAkB;IAC7C,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACtC,OAAO,4BAA4B,UAAU,MAAM,CAAC;AACtD,CAAC"}
|