From 1ebeba01a7f9b6116bda739fedd41ce9f45c3add Mon Sep 17 00:00:00 2001 From: yxxhero Date: Mon, 16 Mar 2026 08:53:32 +0800 Subject: [PATCH] fix more test Signed-off-by: yxxhero --- pkg/app/app_list_test.go | 8 ++++---- pkg/state/chart_dependency.go | 9 +++++++-- pkg/state/state_test.go | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkg/app/app_list_test.go b/pkg/app/app_list_test.go index 5f0838c9..acf4e342 100644 --- a/pkg/app/app_list_test.go +++ b/pkg/app/app_list_test.go @@ -385,8 +385,8 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 17.0.7 - digest: sha256:abc123 - generated: "2024-01-01T00:00:00Z" +digest: sha256:abc123 +generated: "2024-01-01T00:00:00Z" `, "/path/to/helmfile.d/second.yaml": ` repositories: @@ -404,8 +404,8 @@ dependencies: - name: nginx repository: https://charts.bitnami.com/bitnami version: 15.0.0 - digest: sha256:def456 - generated: "2024-01-01T00:00:00Z" +digest: sha256:def456 +generated: "2024-01-01T00:00:00Z" `, } diff --git a/pkg/state/chart_dependency.go b/pkg/state/chart_dependency.go index 8e4b83d6..60101c8a 100644 --- a/pkg/state/chart_dependency.go +++ b/pkg/state/chart_dependency.go @@ -265,8 +265,13 @@ func getUnresolvedDependenciess(st *HelmState) (string, *UnresolvedDependencies) func updateDependencies(st *HelmState, shell helmexec.DependencyUpdater, unresolved *UnresolvedDependencies, filename, wd string) (*HelmState, error) { lockFile := st.LockFile - if lockFile != "" && st.basePath != "" && !filepath.IsAbs(lockFile) { - lockFile = filepath.Join(st.basePath, lockFile) + switch { + case lockFile != "": + if st.basePath != "" && !filepath.IsAbs(lockFile) { + lockFile = filepath.Join(st.basePath, lockFile) + } + case st.basePath != "": + lockFile = filepath.Join(st.basePath, filename+".lock") } depMan := NewChartDependencyManager(filename, st.logger, lockFile) diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index f339b624..51976dea 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -2548,10 +2548,10 @@ generated: 2019-05-16T15:42:45.50486+09:00 } logger := helmexec.NewLogger(io.Discard, "debug") - basePath := "/src" + basePath := t.TempDir() state := &HelmState{ basePath: basePath, - FilePath: "/src/helmfile.yaml", + FilePath: filepath.Join(basePath, "helmfile.yaml"), ReleaseSetSpec: ReleaseSetSpec{ Releases: []ReleaseSpec{ { @@ -2584,8 +2584,8 @@ generated: 2019-05-16T15:42:45.50486+09:00 } fs := testhelper.NewTestFs(map[string]string{ - "/example/Chart.yaml": `foo: FOO`, - "/src/example/Chart.yaml": `foo: FOO`, + "/example/Chart.yaml": `foo: FOO`, + filepath.Join(basePath, "example/Chart.yaml"): `foo: FOO`, }) fs.Cwd = basePath state = injectFs(state, fs)