public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix tests 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2024-02-11 14:32:17 +08:00
parent ff48be2534
commit 4cfe522f4f
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/remote/remote.go
View File

@ -262,9 +262,9 @@ func (r *Remote) Fetch(path string, cacheDirOpt ...string) (string, error) {
if !cached { if !cached {
var getterSrc string var getterSrc string
if u.User != "" { if u.User != "" {
getterSrc = fmt.Sprintf("%s://%s@%s%s", u.Scheme, u.User, u.Host, u.Dir) getterSrc = fmt.Sprintf("%s://%s@%s/%s", u.Scheme, u.User, u.Host, u.Dir)
} else { } else {
getterSrc = fmt.Sprintf("%s://%s%s", u.Scheme, u.Host, u.Dir) getterSrc = fmt.Sprintf("%s://%s/%s", u.Scheme, u.Host, u.Dir)
} }
if len(query) > 0 { if len(query) > 0 {

11
pkg/remote/remote_test.go
View File

@ -94,7 +94,7 @@ func TestRemote_SShGitHub(t *testing.T) {
CacheDir(): "", CacheDir(): "",
} }
cachefs := map[string]string{ cachefs := map[string]string{
filepath.Join(CacheDir(), "ssh_github_com_cloudposse_helmfiles_git.ref=0.40.0/origin/releases/kiam.yaml"): "foo: bar", filepath.Join(CacheDir(), "ssh_github_com_helmfile_helmfiles_git.ref=0.40.0/origin/releases/kiam.yaml"): "foo: bar",
} }
testcases := []struct { testcases := []struct {
@ -143,7 +143,7 @@ func TestRemote_SShGitHub(t *testing.T) {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
expectedFile := filepath.Join(CacheDir(), "ssh_github_com_cloudposse_helmfiles_git.ref=0.40.0/origin/releases/kiam.yaml") expectedFile := filepath.Join(CacheDir(), "ssh_github_com_helmfile_helmfiles_git.ref=0.40.0/origin/releases/kiam.yaml")
if file != expectedFile { if file != expectedFile {
t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile) t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile)
} }
@ -163,7 +163,7 @@ func TestRemote_SShGitHub_WithSshKey(t *testing.T) {
CacheDir(): "", CacheDir(): "",
} }
cachefs := map[string]string{ cachefs := map[string]string{
filepath.Join(CacheDir(), "ssh_github_com_cloudposse_helmfiles_git.ref=0.40.0_sshkey=redacted/origin/releases/kiam.yaml"): "foo: bar", filepath.Join(CacheDir(), "ssh_github_com_helmfile_helmfiles_git.ref=0.40.0_sshkey=redacted/origin/releases/kiam.yaml"): "foo: bar",
} }
testcases := []struct { testcases := []struct {
@ -212,7 +212,7 @@ func TestRemote_SShGitHub_WithSshKey(t *testing.T) {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
expectedFile := filepath.Join(CacheDir(), "ssh_github_com_cloudposse_helmfiles_git.ref=0.40.0_sshkey=redacted/origin/releases/kiam.yaml") expectedFile := filepath.Join(CacheDir(), "ssh_github_com_helmfile_helmfiles_git.ref=0.40.0_sshkey=redacted/origin/releases/kiam.yaml")
if file != expectedFile { if file != expectedFile {
t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile) t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile)
} }
@ -281,7 +281,7 @@ func TestRemote_S3(t *testing.T) {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
expectedFile := filepath.Join(CacheDir(), "s3_helm-s3-values-example/subdir/values.yaml") expectedFile := filepath.Join(CacheDir(), "s3_helm-s3-values-example/subdir/origin/values.yaml")
if file != expectedFile { if file != expectedFile {
t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile) t.Errorf("unexpected file located: %s vs expected: %s", file, expectedFile)
} }
@ -321,7 +321,6 @@ func TestParse(t *testing.T) {
dir: "/stakater/Forecastle.git", dir: "/stakater/Forecastle.git",
file: "deployments/kubernetes/chart/forecastle", file: "deployments/kubernetes/chart/forecastle",
query: "ref=v1.0.54", query: "ref=v1.0.54",
user: "user:password",
}, },
{ {
name: "remote path with full args", name: "remote path with full args",