Skip to content

Add Support for Fetching Remote Catalog #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 28, 2023
Merged

Add Support for Fetching Remote Catalog #1079

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e906690
Re-add logic for switching request
Mar 22, 2023
c871c48
string issues
Mar 22, 2023
f425478
add read after err check
Mar 24, 2023
4a2cf85
change error outs
Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions cmd/opm/alpha/template/composite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package template
import (
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"net/url"
"os"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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
}
Expand All @@ -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)
Expand All @@ -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()

Expand All @@ -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 {
Expand All @@ -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)
}
},
}
Expand Down