Skip to content

Commit

Permalink
grpc changes
Browse files Browse the repository at this point in the history
  • Loading branch information
grokspawn committed Nov 6, 2023
1 parent 5d951b8 commit 17f4672
Show file tree
Hide file tree
Showing 6 changed files with 348 additions and 228 deletions.
4 changes: 2 additions & 2 deletions alpha/declcfg/declcfg_to_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func ConvertToModel(cfg DeclarativeConfig) (model.Model, error) {

// packageBundles tracks the set of bundle names for each package
// and is used to detect duplicate bundles.
packageBundles := map[string]sets.String{}
packageBundles := map[string]sets.Set[string]{}

for _, b := range cfg.Bundles {
if b.Package == "" {
Expand All @@ -102,7 +102,7 @@ func ConvertToModel(cfg DeclarativeConfig) (model.Model, error) {

bundles, ok := packageBundles[b.Package]
if !ok {
bundles = sets.NewString()
bundles = sets.Set[string]{}
}
if bundles.Has(b.Name) {
return nil, fmt.Errorf("package %q has duplicate bundle %q", b.Package, b.Name)
Expand Down
9 changes: 4 additions & 5 deletions pkg/api/grpc_health_v1/health.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions pkg/api/grpc_health_v1/health_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 17f4672

Please sign in to comment.