Add Support for Fetching Remote Catalog (#1079)

* Re-add logic for switching request

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

* string issues

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

* add read after err check

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

* change error outs

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

---------

Signed-off-by: Ish Shah <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 49eae7b7fac9ad7d6dd80ffbdd5266eef9feef21

Author: Ish Shah

pkg/manifests/csv.yaml

@@ -5,7 +5,7 @@ metadata:
   name: packageserver
   namespace: openshift-operator-lifecycle-manager
   labels:
-    olm.version: 0.0.0-f3b167a3bb800ebdc8c1d773daa8731f1015f04a
+    olm.version: 0.0.0-666c803e5f2685fe7b88a32defc86168ce759ccd
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
                                 - packageserver
                         topologyKey: "kubernetes.io/hostname"
   maturity: alpha
-  version: 0.0.0-f3b167a3bb800ebdc8c1d773daa8731f1015f04a
+  version: 0.0.0-666c803e5f2685fe7b88a32defc86168ce759ccd
   apiservicedefinitions:
     owned:
       - group: packages.operators.coreos.com

staging/operator-registry/cmd/opm/alpha/template/composite.go

@@ -3,7 +3,10 @@ package template
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"log"
+	"net/http"
+	"net/url"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -31,23 +34,35 @@ and a 'composite template' file`,
 		Args: cobra.MaximumNArgs(0),
 		Run: func(cmd *cobra.Command, args []string) {
 			containerTool = "docker"
-			catalogData, err := os.Open(catalogFile)
+			var tempCatalog io.ReadCloser
+			catalogURI, err := url.ParseRequestURI(catalogFile)
 			if err != nil {
-				log.Fatalf("opening catalog config file %q: %s", catalogFile, err)
+				tempCatalog, err = os.Open(catalogFile)
+				if err != nil {
+					log.Fatalf("opening catalog config file %q: %v", catalogFile, err)
+				}
+				defer tempCatalog.Close()
+			} else {
+				tempResp, err := http.Get(catalogURI.String())
+				if err != nil {
+					log.Fatalf("fetching remote catalog config file %q: %v", catalogFile, err)
+				}
+				tempCatalog = tempResp.Body
+				defer tempCatalog.Close()
 			}
-			defer catalogData.Close()
+			catalogData := tempCatalog
 
 			// get catalog configurations
 			catalogConfig := &composite.CatalogConfig{}
 			catalogDoc := json.RawMessage{}
 			catalogDecoder := yaml.NewYAMLOrJSONDecoder(catalogData, 4096)
 			err = catalogDecoder.Decode(&catalogDoc)
 			if err != nil {
-				log.Fatalf("decoding catalog config: %s", err)
+				log.Fatalf("decoding catalog config: %v", err)
 			}
 			err = json.Unmarshal(catalogDoc, catalogConfig)
 			if err != nil {
-				log.Fatalf("unmarshalling catalog config: %s", err)
+				log.Fatalf("unmarshalling catalog config: %v", err)
 			}
 
 			if catalogConfig.Schema != composite.CatalogSchema {
@@ -58,7 +73,7 @@ and a 'composite template' file`,
 
 			wd, err := os.Getwd()
 			if err != nil {
-				log.Fatalf("getting current working directory: %s", err)
+				log.Fatalf("getting current working directory: %v", err)
 			}
 
 			// setup the builders for each catalog
@@ -95,7 +110,7 @@ and a 'composite template' file`,
 							InputDirectory: wd,
 						})
 						if err != nil {
-							log.Fatalf("getting builder %q for catalog %q: %s", schema, catalog.Name, err)
+							log.Fatalf("getting builder %q for catalog %q: %v", schema, catalog.Name, err)
 						}
 						builderMap[schema] = builder
 					}
@@ -108,9 +123,9 @@ and a 'composite template' file`,
 				//build the error message
 				var errMsg string
 				for cat, errs := range setupErrors {
-					errMsg += fmt.Sprintf("\nCatalog %s:\n", cat)
+					errMsg += fmt.Sprintf("\nCatalog %v:\n", cat)
 					for _, err := range errs {
-						errMsg += fmt.Sprintf("  - %s\n", err)
+						errMsg += fmt.Sprintf("  - %v\n", err)
 					}
 				}
 				log.Fatalf("catalog configuration file field validation failed: %s", errMsg)
@@ -128,7 +143,7 @@ and a 'composite template' file`,
 
 			compositeData, err := os.Open(compositeFile)
 			if err != nil {
-				log.Fatalf("opening composite config file %q: %s", compositeFile, err)
+				log.Fatalf("opening composite config file %q: %v", compositeFile, err)
 			}
 			defer compositeData.Close()
 
@@ -138,11 +153,11 @@ and a 'composite template' file`,
 			compositeDecoder := yaml.NewYAMLOrJSONDecoder(compositeData, 4096)
 			err = compositeDecoder.Decode(&compositeDoc)
 			if err != nil {
-				log.Fatalf("decoding composite config: %s", err)
+				log.Fatalf("decoding composite config: %v", err)
 			}
 			err = json.Unmarshal(compositeDoc, compositeConfig)
 			if err != nil {
-				log.Fatalf("unmarshalling composite config: %s", err)
+				log.Fatalf("unmarshalling composite config: %v", err)
 			}
 
 			if compositeConfig.Schema != composite.CompositeSchema {
@@ -151,7 +166,7 @@ and a 'composite template' file`,
 
 			err = template.Render(cmd.Context(), compositeConfig, validate)
 			if err != nil {
-				log.Fatalf("rendering the composite template: %s", err)
+				log.Fatalf("rendering the composite template: %v", err)
 			}
 		},
 	}