Merge pull request #20 from njhale/get-bundle

feat(bundles): add GetBundle request

Author: openshift-merge-robot

pkg/api/registry.pb.go

@@ -4,7 +4,8 @@ package api;
 
 service Registry {
     rpc ListPackages(ListPackageRequest) returns (stream PackageName) {}
-    rpc GetPackage(GetPackageRequest) returns (Package) {}
+	rpc GetPackage(GetPackageRequest) returns (Package) {}
+	rpc GetBundle(GetBundleRequest) returns (Bundle) {}
 	rpc GetBundleForChannel(GetBundleInChannelRequest) returns (Bundle) {}
 	rpc GetChannelEntriesThatReplace(GetAllReplacementsRequest) returns (stream ChannelEntry) {}
 	rpc GetBundleThatReplaces(GetReplacementRequest) returns (Bundle) {}
@@ -51,7 +52,9 @@ message GetPackageRequest{
 }
 
 message GetBundleRequest{
-	string csvName = 1;
+	string pkgName = 1;
+	string channelName = 2;
+	string csvName = 3;
 }
 
 message GetBundleInChannelRequest{

pkg/api/registry.proto

@@ -11,6 +11,7 @@ import (
 )
 
 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)
@@ -24,6 +25,14 @@ 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) 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 {

pkg/client/client.go

@@ -14,6 +14,7 @@ type Query interface {
 	ListTables(ctx context.Context) ([]string, error)
 	ListPackages(ctx context.Context) ([]string, error)
 	GetPackage(ctx context.Context, name string) (*PackageManifest, error)
+	GetBundle(ctx context.Context, pkgName, channelName, csvName string) (string, error)
 	GetBundleForChannel(ctx context.Context, pkgName string, channelName string) (string, error)
 	// Get all channel entries that say they replace this one
 	GetChannelEntriesThatReplace(ctx context.Context, name string) (entries []*ChannelEntry, err error)

pkg/registry/interface.go

@@ -38,6 +38,18 @@ func (s *RegistryServer) GetPackage(ctx context.Context, req *api.GetPackageRequ
 	return api.PackageManifestToAPIPackage(packageManifest), nil
 }
 
+func (s *RegistryServer) GetBundle(ctx context.Context, req *api.GetBundleRequest) (*api.Bundle, error) {
+	bundleString, err := s.store.GetBundle(ctx, req.GetPkgName(), req.GetChannelName(), req.GetCsvName())
+	if err != nil {
+		return nil, err
+	}
+	entry := &registry.ChannelEntry{
+		PackageName: req.GetPkgName(),
+		ChannelName: req.GetChannelName(),
+	}
+	return api.BundleStringToAPIBundle(bundleString, entry)
+}
+
 func (s *RegistryServer) GetBundleForChannel(ctx context.Context, req *api.GetBundleInChannelRequest) (*api.Bundle, error) {
 	bundleString, err := s.store.GetBundleForChannel(ctx, req.GetPkgName(), req.GetChannelName())
 	if err != nil {

pkg/server/server.go

@@ -103,6 +103,25 @@ func (s *SQLQuerier) GetPackage(ctx context.Context, name string) (*registry.Pac
 	return pkg, nil
 }
 
+func (s *SQLQuerier) GetBundle(ctx context.Context, pkgName, channelName, csvName string) (string, error) {
+	query := `SELECT DISTINCT operatorbundle.bundle
+			  FROM operatorbundle INNER JOIN channel_entry ON operatorbundle.name=channel_entry.operatorbundle_name
+			  WHERE channel_entry.package_name=? AND channel_entry.channel_name=? AND operatorbundle.name=? LIMIT 1`
+	rows, err := s.db.QueryContext(ctx, query, pkgName, channelName, csvName)
+	if err != nil {
+		return "", err
+	}
+
+	if !rows.Next() {
+		return "", fmt.Errorf("no bundle found for csv %s", csvName)
+	}
+	var bundleStringSQL sql.NullString
+	if err := rows.Scan(&bundleStringSQL); err != nil {
+		return "", err
+	}
+	return bundleStringSQL.String, nil
+}
+
 func (s *SQLQuerier) GetBundleForChannel(ctx context.Context, pkgName string, channelName string) (string, error) {
 	query := `SELECT DISTINCT operatorbundle.bundle
               FROM channel INNER JOIN operatorbundle ON channel.head_operatorbundle_name=operatorbundle.name