Merge pull request #112 from ecordell/api-bundle-client

GRPC client wrapper returns api objects

Author: openshift-merge-robot

pkg/client/client.go

@@ -9,14 +9,13 @@ import (
 
 	"github.com/operator-framework/operator-registry/pkg/api"
 	"github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1"
-	"github.com/operator-framework/operator-registry/pkg/registry"
 )
 
 type Interface interface {
-	GetBundle(ctx context.Context, packageName, channelName, csvName string) (*registry.Bundle, error)
-	GetBundleInPackageChannel(ctx context.Context, packageName, channelName string) (*registry.Bundle, error)
-	GetReplacementBundleInPackageChannel(ctx context.Context, currentName, packageName, channelName string) (*registry.Bundle, error)
-	GetBundleThatProvides(ctx context.Context, group, version, kind string) (*registry.Bundle, error)
+	GetBundle(ctx context.Context, packageName, channelName, csvName string) (*api.Bundle, error)
+	GetBundleInPackageChannel(ctx context.Context, packageName, channelName string) (*api.Bundle, error)
+	GetReplacementBundleInPackageChannel(ctx context.Context, currentName, packageName, channelName string) (*api.Bundle, error)
+	GetBundleThatProvides(ctx context.Context, group, version, kind string) (*api.Bundle, error)
 	HealthCheck(ctx context.Context, reconnectTimeout time.Duration) (bool, error)
 	Close() error
 }
@@ -29,40 +28,20 @@ type Client struct {
 
 var _ Interface = &Client{}
 
-func (c *Client) GetBundle(ctx context.Context, packageName, channelName, csvName string) (*registry.Bundle, error) {
-	bundle, err := c.Registry.GetBundle(ctx, &api.GetBundleRequest{PkgName: packageName, ChannelName: channelName, CsvName: csvName})
-	if err != nil {
-		return nil, err
-	}
-	return registry.NewBundleFromStrings(bundle.CsvName, bundle.PackageName, bundle.ChannelName, bundle.Object)
+func (c *Client) GetBundle(ctx context.Context, packageName, channelName, csvName string) (*api.Bundle, error) {
+	return c.Registry.GetBundle(ctx, &api.GetBundleRequest{PkgName: packageName, ChannelName: channelName, CsvName: csvName})
 }
 
-func (c *Client) GetBundleInPackageChannel(ctx context.Context, packageName, channelName string) (*registry.Bundle, error) {
-	bundle, err := c.Registry.GetBundleForChannel(ctx, &api.GetBundleInChannelRequest{PkgName: packageName, ChannelName: channelName})
-	if err != nil {
-		return nil, err
-	}
-	return registry.NewBundleFromStrings(bundle.CsvName, packageName, channelName, bundle.Object)
+func (c *Client) GetBundleInPackageChannel(ctx context.Context, packageName, channelName string) (*api.Bundle, error) {
+	return c.Registry.GetBundleForChannel(ctx, &api.GetBundleInChannelRequest{PkgName: packageName, ChannelName: channelName})
 }
 
-func (c *Client) GetReplacementBundleInPackageChannel(ctx context.Context, currentName, packageName, channelName string) (*registry.Bundle, error) {
-	bundle, err := c.Registry.GetBundleThatReplaces(ctx, &api.GetReplacementRequest{CsvName: currentName, PkgName: packageName, ChannelName: channelName})
-	if err != nil {
-		return nil, err
-	}
-	return registry.NewBundleFromStrings(bundle.CsvName, packageName, channelName, bundle.Object)
+func (c *Client) GetReplacementBundleInPackageChannel(ctx context.Context, currentName, packageName, channelName string) (*api.Bundle, error) {
+	return c.Registry.GetBundleThatReplaces(ctx, &api.GetReplacementRequest{CsvName: currentName, PkgName: packageName, ChannelName: channelName})
 }
 
-func (c *Client) GetBundleThatProvides(ctx context.Context, group, version, kind string) (*registry.Bundle, error) {
-	bundle, err := c.Registry.GetDefaultBundleThatProvides(ctx, &api.GetDefaultProviderRequest{Group: group, Version: version, Kind: kind})
-	if err != nil {
-		return nil, err
-	}
-	parsedBundle, err := registry.NewBundleFromStrings(bundle.CsvName, bundle.PackageName, bundle.ChannelName, bundle.Object)
-	if err != nil {
-		return nil, err
-	}
-	return parsedBundle, nil
+func (c *Client) GetBundleThatProvides(ctx context.Context, group, version, kind string) (*api.Bundle, error) {
+	return c.Registry.GetDefaultBundleThatProvides(ctx, &api.GetDefaultProviderRequest{Group: group, Version: version, Kind: kind})
 }
 
 func (c *Client) Close() error {