Fix golang ci linting issues

Signed-off-by: Edmund Ochieng <ochienged@gmail.com>

Author: OchiengEd

internal/shared/util/helm/chart.go

@@ -14,56 +14,71 @@ import (
 	"helm.sh/helm/v3/pkg/registry"
 )
 
-func IsChart(ctx context.Context, chartUri string) (chart, oci bool, err error) {
-	addr, err := url.Parse(chartUri)
+type HelmCheckResponse struct {
+	// Chart returns true if helm chart
+	Chart bool
+	// Oci returns true if resource is stored
+	// in an OCI registry
+	Oci bool
+}
+
+func IsChart(ctx context.Context, chartURI string) (HelmCheckResponse, error) {
+	addr, err := url.Parse(chartURI)
 	if err != nil {
-		return chart, oci, err
+		return HelmCheckResponse{}, err
 	}
 
 	if addr.Scheme != "" {
 		if !strings.HasPrefix(addr.Scheme, "http") {
-			err = fmt.Errorf("unexpected Url scheme; %s\n", addr.Scheme)
-			return
+			return HelmCheckResponse{}, fmt.Errorf("unexpected scheme; %s", addr.Scheme)
 		}
 
-		oci = false
 		helmchart, err := validateHelmChart(addr.String())
 		if err != nil {
-			chart = false
-			return chart, oci, err
+			return HelmCheckResponse{}, err
 		}
 
 		if helmchart != nil &&
 			helmchart.Metadata != nil &&
 			helmchart.Metadata.Name != "" {
-			chart = true
+			return HelmCheckResponse{
+				Chart: true,
+				Oci:   false,
+			}, err
 		}
-
-		return chart, oci, err
 	}
 
 	ociRe := regexp.MustCompile("^(?P<host>[a-zA-Z0-9-_.:]+)([/]?)(?P<org>[a-zA-Z0-9-_/]+)?([/](?P<chart>[a-zA-Z0-9-_.:@]+))$")
-	if ociRe.MatchString(chartUri) {
-		oci = true
+	if !ociRe.MatchString(chartURI) {
+		return HelmCheckResponse{
+			Chart: false,
+			Oci:   false,
+		}, fmt.Errorf("does not conform to OCI url format")
+	}
 
-		chart, err = helmOciCheck(ctx, chartUri)
-		if err != nil {
-			return chart, oci, err
-		}
+	ociCheck, err := helmOciCheck(ctx, chartURI)
+	if err != nil {
+		return HelmCheckResponse{
+			Chart: false,
+			Oci:   true,
+		}, err
 	}
 
-	return
+	return HelmCheckResponse{
+		Chart: ociCheck,
+		Oci:   true,
+	}, nil
 }
 
-// helmOciCheck() pull a helm chart using the provided chartUri from an
+// helmOciCheck() pull a helm chart using the provided chartURI from an
 // OCI registiry and inspects its media type to determine if a Helm chart
-func helmOciCheck(ctx context.Context, chartUri string) (bool, error) {
+func helmOciCheck(_ context.Context, chartURI string) (bool, error) {
 	helmclient, err := registry.NewClient()
 	if err != nil {
 		return false, err
 	}
 
-	summary, err := helmclient.Pull(chartUri,
+	summary, err := helmclient.Pull(chartURI,
 		registry.PullOptWithProv(false),
 		registry.PullOptWithChart(true),
 		registry.PullOptIgnoreMissingProv(true),
@@ -75,9 +90,14 @@ func helmOciCheck(ctx context.Context, chartUri string) (bool, error) {
 	return summary != nil && summary.Ref != "", nil
 }
 
-func validateHelmChart(chartUri string) (*chart.Chart, error) {
+func validateHelmChart(chartURI string) (*chart.Chart, error) {
 	// Download helm chart from HTTP
-	resp, err := http.Get(chartUri)
+	req, err := http.NewRequest(http.MethodGet, chartURI, nil)
+	if err != nil {
+		return nil, fmt.Errorf("creating request failed; %w", err)
+	}
+
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("loading URL failed; %w", err)
 	}

internal/shared/util/helm/chart_test.go

@@ -4,8 +4,9 @@ import (
 	"context"
 	"testing"
 
-	helmutils "github.com/operator-framework/operator-controller/internal/shared/util/helm"
 	"github.com/stretchr/testify/assert"
+
+	helmutils "github.com/operator-framework/operator-controller/internal/shared/util/helm"
 )
 
 func TestIsChart(t *testing.T) {
@@ -78,12 +79,12 @@ func TestIsChart(t *testing.T) {
 
 	for _, tc := range tt {
 		t.Run(tc.name, func(t *testing.T) {
-			chart, oci, err := helmutils.IsChart(context.Background(), tc.url)
-			assert.Equal(t, oci, tc.want.Oci)
-			assert.Equal(t, chart, tc.want.Chart)
+			response, err := helmutils.IsChart(context.Background(), tc.url)
+			assert.Equal(t, response.Oci, tc.want.Oci)
+			assert.Equal(t, response.Chart, tc.want.Chart)
 
 			if testing.Verbose() {
-				t.Logf("IsChart() is verifying if %s is a helm chart.\n The result should be %t but, got %t\n", tc.url, chart, tc.want.Chart)
+				t.Logf("IsChart() is checking if %s is a helm chart.\n", tc.url)
 			}
 
 			if !tc.wantErr {