Skip to content

Commit e94fddd

Browse files
everettraveneverettraven
committed
minimally update entitysources, optimize catalogmetadata/client.Client
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
1 parent f6d1bc3 commit e94fddd

File tree

2 files changed

+109
-63
lines changed

2 files changed

+109
-63
lines changed

‎internal/catalogmetadata/client/client.go‎

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ import (
1313
"github.com/operator-framework/operator-controller/internal/catalogmetadata"
1414
)
1515

16+
// TODO: When a catalogd release containing https://github.com/operator-framework/catalogd/pull/168
17+
// is made this can be removed in favor of parsing `Catalog.Status` for the
18+
// appropriate URL for fetching catalog contents.
19+
const catalogdOnClusterBaseURL = "http://catalogd-catalogserver.catalogd-system.svc"
20+
const catalogdOnClusterURLTemplate = "%s/catalogs/%s/all.json"
21+
1622
type ClientOpt func(c *Client)
1723

1824
func WithBaseURL(baseURL string) ClientOpt {
@@ -40,11 +46,15 @@ type Client struct {
4046
// instead of kube API server. We will need to swap this implementation.
4147
cl client.Client
4248

49+
// baseURL is the base URL used by the client when making a request
50+
// to the catalogd HTTP server. When using NewClient() this defaults
51+
// to http://catalogd-catalogserver.catalogd-system.svc
52+
// TODO: When a catalogd release containing https://github.com/operator-framework/catalogd/pull/168
53+
// is made this can be removed in favor of parsing `Catalog.Status` for the
54+
// appropriate URL for fetching catalog contents.
4355
baseURL string
4456
}
4557

46-
const catalogdOnClusterBaseURL = "http://catalogd-catalogserver.catalogd-system.svc"
47-
4858
func (c *Client) Bundles(ctx context.Context) ([]*catalogmetadata.Bundle, error) {
4959
var allBundles []*catalogmetadata.Bundle
5060

@@ -53,62 +63,58 @@ func (c *Client) Bundles(ctx context.Context) ([]*catalogmetadata.Bundle, error)
5363
return nil, err
5464
}
5565
for _, catalog := range catalogList.Items {
56-
channels, err := fetchCatalogMetadata[catalogmetadata.Channel](ctx, c.baseURL, catalog.Name, declcfg.SchemaChannel)
57-
if err != nil {
58-
return nil, err
59-
}
66+
channels := []*catalogmetadata.Channel{}
67+
bundles := []*catalogmetadata.Bundle{}
6068

61-
bundles, err := fetchCatalogMetadata[catalogmetadata.Bundle](ctx, c.baseURL, catalog.Name, declcfg.SchemaBundle)
69+
// TODO: When a catalogd release containing https://github.com/operator-framework/catalogd/pull/168
70+
// is made this should be updated in favor of parsing `Catalog.Status` for the
71+
// appropriate URL for fetching catalog contents.
72+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf(catalogdOnClusterURLTemplate, c.baseURL, catalog.Name), nil)
6273
if err != nil {
63-
return nil, err
74+
return nil, fmt.Errorf("error forming request: %s", err)
6475
}
6576

66-
bundles, err = populateExtraFields(catalog.Name, channels, bundles)
77+
resp, err := http.DefaultClient.Do(req)
6778
if err != nil {
68-
return nil, err
79+
return nil, fmt.Errorf("error performing request: %s", err)
6980
}
81+
defer resp.Body.Close()
7082

71-
allBundles = append(allBundles, bundles...)
72-
}
73-
74-
return allBundles, nil
75-
}
76-
77-
const catalogdOnClusterURLTemplate = "%s/catalogs/%s/all.json"
78-
79-
func fetchCatalogMetadata[T catalogmetadata.Schemas](ctx context.Context, baseURL, catalogName, schema string) ([]*T, error) {
80-
var metadata []*T
81-
req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf(catalogdOnClusterURLTemplate, baseURL, catalogName), nil)
82-
if err != nil {
83-
return nil, fmt.Errorf("error forming request: %s", err)
84-
}
83+
err = declcfg.WalkMetasReader(resp.Body, func(meta *declcfg.Meta, err error) error {
84+
if err != nil {
85+
return err
86+
}
8587

86-
resp, err := http.DefaultClient.Do(req)
87-
if err != nil {
88-
return nil, fmt.Errorf("error performing request: %s", err)
89-
}
90-
defer resp.Body.Close()
88+
switch meta.Schema {
89+
case declcfg.SchemaChannel:
90+
content, err := catalogmetadata.Unmarshal[catalogmetadata.Channel](meta)
91+
if err != nil {
92+
return fmt.Errorf("error unmarshalling catalog metadata: %s", err)
93+
}
94+
channels = append(channels, content)
95+
case declcfg.SchemaBundle:
96+
content, err := catalogmetadata.Unmarshal[catalogmetadata.Bundle](meta)
97+
if err != nil {
98+
return fmt.Errorf("error unmarshalling catalog metadata: %s", err)
99+
}
100+
bundles = append(bundles, content)
101+
}
91102

92-
err = declcfg.WalkMetasReader(resp.Body, func(meta *declcfg.Meta, err error) error {
103+
return nil
104+
})
93105
if err != nil {
94-
return err
106+
return nil, fmt.Errorf("error processing response: %s", err)
95107
}
96108

97-
if meta.Schema == schema {
98-
content, err := catalogmetadata.Unmarshal[T](meta)
99-
if err != nil {
100-
return fmt.Errorf("error unmarshalling catalog metadata: %s", err)
101-
}
102-
metadata = append(metadata, content)
109+
bundles, err = populateExtraFields(catalog.Name, channels, bundles)
110+
if err != nil {
111+
return nil, err
103112
}
104113

105-
return nil
106-
})
107-
if err != nil {
108-
return nil, fmt.Errorf("error processing response: %s", err)
114+
allBundles = append(allBundles, bundles...)
109115
}
110116

111-
return metadata, nil
117+
return allBundles, nil
112118
}
113119

114120
func populateExtraFields(catalogName string, channels []*catalogmetadata.Channel, bundles []*catalogmetadata.Bundle) ([]*catalogmetadata.Bundle, error) {

‎internal/resolution/entitysources/catalogdsource.go‎

Lines changed: 61 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"net/http"
78

89
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
910
"github.com/operator-framework/deppy/pkg/deppy"
@@ -15,15 +16,35 @@ import (
1516
"github.com/operator-framework/operator-controller/internal/resolution/entities"
1617
)
1718

19+
const catalogdOnClusterBaseURL = "http://catalogd-catalogserver.catalogd-system.svc"
20+
1821
// CatalogdEntitySource is a source for(/collection of) deppy defined input.Entity, built from content
1922
// made accessible on-cluster by https://github.com/operator-framework/catalogd.
2023
// It is an implementation of deppy defined input.EntitySource
2124
type CatalogdEntitySource struct {
22-
client client.Client
25+
client client.Client
26+
baseURL string
2327
}
2428

25-
func NewCatalogdEntitySource(client client.Client) *CatalogdEntitySource {
26-
return &CatalogdEntitySource{client: client}
29+
type CatalogdEntitySourceOpt func(es *CatalogdEntitySource)
30+
31+
func WithBaseURL(baseURL string) CatalogdEntitySourceOpt {
32+
return func(es *CatalogdEntitySource) {
33+
es.baseURL = baseURL
34+
}
35+
}
36+
37+
func NewCatalogdEntitySource(client client.Client, opts ...CatalogdEntitySourceOpt) *CatalogdEntitySource {
38+
ces := &CatalogdEntitySource{
39+
client: client,
40+
baseURL: catalogdOnClusterBaseURL,
41+
}
42+
43+
for _, opt := range opts {
44+
opt(ces)
45+
}
46+
47+
return ces
2748
}
2849

2950
func (es *CatalogdEntitySource) Get(_ context.Context, _ deppy.Identifier) (*input.Entity, error) {
@@ -32,7 +53,7 @@ func (es *CatalogdEntitySource) Get(_ context.Context, _ deppy.Identifier) (*inp
3253

3354
func (es *CatalogdEntitySource) Filter(ctx context.Context, filter input.Predicate) (input.EntityList, error) {
3455
resultSet := input.EntityList{}
35-
entities, err := getEntities(ctx, es.client)
56+
entities, err := getEntities(ctx, es.client, es.baseURL)
3657
if err != nil {
3758
return nil, err
3859
}
@@ -45,7 +66,7 @@ func (es *CatalogdEntitySource) Filter(ctx context.Context, filter input.Predica
4566
}
4667

4768
func (es *CatalogdEntitySource) GroupBy(ctx context.Context, fn input.GroupByFunction) (input.EntityListMap, error) {
48-
entities, err := getEntities(ctx, es.client)
69+
entities, err := getEntities(ctx, es.client, es.baseURL)
4970
if err != nil {
5071
return nil, err
5172
}
@@ -60,7 +81,7 @@ func (es *CatalogdEntitySource) GroupBy(ctx context.Context, fn input.GroupByFun
6081
}
6182

6283
func (es *CatalogdEntitySource) Iterate(ctx context.Context, fn input.IteratorFunction) error {
63-
entities, err := getEntities(ctx, es.client)
84+
entities, err := getEntities(ctx, es.client, es.baseURL)
6485
if err != nil {
6586
return err
6687
}
@@ -72,15 +93,15 @@ func (es *CatalogdEntitySource) Iterate(ctx context.Context, fn input.IteratorFu
7293
return nil
7394
}
7495

75-
func getEntities(ctx context.Context, cl client.Client) (input.EntityList, error) {
96+
func getEntities(ctx context.Context, cl client.Client, baseURL string) (input.EntityList, error) {
7697
allEntitiesList := input.EntityList{}
7798

7899
var catalogList catalogd.CatalogList
79100
if err := cl.List(ctx, &catalogList); err != nil {
80101
return nil, err
81102
}
82103
for _, catalog := range catalogList.Items {
83-
channels, bundles, err := fetchCatalogMetadata(ctx, cl, catalog.Name)
104+
channels, bundles, err := fetchCatalogMetadata(ctx, baseURL, catalog.Name)
84105
if err != nil {
85106
return nil, err
86107
}
@@ -152,12 +173,12 @@ func MetadataToEntities(catalogName string, channels []declcfg.Channel, bundles
152173
return entityList, nil
153174
}
154175

155-
func fetchCatalogMetadata(ctx context.Context, cl client.Client, catalogName string) ([]declcfg.Channel, []declcfg.Bundle, error) {
156-
channels, err := fetchCatalogMetadataByScheme[declcfg.Channel](ctx, cl, declcfg.SchemaChannel, catalogName)
176+
func fetchCatalogMetadata(ctx context.Context, baseURL, catalogName string) ([]declcfg.Channel, []declcfg.Bundle, error) {
177+
channels, err := fetchCatalogMetadataByScheme[declcfg.Channel](ctx, baseURL, declcfg.SchemaChannel, catalogName)
157178
if err != nil {
158179
return nil, nil, err
159180
}
160-
bundles, err := fetchCatalogMetadataByScheme[declcfg.Bundle](ctx, cl, declcfg.SchemaBundle, catalogName)
181+
bundles, err := fetchCatalogMetadataByScheme[declcfg.Bundle](ctx, baseURL, declcfg.SchemaBundle, catalogName)
161182
if err != nil {
162183
return nil, nil, err
163184
}
@@ -169,21 +190,40 @@ type declcfgSchema interface {
169190
declcfg.Package | declcfg.Bundle | declcfg.Channel
170191
}
171192

193+
const catalogdOnClusterURLTemplate = "%s/catalogs/%s/all.json"
194+
172195
// TODO: Cleanup once https://github.com/golang/go/issues/45380 implemented
173196
// We should be able to get rid of the schema arg and switch based on the type passed to this generic
174-
func fetchCatalogMetadataByScheme[T declcfgSchema](ctx context.Context, cl client.Client, schema, catalogName string) ([]T, error) {
175-
cmList := catalogd.CatalogMetadataList{}
176-
if err := cl.List(ctx, &cmList, client.MatchingLabels{"schema": schema, "catalog": catalogName}); err != nil {
177-
return nil, err
197+
func fetchCatalogMetadataByScheme[T declcfgSchema](ctx context.Context, baseURL, schema, catalogName string) ([]T, error) {
198+
contents := []T{}
199+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf(catalogdOnClusterURLTemplate, baseURL, catalogName), nil)
200+
if err != nil {
201+
return nil, fmt.Errorf("error forming request: %s", err)
178202
}
179203

180-
contents := []T{}
181-
for _, cm := range cmList.Items {
182-
var content T
183-
if err := json.Unmarshal(cm.Spec.Content, &content); err != nil {
184-
return nil, err
204+
resp, err := http.DefaultClient.Do(req)
205+
if err != nil {
206+
return nil, fmt.Errorf("error performing request: %s", err)
207+
}
208+
defer resp.Body.Close()
209+
210+
err = declcfg.WalkMetasReader(resp.Body, func(meta *declcfg.Meta, err error) error {
211+
if err != nil {
212+
return err
213+
}
214+
215+
if meta.Schema == schema {
216+
var content T
217+
if err := json.Unmarshal(meta.Blob, &content); err != nil {
218+
return fmt.Errorf("error unmarshalling content: %s", err)
219+
}
220+
contents = append(contents, content)
185221
}
186-
contents = append(contents, content)
222+
223+
return nil
224+
})
225+
if err != nil {
226+
return nil, fmt.Errorf("error processing response: %s", err)
187227
}
188228

189229
return contents, nil

0 commit comments

Comments
 (0)