[BUGFIX] Allow absolute filepaths for resolving catalog config (#1128)

* Add absolute filepath check in uri checker

Signed-off-by: Ish Shah <[email protected]>

* Add docs/notes for future maintaining

Signed-off-by: Ish Shah <[email protected]>

* add abs path tests

Signed-off-by: Ish Shah <[email protected]>

* fix path

Signed-off-by: Ish Shah <[email protected]>

* fix error string

Signed-off-by: Ish Shah <[email protected]>

* abs path test cleared

Signed-off-by: Ish Shah <[email protected]>

* add failure test

Signed-off-by: Ish Shah <[email protected]>

* add error msg

Signed-off-by: Ish Shah <[email protected]>

* add should error

Signed-off-by: Ish Shah <[email protected]>

* remove redundant tests

Signed-off-by: Ish Shah <[email protected]>

* comment nit

---------

Signed-off-by: Ish Shah <[email protected]>

Author: Ish Shah

alpha/template/composite/composite.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 
 	"github.com/operator-framework/operator-registry/pkg/image"
 	"k8s.io/apimachinery/pkg/util/yaml"
@@ -85,15 +86,21 @@ type HttpGetter interface {
 // FetchCatalogConfig will fetch the catalog configuration file from the given path.
 // The path can be a local file path OR a URL that returns the raw contents of the catalog
 // configuration file.
+// The filepath can be structured relative or as an absolute path
 func FetchCatalogConfig(path string, httpGetter HttpGetter) (io.ReadCloser, error) {
 	var tempCatalog io.ReadCloser
 	catalogURI, err := url.ParseRequestURI(path)
-	if err != nil {
+	// Evalute local catalog config
+	// URI parse will fail on relative filepaths
+	// Check if path is an absolute filepath
+	if err != nil || filepath.IsAbs(path) {
 		tempCatalog, err = os.Open(path)
 		if err != nil {
 			return nil, fmt.Errorf("opening catalog config file %q: %v", path, err)
 		}
 	} else {
+		// Evalute remote catalog config
+		// If URi is valid, execute fetch
 		tempResp, err := httpGetter.Get(catalogURI.String())
 		if err != nil {
 			return nil, fmt.Errorf("fetching remote catalog config file %q: %v", path, err)

alpha/template/composite/composite_test.go

@@ -540,6 +540,8 @@ func TestFetchCatalogConfig(t *testing.T) {
 		assertions func(t *testing.T, rc io.ReadCloser, err error)
 	}
 
+	testDir := t.TempDir()
+
 	testCases := []testCase{
 		{
 			name: "Successful HTTP fetch",
@@ -569,7 +571,8 @@ func TestFetchCatalogConfig(t *testing.T) {
 			name: "Successful file fetch",
 			path: "file/test.yaml",
 			fakeGetter: &fakeGetter{
-				catalog: validCatalog,
+				catalog:     validCatalog,
+				shouldError: true,
 			},
 			createFile: true,
 			assertions: func(t *testing.T, rc io.ReadCloser, err error) {
@@ -591,8 +594,6 @@ func TestFetchCatalogConfig(t *testing.T) {
 		},
 	}
 
-	testDir := t.TempDir()
-
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			filepath := tc.path