refactoring

Author: engnke

pkg/beholder/client.go

@@ -36,8 +36,8 @@ type Client struct {
 	Meter otelmetric.Meter
 	// Message Emitter
 	Emitter Emitter
-	// Schema Registry client
-	SRClient Registrar
+	// Schema Registrar
+	Registrar Registrar
 
 	// Providers
 	LoggerProvider        otellog.LoggerProvider

pkg/beholder/client_test.go

@@ -480,7 +480,7 @@ func TestNewGRPCClient_ChipIngressEmitter(t *testing.T) {
 	})
 }
 
-func TestNewClient_ChipSchemaRegistry(t *testing.T) {
+func TestNewClient_ChipRegistrar(t *testing.T) {
 	t.Run("chip schema registry enabled", func(t *testing.T) {
 		client, err := beholder.NewClient(beholder.Config{
 			OtelExporterGRPCEndpoint:       "grpc-endpoint",
@@ -491,7 +491,7 @@ func TestNewClient_ChipSchemaRegistry(t *testing.T) {
 		})
 		require.NoError(t, err)
 		assert.NotNil(t, client)
-		assert.NotNil(t, client.SRClient)
+		assert.NotNil(t, client.Registrar)
 	})
 
 	t.Run("chip schema registry is not enabled when chip ingress is not enabled ", func(t *testing.T) {
@@ -504,7 +504,7 @@ func TestNewClient_ChipSchemaRegistry(t *testing.T) {
 		})
 		require.NoError(t, err)
 		assert.NotNil(t, client)
-		assert.Nil(t, client.SRClient)
+		assert.Nil(t, client.Registrar)
 		assert.NotNil(t, client.Emitter)
 	})
 

pkg/beholder/registrar.go

@@ -8,7 +8,7 @@ import (
 )
 
 type Registrar interface {
-	Register(ctx context.Context, schemas ...*pb.Schema) error
+	RegisterSchema(ctx context.Context, schemas ...*pb.Schema) error
 }
 
 type schemaRegistry struct {
@@ -26,7 +26,7 @@ func NewRegistrar(client chipingress.Client) (Registrar, error) {
 }
 
 // Register registers one or more schemas with the Chip Ingress service
-func (sr *schemaRegistry) Register(ctx context.Context, schemas ...*pb.Schema) error {
+func (sr *schemaRegistry) RegisterSchema(ctx context.Context, schemas ...*pb.Schema) error {
 	request := &pb.RegisterSchemaRequest{
 		Schemas: schemas,
 	}

pkg/beholder/registrar_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 )
 
-func TestNewSchemaRegistry(t *testing.T) {
+func TestNewRegistrar(t *testing.T) {
 	t.Run("returns error when client is nil", func(t *testing.T) {
 		registry, err := beholder.NewRegistrar(nil)
 		assert.Nil(t, registry)
@@ -27,7 +27,7 @@ func TestNewSchemaRegistry(t *testing.T) {
 	})
 }
 
-func TestSchemaRegistry_Register(t *testing.T) {
+func TestRegistrar_Register(t *testing.T) {
 	t.Run("successfully registers schemas", func(t *testing.T) {
 		mockClient := mocks.NewClient(t)
 		mockClient.
@@ -40,7 +40,7 @@ func TestSchemaRegistry_Register(t *testing.T) {
 			{Subject: "schema1", Schema: `{"type":"record","name":"Test","fields":[{"name":"jeff"}]}`, Format: 1},
 			{Subject: "schema1", Schema: `{"name":"jeff"}`, Format: 2},
 		}
-		err = registry.Register(t.Context(), schemas...)
+		err = registry.RegisterSchema(t.Context(), schemas...)
 		assert.NoError(t, err)
 	})
 
@@ -55,7 +55,7 @@ func TestSchemaRegistry_Register(t *testing.T) {
 		schemas := []*pb.Schema{
 			{Subject: "schema1", Schema: `{"name":"jeff"}`, Format: 2},
 		}
-		err = registry.Register(t.Context(), schemas...)
+		err = registry.RegisterSchema(t.Context(), schemas...)
 		assert.EqualError(t, err, "failed to register schema: registration failed")
 	})
 }