From 0c1fca8f32930c6caffcf0e5cd4dedce363c7bfd Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 28 Apr 2023 10:07:25 +0800
Subject: [PATCH] fix tests

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 pkg/state/helmx.go                            |  6 +---
 pkg/state/state_gogetter_test.go              | 28 +++++++++++++++++++
 .../go_getter_support_ad_hoc/config.yaml      |  3 ++
 .../go_getter_support_ad_hoc/input.yaml       | 18 ++++++++++++
 .../go_getter_support_ad_hoc/output.yaml      |  0
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/config.yaml
 create mode 100644 test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/input.yaml
 create mode 100644 test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/output.yaml

diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go
index 8d733422..a2991e49 100644
--- a/pkg/state/helmx.go
+++ b/pkg/state/helmx.go
@@ -67,7 +67,7 @@ func (st *HelmState) goGetterChart(chart, dir, cacheDir string, force bool) (str
 	}
 
 	if filepath.IsAbs(chart) || strings.HasPrefix(chart, ".") {
-		return chart, fmt.Errorf("chart path %q not found", chart)
+		return "", fmt.Errorf("chart path %s not found", chart)
 	}
 
 	if strings.HasPrefix(chart, "oci://") {
@@ -136,10 +136,6 @@ func (st *HelmState) PrepareChartify(helm helmexec.Interface, release *ReleaseSp
 			}
 		}
 
-		if filepath.IsAbs(dependenceChart) {
-			dependenceChart = fmt.Sprintf("file://%s", dependenceChart)
-		}
-
 		c.Opts.AdhocChartDependencies = append(c.Opts.AdhocChartDependencies, chartify.ChartDependency{
 			Alias:   d.Alias,
 			Chart:   dependenceChart,
diff --git a/pkg/state/state_gogetter_test.go b/pkg/state/state_gogetter_test.go
index 0a1e32b4..b0faea81 100644
--- a/pkg/state/state_gogetter_test.go
+++ b/pkg/state/state_gogetter_test.go
@@ -28,6 +28,34 @@ func TestGoGetter(t *testing.T) {
 			out:   "raw/incubator",
 			err:   "",
 		},
+		{
+			chart: "oci://my-oci-registry/helm-repo/envoy",
+			dir:   "",
+			force: false,
+			out:   "oci://my-oci-registry/helm-repo/envoy",
+			err:   "",
+		},
+		{
+			chart: "testdata",
+			dir:   "",
+			force: false,
+			out:   "testdata",
+			err:   "",
+		},
+		{
+			chart: "./testdata",
+			dir:   "",
+			force: false,
+			out:   "./testdata",
+			err:   "",
+		},
+		{
+			chart: "./noexist",
+			dir:   "",
+			force: false,
+			out:   "",
+			err:   "chart path ./noexist not found",
+		},
 	}
 
 	for i, tc := range testcases {
diff --git a/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/config.yaml b/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/config.yaml
new file mode 100644
index 00000000..96355c65
--- /dev/null
+++ b/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/config.yaml
@@ -0,0 +1,3 @@
+helmfileArgs:
+- template
+- --concurrency=1
diff --git a/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/input.yaml b/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/input.yaml
new file mode 100644
index 00000000..878c08c0
--- /dev/null
+++ b/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/input.yaml
@@ -0,0 +1,18 @@
+helmDefaults:
+  wait: false
+  cleanupOnFail: true
+  createNamespace: true
+
+repositories:
+  - name: prometheus-community
+    url: https://prometheus-community.github.io/helm-charts
+
+releases:
+  - name: kube-prometheus-stack
+    namespace: monitoring
+    chart: prometheus-community/kube-prometheus-stack
+    version: 45.17.0
+    disableValidationOnInstall: true
+    dependencies:
+      - chart: "git::https://github.com/goharbor/harbor-helm.git@" 
+        version: 0.64.1
\ No newline at end of file
diff --git a/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/go_getter_support_ad_hoc/output.yaml
new file mode 100644
index 00000000..e69de29b