@payfit/nx-core 4.15.2-beta-support-oci.0 → 4.16.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/src/executors/publisher/helm.js +1 -8
- package/dist/src/executors/publisher/helm.js.map +1 -1
- package/dist/src/executors/publisher/schema.d.ts +0 -1
- package/dist/src/executors/publisher/schema.json +0 -4
- package/dist/src/generators/init/files/.circleci/config.yml +11 -17
- package/dist/src/utils/helm.d.ts +0 -10
- package/dist/src/utils/helm.js +0 -12
- package/dist/src/utils/helm.js.map +1 -1
- package/package.json +1 -1
|
@@ -31,14 +31,7 @@ async function publishHelm(options, context, version) {
|
|
|
31
31
|
await (0, helm_1.packageHelm)(projectHelmFolder, version, destinationHelmFolder);
|
|
32
32
|
await (0, helm_1.resetTeleportProxyHelmChartFile)(projectHelmFolder, proxyData.port);
|
|
33
33
|
const chartConfig = await (0, helm_1.getHelmChartFile)(projectHelmFolder);
|
|
34
|
-
|
|
35
|
-
// If ociEcrRegistry is provided, push to ECR using OCI format
|
|
36
|
-
if (options.ociEcrRegistry) {
|
|
37
|
-
console.log(`Publishing Helm chart to OCI registry ${options.ociEcrRegistry}`);
|
|
38
|
-
return (0, helm_1.pushOciPackagedHelm)(packagedHelmChartPath, options.ociEcrRegistry);
|
|
39
|
-
}
|
|
40
|
-
// Otherwise, push to the chartmuseum as before
|
|
41
|
-
return (0, helm_1.pushPackagedHelm)(packagedHelmChartPath, options.chartRegistry, gitBranchName);
|
|
34
|
+
return (0, helm_1.pushPackagedHelm)(`${destinationHelmFolder}${chartConfig.name}-${version}.tgz`, options.chartRegistry, gitBranchName);
|
|
42
35
|
}
|
|
43
36
|
catch (e_1) {
|
|
44
37
|
env_1.error = e_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAkBA,kCA2CC;;AA7DD,8BAA6B;AAI7B,mDAAmD;AACnD,+CAAiE;AACjE,2CAQyB;AACzB,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe;;;QAMf,MAAM,iBAAiB,GAAG,QAAQ,OAAO,CAAC,WAAW,UAAU,CAAA;QAC/D,MAAM,gBAAgB,GAAG,GAAG,iBAAiB,cAAc,CAAA;QAC3D,MAAM,eAAe,GAAG,GAAG,iBAAiB,aAAa,CAAA;QACzD,MAAM,qBAAqB,GAAG,aAAa,OAAO,CAAC,WAAW,SAAS,CAAA;QACvE,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO,CAAC,WAAW,EAAE,CAC9D,CAAA;QACH,CAAC;QACD,OAAO,CAAC,GAAG,CACT,4BAA4B,OAAO,CAAC,aAAa,IAAI,aAAa,iBAAiB,OAAO,EAAE,CAC7F,CAAA;QACD,8CAA8C;QAC9C,MAAM,SAAS,0CAAG,MAAM,IAAA,gCAA0B,GAAE,QAAA,CAAA;QACpD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;QAEzB,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,oBAAa,EAAC,gBAAgB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;QAC/D,MAAM,IAAA,kBAAW,EAAC,iBAAiB,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;QACpE,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QAExE,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC7D,OAAO,IAAA,uBAAgB,EACrB,GAAG,qBAAqB,GAAG,WAAW,CAAC,IAAI,IAAI,OAAO,MAAM,EAC5D,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;;;;;;;;;CACF"}
|
|
@@ -130,37 +130,37 @@ workflows:
|
|
|
130
130
|
outputFile: github_token
|
|
131
131
|
name: github_authenticate
|
|
132
132
|
context:
|
|
133
|
-
-
|
|
133
|
+
- NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
134
134
|
- yarn:
|
|
135
|
-
context:
|
|
135
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
136
136
|
|
|
137
137
|
- lint:
|
|
138
|
-
context:
|
|
138
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
139
139
|
requires:
|
|
140
140
|
- yarn
|
|
141
141
|
|
|
142
142
|
- nx-sync:
|
|
143
|
-
context:
|
|
143
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
144
144
|
requires:
|
|
145
145
|
- yarn
|
|
146
146
|
|
|
147
147
|
- format:
|
|
148
|
-
context:
|
|
148
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
149
149
|
requires:
|
|
150
150
|
- yarn
|
|
151
151
|
|
|
152
152
|
- nx-conformance:
|
|
153
|
-
context:
|
|
153
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
154
154
|
requires:
|
|
155
155
|
- yarn
|
|
156
156
|
|
|
157
157
|
- build:
|
|
158
|
-
context:
|
|
158
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
159
159
|
requires:
|
|
160
160
|
- yarn
|
|
161
161
|
|
|
162
162
|
- test:
|
|
163
|
-
context:
|
|
163
|
+
context: NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
164
164
|
requires:
|
|
165
165
|
- yarn
|
|
166
166
|
|
|
@@ -173,9 +173,7 @@ workflows:
|
|
|
173
173
|
- test
|
|
174
174
|
- build
|
|
175
175
|
context:
|
|
176
|
-
-
|
|
177
|
-
- CORE-PLATFORM_SHARED_ENV #Contains the aws credentials to publish to ECR/S3
|
|
178
|
-
- NX_COMMON_PACKAGES # TSH config
|
|
176
|
+
- NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
179
177
|
|
|
180
178
|
- publish:
|
|
181
179
|
name: Publish Release
|
|
@@ -186,9 +184,7 @@ workflows:
|
|
|
186
184
|
- build
|
|
187
185
|
serial-group: release
|
|
188
186
|
context:
|
|
189
|
-
-
|
|
190
|
-
- CORE-PLATFORM_SHARED_ENV #Contains the aws credentials to publish to ECR/S3
|
|
191
|
-
- NX_COMMON_PACKAGES # TSH config
|
|
187
|
+
- NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
192
188
|
<% } else { %>
|
|
193
189
|
- publish:
|
|
194
190
|
name: Publish
|
|
@@ -197,7 +193,5 @@ workflows:
|
|
|
197
193
|
- test
|
|
198
194
|
- build
|
|
199
195
|
context:
|
|
200
|
-
-
|
|
201
|
-
- CORE-PLATFORM_SHARED_ENV #Contains the aws credentials to publish to ECR/S3
|
|
202
|
-
- NX_COMMON_PACKAGES # TSH config
|
|
196
|
+
- NX_COMMON_PACKAGES # TSH config / AWS credentials / NPM token
|
|
203
197
|
<% } %>
|
package/dist/src/utils/helm.d.ts
CHANGED
|
@@ -66,14 +66,4 @@ export declare function pushPackagedHelm(packagedHelmChartFilePath: string, proj
|
|
|
66
66
|
stdout: string;
|
|
67
67
|
stderr: string;
|
|
68
68
|
}>;
|
|
69
|
-
/**
|
|
70
|
-
* Push the packaged Helm chart to an OCI-compatible ECR repository
|
|
71
|
-
* @param packagedHelmChartFilePath
|
|
72
|
-
* @param ecrRegistry
|
|
73
|
-
*/
|
|
74
|
-
export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRegistry: string): Promise<{
|
|
75
|
-
success: boolean;
|
|
76
|
-
stdout: string;
|
|
77
|
-
stderr: string;
|
|
78
|
-
}>;
|
|
79
69
|
export {};
|
package/dist/src/utils/helm.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.installHelmRepo = installHelmRepo;
|
|
|
7
7
|
exports.patchImageTag = patchImageTag;
|
|
8
8
|
exports.packageHelm = packageHelm;
|
|
9
9
|
exports.pushPackagedHelm = pushPackagedHelm;
|
|
10
|
-
exports.pushOciPackagedHelm = pushOciPackagedHelm;
|
|
11
10
|
const fs = require("node:fs");
|
|
12
11
|
const process = require("node:process");
|
|
13
12
|
const YAML = require("yaml");
|
|
@@ -132,15 +131,4 @@ async function pushPackagedHelm(packagedHelmChartFilePath, projectName, branch)
|
|
|
132
131
|
const profile = (0, aws_auth_1.getProfileName)() === 'default' ? '' : `--profile ${(0, aws_auth_1.getProfileName)()}`;
|
|
133
132
|
return (0, exec_1.exec_command)(`aws s3 cp ${profile} --sse AES256 ${packagedHelmChartFilePath} s3://${process.env.CHARTMUSEUM_BUCKET_NAME}/${projectName}/${branch}/`);
|
|
134
133
|
}
|
|
135
|
-
/**
|
|
136
|
-
* Push the packaged Helm chart to an OCI-compatible ECR repository
|
|
137
|
-
* @param packagedHelmChartFilePath
|
|
138
|
-
* @param ecrRegistry
|
|
139
|
-
*/
|
|
140
|
-
async function pushOciPackagedHelm(packagedHelmChartFilePath, ecrRegistry) {
|
|
141
|
-
// Login to ECR
|
|
142
|
-
await (0, aws_auth_1.loginToEcr)();
|
|
143
|
-
// Push the Helm chart to ECR using OCI format
|
|
144
|
-
return (0, exec_1.exec_command)(`helm push ${packagedHelmChartFilePath} oci://${ecrRegistry}`);
|
|
145
|
-
}
|
|
146
134
|
//# sourceMappingURL=helm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":";;AA6BA,4CAIC;AAOD,0EAaC;AAOD,0EAUC;AAMD,0CA4BC;AAQD,sCA8CC;AAQD,kCAQC;AAQD,4CAaC;
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":"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"}
|