Set tektonhub as the default catalog type for custom Hub URLs

When a custom hub URL is configured, default the catalog type to
TektonHubType instead of ArtifactHubType.

Signed-off-by: Shiv Verma <[email protected]>

Author: pratap0007

pkg/params/settings/default.go

@@ -19,7 +19,11 @@ func getHubCatalogs(logger *zap.SugaredLogger, catalogs *sync.Map, config map[st
 	}
 
 	if hubType, ok := config[HubCatalogTypeKey]; !ok || hubType == "" {
-		config[HubCatalogTypeKey] = hubtypes.ArtifactHubType
+		if hubURL, ok := config[HubURLKey]; !ok || hubURL != ArtifactHubURLDefaultValue {
+			config[HubCatalogTypeKey] = hubtypes.TektonHubType
+		} else {
+			config[HubCatalogTypeKey] = hubtypes.ArtifactHubType
+		}
 	} else if hubType != hubtypes.ArtifactHubType && hubType != hubtypes.TektonHubType {
 		logger.Warnf("CONFIG: invalid hub type %s, defaulting to %s", hubType, hubtypes.ArtifactHubType)
 		config[HubCatalogTypeKey] = hubtypes.ArtifactHubType

pkg/params/settings/default_test.go

@@ -4,6 +4,7 @@ import (
 	"sync"
 	"testing"
 
+	hubtypes "github.com/openshift-pipelines/pipelines-as-code/pkg/hub/vars"
 	"go.uber.org/zap"
 	zapobserver "go.uber.org/zap/zaptest/observer"
 	"gotest.tools/v3/assert"
@@ -18,11 +19,12 @@ func TestGetCatalogHub(t *testing.T) {
 		Name:  "tekton",
 	})
 	tests := []struct {
-		name        string
-		config      map[string]string
-		numCatalogs int
-		wantLog     string
-		hubCatalogs *sync.Map
+		name            string
+		config          map[string]string
+		numCatalogs     int
+		wantLog         string
+		hubCatalogs     *sync.Map
+		wantDefaultType string
 	}{
 		{
 			name:        "good/default catalog",
@@ -141,6 +143,15 @@ func TestGetCatalogHub(t *testing.T) {
 			hubCatalogs: &sync.Map{},
 			wantLog:     `CONFIG: invalid hub type invalid, defaulting to artifacthub`,
 		},
+		{
+			name: "custom hub URL defaults to TektonHubType",
+			config: map[string]string{
+				HubURLKey: "https://custom-tekton-hub.example.com",
+			},
+			numCatalogs:     1,
+			hubCatalogs:     &sync.Map{},
+			wantDefaultType: hubtypes.TektonHubType,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -159,6 +170,13 @@ func TestGetCatalogHub(t *testing.T) {
 			if tt.wantLog != "" {
 				assert.Assert(t, len(catcher.FilterMessageSnippet(tt.wantLog).TakeAll()) > 0, "could not find log message: got ", catcher)
 			}
+			if tt.wantDefaultType != "" {
+				value, ok := catalogs.Load("default")
+				assert.Assert(t, ok, "default catalog should exist")
+				defaultCatalog, ok := value.(HubCatalog)
+				assert.Assert(t, ok, "default catalog should be HubCatalog type")
+				assert.Equal(t, defaultCatalog.Type, tt.wantDefaultType)
+			}
 			cmp.Equal(catalogs, tt.hubCatalogs)
 		})
 	}