add tests for error case in NormalizeUrl

Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
fluxcd · Feb 6, 2023 · e2384c4 · e2384c4
1 parent 6ecd349
commit e2384c4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -1187,7 +1187,7 @@ func (r *HelmChartReconciler) indexHelmRepositoryByURL(o client.Object) []string
 		panic(fmt.Sprintf("Expected a HelmRepository, got %T", o))
 	}
 	u, err := repository.NormalizeURL(repo.Spec.URL)
-	if u != "" && err != nil {
+	if u != "" && err == nil {
 		return []string{u}
 	}
 	return nil

diff --git a/internal/helm/chart/dependency_manager.go b/internal/helm/chart/dependency_manager.go
@@ -268,7 +268,7 @@ func (dm *DependencyManager) resolveRepository(url string) (repo repository.Down
 
 	nUrl, err := repository.NormalizeURL(url)
 	if err != nil {
-		return nil, err
+		return
 	}
 	err = repository.ValidateDepURL(nUrl)
 	if err != nil {

diff --git a/internal/helm/repository/utils.go b/internal/helm/repository/utils.go
@@ -37,6 +37,9 @@ var (
 
 // NormalizeURL normalizes a ChartRepository URL by its scheme.
 func NormalizeURL(repositoryURL string) (string, error) {
+	if repositoryURL == "" {
+		return "", nil
+	}
 	u, err := url.Parse(repositoryURL)
 	if err != nil {
 		return "", err

diff --git a/internal/helm/repository/utils_test.go b/internal/helm/repository/utils_test.go
@@ -24,9 +24,10 @@ import (
 
 func TestNormalizeURL(t *testing.T) {
 	tests := []struct {
-		name string
-		url  string
-		want string
+		name    string
+		url     string
+		want    string
+		wantErr bool
 	}{
 		{
 			name: "with slash",
@@ -63,12 +64,27 @@ func TestNormalizeURL(t *testing.T) {
 			url:  "http://example.com/?st=pr",
 			want: "http://example.com/?st=pr",
 		},
+		{
+			name: "empty url",
+			url:  "",
+			want: "",
+		},
+		{
+			name:    "bad url",
+			url:     "://badurl.",
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
 			got, err := NormalizeURL(tt.url)
+			if tt.wantErr {
+				g.Expect(err).To(HaveOccurred())
+				return
+			}
+
 			g.Expect(err).To(Not(HaveOccurred()))
 			g.Expect(got).To(Equal(tt.want))
 		})