Skip to content

Commit 686f354

Browse files
committed
fix: ChartMuseum auth failure - use shell substitution for string param
The `chartMuseumUsername` parameter is a `string` type in Dagger, but was passed as `env:CHARTMUSEUM_USERNAME` in CI. The `env:` prefix only works for `Secret` type parameters - for strings, it's passed literally, causing the curl command to use "env:CHARTMUSEUM_USERNAME" as the username instead of the actual value. Changed to shell variable substitution `$CHARTMUSEUM_USERNAME`. Also quotes curl auth variables and updates renovate test import paths. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 76e3eb5 commit 686f354

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.dagger/src/homelab-ci-steps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export async function homelabHelmPublishBuilt(
250250
.withExec([
251251
"sh",
252252
"-c",
253-
String.raw`curl -s -w '\n%{http_code}' -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD --data-binary @${chartFile} ${repo}/api/charts > /tmp/result.txt 2>&1`,
253+
String.raw`curl -s -w '\n%{http_code}' -u "$CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD" --data-binary @${chartFile} ${repo}/api/charts > /tmp/result.txt 2>&1`,
254254
]);
255255

256256
const result = await container.file("/tmp/result.txt").contents();

.dagger/test/homelab-test-renovate-regex.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env -S bun
22

33
import { z } from "zod";
4-
import cdk8sVersions from "@homelab/cdk8s/src/versions";
5-
import daggerVersions from "../src/lib/versions.ts";
4+
import cdk8sVersions from "../../packages/homelab/src/cdk8s/src/versions";
5+
import daggerVersions from "../src/lib-versions.ts";
66

77
/**
88
* Test script to validate that versions.ts files have properly formatted
@@ -176,9 +176,9 @@ async function parseVersionsFile(
176176

177177
function getVersionsObject(filePath: string): Record<string, string> {
178178
// Use static imports to get the versions object
179-
if (filePath === "src/cdk8s/src/versions.ts") {
179+
if (filePath === "packages/homelab/src/cdk8s/src/versions.ts") {
180180
return cdk8sVersions;
181-
} else if (filePath === ".dagger/src/versions.ts") {
181+
} else if (filePath === ".dagger/src/lib-versions.ts") {
182182
return daggerVersions;
183183
} else {
184184
throw new Error(`Unknown versions file: ${filePath}`);
@@ -200,7 +200,7 @@ async function main() {
200200
const renovateRegexes = await getRenovateRegexes();
201201
console.log(`📋 Using ${String(renovateRegexes.length)} regex pattern(s)`);
202202

203-
const versionFiles = ["src/cdk8s/src/versions.ts", ".dagger/src/versions.ts"];
203+
const versionFiles = ["packages/homelab/src/cdk8s/src/versions.ts", ".dagger/src/lib-versions.ts"];
204204

205205
let totalErrors = 0;
206206
let totalWarnings = 0;

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
--registry-password=env:GITHUB_TOKEN
152152
--commit-back-token=env:GITHUB_TOKEN
153153
--argocd-token=env:ARGOCD_TOKEN
154-
--chart-museum-username=env:CHARTMUSEUM_USERNAME
154+
--chart-museum-username="$CHARTMUSEUM_USERNAME"
155155
--chart-museum-password=env:CHARTMUSEUM_PASSWORD
156156
--cloudflare-api-token=env:CLOUDFLARE_API_TOKEN
157157
--cloudflare-account-id=env:CLOUDFLARE_ACCOUNT_ID

0 commit comments

Comments
 (0)