feat: enrich list namespace and schema (#154)

* feat: enrich list namespace and schema

* chore: cleanup dead code

* test: fix test

* chore: go mo tidy

Author: ravisuhag

Makefile

@@ -1,6 +1,6 @@
 NAME="github.com/odpf/stencil"
 VERSION=$(shell git describe --always --tags 2>/dev/null)
-PROTON_COMMIT := "d08a4916075438ed9c3a4510989bda2273e0a4e4"
+PROTON_COMMIT := "a6c7056fa80128145d00d5ee72f216c28578ec43"
 
 .PHONY: all build test clean dist vet proto install
 

cmd/cdk.go

@@ -1,12 +1,13 @@
 package cmd
 
 var dict = map[string]string{
-	"COMPATIBILITY_BACKWARD": "backward",
-	"COMPATIBILITY_FORWARD":  "forward",
-	"COMPATIBILITY_FULL":     "full",
-	"FORMAT_PROTOBUF":        "protobuf",
-	"FORMAT_JSON":            "json",
-	"FORMAT_AVRO":            "avro",
+	"COMPATIBILITY_BACKWARD":    "backward",
+	"COMPATIBILITY_FORWARD":     "forward",
+	"COMPATIBILITY_FULL":        "full",
+	"COMPATIBILITY_UNSPECIFIED": "-",
+	"FORMAT_PROTOBUF":           "protobuf",
+	"FORMAT_JSON":               "json",
+	"FORMAT_AVRO":               "avro",
 }
 
 var (

cmd/list.go

@@ -41,7 +41,6 @@ func listSchemaCmd(cdk *CDK) *cobra.Command {
 			if err != nil {
 				return err
 			}
-
 			schemas := res.GetSchemas()
 
 			// TODO(Ravi): List schemas should also handle namespace not found
@@ -61,15 +60,14 @@ func listSchemaCmd(cdk *CDK) *cobra.Command {
 				term.Bold("AUTHORITY"),
 			})
 			for _, s := range schemas {
-				meta, _ := fetchMeta(client, namespace, s)
-				c := meta.GetCompatibility().String()
-				f := meta.GetFormat().String()
-				a := meta.GetAuthority()
+				c := s.GetCompatibility().String()
+				f := s.GetFormat().String()
+				a := s.GetAuthority()
 
 				if a == "" {
 					a = "-"
 				}
-				report = append(report, []string{term.Greenf("#%d", index), s, dict[f], dict[c], a})
+				report = append(report, []string{term.Greenf("#%d", index), s.GetName(), dict[f], dict[c], a})
 				index++
 			}
 

cmd/namespace.go

@@ -75,9 +75,14 @@ func listNamespaceCmd(cdk *CDK) *cobra.Command {
 			fmt.Printf("\nShowing %[1]d of %[1]d namespaces \n \n", len(namespaces))
 			report := [][]string{}
 			index := 1
-			report = append(report, []string{"INDEX", "NAMESPACE", "FORMAT", "COMPATIBILITY", "DESCRIPTION"})
+			report = append(report, []string{"INDEX", "NAMESPACE", "FORMAT", "COMPATIBILITY"})
 			for _, n := range namespaces {
-				report = append(report, []string{term.Greenf("#%d", index), n, "-", "-", "-"})
+				report = append(report,
+					[]string{term.Greenf("#%d", index),
+						n.Id,
+						dict[n.GetFormat().String()],
+						dict[n.GetCompatibility().String()],
+					})
 				index++
 			}
 			printer.Table(os.Stdout, report)

cmd/schema.go

@@ -72,11 +72,3 @@ func fetchSchemaAndMeta(client stencilv1beta1.StencilServiceClient, version int3
 
 	return data, meta, nil
 }
-
-func fetchMeta(client stencilv1beta1.StencilServiceClient, namespace string, schema string) (*stencilv1beta1.GetSchemaMetadataResponse, error) {
-	req := stencilv1beta1.GetSchemaMetadataRequest{
-		NamespaceId: namespace,
-		SchemaId:    schema,
-	}
-	return client.GetSchemaMetadata(context.Background(), &req)
-}

core/namespace/namespace.go

@@ -17,7 +17,7 @@ type Namespace struct {
 type Repository interface {
 	Create(context.Context, Namespace) (Namespace, error)
 	Update(context.Context, Namespace) (Namespace, error)
-	List(context.Context) ([]string, error)
+	List(context.Context) ([]Namespace, error)
 	Get(context.Context, string) (Namespace, error)
 	Delete(context.Context, string) error
 }

core/namespace/service.go

@@ -22,7 +22,7 @@ func (s Service) Update(ctx context.Context, ns Namespace) (Namespace, error) {
 	return s.repo.Update(ctx, ns)
 }
 
-func (s Service) List(ctx context.Context) ([]string, error) {
+func (s Service) List(ctx context.Context) ([]Namespace, error) {
 	return s.repo.List(ctx)
 }
 

core/schema/mocks/schema_repository.go

@@ -23,7 +23,7 @@ type SchemaFile struct {
 
 type Repository interface {
 	Create(ctx context.Context, namespace string, schema string, metadata *Metadata, versionID string, schemaFile *SchemaFile) (version int32, err error)
-	List(context.Context, string) ([]string, error)
+	List(context.Context, string) ([]Schema, error)
 	ListVersions(context.Context, string, string) ([]int32, error)
 	Get(context.Context, string, string, int32) ([]byte, error)
 	GetLatestVersion(context.Context, string, string) (int32, error)
@@ -49,3 +49,10 @@ type Cache interface {
 	Get(interface{}) (interface{}, bool)
 	Set(interface{}, interface{}, int64) bool
 }
+
+type Schema struct {
+	Name          string
+	Format        string
+	Compatibility string
+	Authority     string
+}

core/schema/schema.go

@@ -142,7 +142,7 @@ func (s *Service) UpdateMetadata(ctx context.Context, namespace, schemaName stri
 	return s.repo.UpdateMetadata(ctx, namespace, schemaName, meta)
 }
 
-func (s *Service) List(ctx context.Context, namespaceID string) ([]string, error) {
+func (s *Service) List(ctx context.Context, namespaceID string) ([]Schema, error) {
 	return s.repo.List(ctx, namespaceID)
 }