@otwld/nx-argo 0.0.18 → 0.0.19-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 +5 -5
- package/src/executors/validate.js +7 -7
- package/src/executors/validate.js.map +1 -1
- package/src/generators/register.js +16 -16
- package/src/generators/register.js.map +1 -1
- package/src/index.d.ts +2 -2
- package/src/index.js +2 -2
- package/src/index.js.map +1 -1
- package/src/names.d.ts +1 -1
- package/src/plugin.js +3 -3
- package/src/plugin.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@otwld/nx-argo",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.19-staging.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
8
8
|
"@nx/nx-source": "./src/index.ts",
|
|
9
9
|
"types": "./src/index.d.ts",
|
|
10
|
-
"
|
|
11
|
-
"
|
|
10
|
+
"default": "./src/index.js",
|
|
11
|
+
"import": "./src/index.js"
|
|
12
12
|
},
|
|
13
13
|
"./package.json": "./package.json",
|
|
14
14
|
"./executors.json": "./executors.json",
|
|
15
15
|
"./generators.json": "./generators.json"
|
|
16
16
|
},
|
|
17
17
|
"main": "./src/index.js",
|
|
18
|
-
"module": "./src/index.js",
|
|
19
18
|
"types": "./src/index.d.ts",
|
|
20
19
|
"dependencies": {
|
|
21
20
|
"@nx/devkit": "23.2.1",
|
|
@@ -29,5 +28,6 @@
|
|
|
29
28
|
"access": "public"
|
|
30
29
|
},
|
|
31
30
|
"executors": "./executors.json",
|
|
32
|
-
"generators": "./generators.json"
|
|
31
|
+
"generators": "./generators.json",
|
|
32
|
+
"module": "./src/index.js"
|
|
33
33
|
}
|
|
@@ -70,13 +70,6 @@ function validateBundle(root, repository, deployable, environment) {
|
|
|
70
70
|
validatePolicy(yaml(policyPath), repository, deployable, environment);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
-
function yaml(file) {
|
|
74
|
-
const document = parseDocument(readFileSync(file, 'utf8'));
|
|
75
|
-
if (document.errors.length) {
|
|
76
|
-
throw new Error(`[nx-argo] ${file} is invalid YAML.`);
|
|
77
|
-
}
|
|
78
|
-
return document.toJS();
|
|
79
|
-
}
|
|
80
73
|
function validatePolicy(policy, repository, deployable, environment) {
|
|
81
74
|
const spec = policySpec(policy);
|
|
82
75
|
const application = `${repository}-${deployable}-${environment}`;
|
|
@@ -85,6 +78,13 @@ function validatePolicy(policy, repository, deployable, environment) {
|
|
|
85
78
|
validateImageMappings(reference['images'], environment);
|
|
86
79
|
validateWriteBack(spec, repository, deployable, environment);
|
|
87
80
|
}
|
|
81
|
+
function yaml(file) {
|
|
82
|
+
const document = parseDocument(readFileSync(file, 'utf8'));
|
|
83
|
+
if (document.errors.length) {
|
|
84
|
+
throw new Error(`[nx-argo] ${file} is invalid YAML.`);
|
|
85
|
+
}
|
|
86
|
+
return document.toJS();
|
|
87
|
+
}
|
|
88
88
|
function policySpec(policy) {
|
|
89
89
|
if (!isRecord(policy) || !isRecord(policy['spec'])) {
|
|
90
90
|
throw new Error('[nx-argo] image-updater.yaml requires spec.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/executors/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/executors/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { addProjectConfiguration, getProjects, joinPathFragments, readProjectConfiguration, } from '@nx/devkit';
|
|
2
1
|
import { parseDocument, stringify } from 'yaml';
|
|
2
|
+
import { addProjectConfiguration, getProjects, joinPathFragments, readProjectConfiguration, } from '@nx/devkit';
|
|
3
3
|
import { assertLabel, githubUrlFor, hostnameFor, namespaceFor, repositoryFromWorkspaceRoot, } from '../names.js';
|
|
4
4
|
const environments = ['staging', 'production'];
|
|
5
5
|
/**
|
|
@@ -31,9 +31,6 @@ export default async function registerGenerator(tree, options) {
|
|
|
31
31
|
throw new Error(`[nx-argo] ${chartValues} is not valid YAML.`);
|
|
32
32
|
}
|
|
33
33
|
addProjectConfiguration(tree, projectName, {
|
|
34
|
-
root,
|
|
35
|
-
projectType: 'application',
|
|
36
|
-
tags: ['type:deployable', `scope:${deployable}`],
|
|
37
34
|
metadata: {
|
|
38
35
|
argo: {
|
|
39
36
|
chartProject: options.chartProject,
|
|
@@ -42,16 +39,19 @@ export default async function registerGenerator(tree, options) {
|
|
|
42
39
|
imageMappings: mappings,
|
|
43
40
|
},
|
|
44
41
|
},
|
|
42
|
+
projectType: 'application',
|
|
43
|
+
root,
|
|
44
|
+
tags: ['type:deployable', `scope:${deployable}`],
|
|
45
45
|
});
|
|
46
46
|
for (const environment of environments) {
|
|
47
47
|
tree.write(joinPathFragments(root, environment, 'state.yaml'), stringify({
|
|
48
|
-
deployable,
|
|
49
|
-
registered: false,
|
|
50
|
-
enabled: false,
|
|
51
48
|
chart: {
|
|
52
49
|
repository: options.chartRepository ?? '',
|
|
53
50
|
version: options.chartVersion ?? '',
|
|
54
51
|
},
|
|
52
|
+
deployable,
|
|
53
|
+
enabled: false,
|
|
54
|
+
registered: false,
|
|
55
55
|
}, { lineWidth: 0 }));
|
|
56
56
|
tree.write(joinPathFragments(root, environment, 'values.yaml'), values);
|
|
57
57
|
if (mappings.length) {
|
|
@@ -114,10 +114,6 @@ function generatedPaths(root, mappings) {
|
|
|
114
114
|
]),
|
|
115
115
|
];
|
|
116
116
|
}
|
|
117
|
-
function requiredLabel(value, field) {
|
|
118
|
-
assertLabel(value, field);
|
|
119
|
-
return value;
|
|
120
|
-
}
|
|
121
117
|
function parseImageMapping(input) {
|
|
122
118
|
const values = Object.fromEntries(input.split(',').map((part) => {
|
|
123
119
|
const index = part.indexOf('=');
|
|
@@ -133,8 +129,8 @@ function parseImageMapping(input) {
|
|
|
133
129
|
}
|
|
134
130
|
assertLabel(values['project'], 'image mapping project');
|
|
135
131
|
return {
|
|
136
|
-
project: values['project'],
|
|
137
132
|
imageName: values['imageName'],
|
|
133
|
+
project: values['project'],
|
|
138
134
|
repositoryPath: values['repositoryPath'],
|
|
139
135
|
tagPath: values['tagPath'],
|
|
140
136
|
};
|
|
@@ -151,24 +147,23 @@ function policy(repository, githubUrl, deployable, environment, mappings) {
|
|
|
151
147
|
spec: {
|
|
152
148
|
applicationRefs: [
|
|
153
149
|
{
|
|
154
|
-
namePattern: `${repository}-${deployable}-${environment}`,
|
|
155
150
|
images: mappings.map((mapping) => ({
|
|
156
151
|
alias: mapping.project,
|
|
157
|
-
imageName: mapping.imageName,
|
|
158
152
|
commonUpdateSettings: {
|
|
159
|
-
updateStrategy: staging ? 'newest-build' : 'semver',
|
|
160
153
|
allowTags: staging
|
|
161
154
|
? 'regexp:^.+-staging\\.[0-9]+$'
|
|
162
155
|
: 'regexp:^[0-9]+\\.[0-9]+\\.[0-9]+$',
|
|
156
|
+
updateStrategy: staging ? 'newest-build' : 'semver',
|
|
163
157
|
},
|
|
158
|
+
imageName: mapping.imageName,
|
|
164
159
|
manifestTargets: {
|
|
165
160
|
helm: { name: mapping.repositoryPath, tag: mapping.tagPath },
|
|
166
161
|
},
|
|
167
162
|
})),
|
|
163
|
+
namePattern: `${repository}-${deployable}-${environment}`,
|
|
168
164
|
},
|
|
169
165
|
],
|
|
170
166
|
writeBackConfig: {
|
|
171
|
-
method: 'git:secret:argocd/argocd-github-otwld-repo-creds',
|
|
172
167
|
gitConfig: {
|
|
173
168
|
repository: githubUrl,
|
|
174
169
|
writeBackTarget: `helmvalues:./.argocd/deployables/${deployable}/${environment}/values.yaml`,
|
|
@@ -176,8 +171,13 @@ function policy(repository, githubUrl, deployable, environment, mappings) {
|
|
|
176
171
|
? { pullRequest: { github: {} } }
|
|
177
172
|
: {}),
|
|
178
173
|
},
|
|
174
|
+
method: 'git:secret:argocd/argocd-github-otwld-repo-creds',
|
|
179
175
|
},
|
|
180
176
|
},
|
|
181
177
|
};
|
|
182
178
|
}
|
|
179
|
+
function requiredLabel(value, field) {
|
|
180
|
+
assertLabel(value, field);
|
|
181
|
+
return value;
|
|
182
|
+
}
|
|
183
183
|
//# sourceMappingURL=register.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../plugins/nx/argo/src/generators/register.ts"],"names":[],"mappings":"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"}
|
package/src/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { createNodes } from './plugin.js';
|
|
2
|
-
export { default as registerGenerator } from './generators/register.js';
|
|
3
1
|
export { default as validateExecutor } from './executors/validate.js';
|
|
2
|
+
export { default as registerGenerator } from './generators/register.js';
|
|
4
3
|
export * from './names.js';
|
|
4
|
+
export { createNodes } from './plugin.js';
|
package/src/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export { createNodes } from './plugin.js';
|
|
2
|
-
export { default as registerGenerator } from './generators/register.js';
|
|
3
1
|
export { default as validateExecutor } from './executors/validate.js';
|
|
2
|
+
export { default as registerGenerator } from './generators/register.js';
|
|
4
3
|
export * from './names.js';
|
|
4
|
+
export { createNodes } from './plugin.js';
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACxE,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC"}
|
package/src/names.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare function assertLabel(value: string, field: string): void;
|
|
|
10
10
|
* @param value - Environment value to validate.
|
|
11
11
|
* @throws If the value is not staging or production.
|
|
12
12
|
*/
|
|
13
|
-
export declare function assertEnvironment(value: string): asserts value is '
|
|
13
|
+
export declare function assertEnvironment(value: string): asserts value is 'production' | 'staging';
|
|
14
14
|
/**
|
|
15
15
|
* Builds and validates the Kubernetes namespace for a deployable.
|
|
16
16
|
* @param repository - Repository identity used in the namespace.
|
package/src/plugin.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createNodesFromFiles, } from '@nx/devkit';
|
|
2
1
|
import { dirname, join, relative } from 'node:path';
|
|
2
|
+
import { createNodesFromFiles, } from '@nx/devkit';
|
|
3
3
|
/**
|
|
4
4
|
* Infers Nx deployable projects from Argo CD project configuration files.
|
|
5
5
|
* @param files - Matching project configuration files.
|
|
@@ -19,15 +19,15 @@ function createDeployableNodes(file, context) {
|
|
|
19
19
|
return {
|
|
20
20
|
projects: {
|
|
21
21
|
[root]: {
|
|
22
|
+
metadata: { targetGroups: { Argo: ['argo:validate'] } },
|
|
22
23
|
root,
|
|
23
24
|
targets: {
|
|
24
25
|
'argo:validate': {
|
|
25
|
-
executor: '@otwld/nx-argo:validate',
|
|
26
26
|
cache: true,
|
|
27
|
+
executor: '@otwld/nx-argo:validate',
|
|
27
28
|
inputs: ['{projectRoot}/**/*'],
|
|
28
29
|
},
|
|
29
30
|
},
|
|
30
|
-
metadata: { targetGroups: { Argo: ['argo:validate'] } },
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
33
|
};
|
package/src/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/argo/src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAGL,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,oCAAoC;IACpC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAChC,oBAAoB,CAClB,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,CAClC,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,EAC9C,KAAK,EACL,OAAO,EACP,OAAO,CACR;CACJ,CAAC;AACF,SAAS,qBAAqB,CAAC,IAAY,EAAE,OAA2B;IACtE,MAAM,IAAI,GAAG,QAAQ,CACnB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAC3C,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,IAAI,CAAC,EAAE;gBACN,QAAQ,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE;gBACvD,IAAI;gBACJ,OAAO,EAAE;oBACP,eAAe,EAAE;wBACf,KAAK,EAAE,IAAI;wBACX,QAAQ,EAAE,yBAAyB;wBACnC,MAAM,EAAE,CAAC,oBAAoB,CAAC;qBAC/B;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
|