Code improvements

cmd/registry/main.go

@@ -50,7 +50,7 @@ func main() {
 	initOTLP(ctx, cfg)
 
 	// Status server initialization
-	go startStatusServer(cfg, ctx)
+	go startStatusServer(ctx, cfg)
 
 	db := initDB(ctx, cfg)
 
@@ -185,7 +185,7 @@ func loadConfig() *config.Config {
 	return cfg
 }
 
-func startStatusServer(cfg *config.Config, ctx context.Context) {
+func startStatusServer(ctx context.Context, cfg *config.Config) {
 	liveness := status.WithLiveness(
 		health.NewHandler(
 			health.NewChecker(health.WithDisabledAutostart()),

integration/operatortest/operatortest.go

@@ -69,7 +69,7 @@ func New(ctx context.Context) (*orbital.Operator, error) {
 	}
 
 	client, err := amqp.NewClient(ctx, codec.Proto{}, amqp.ConnectionInfo{
-		URL:    target.Connection.AMQP.Url,
+		URL:    target.Connection.AMQP.URL,
 		Target: target.Connection.AMQP.Source,
 		Source: target.Connection.AMQP.Target,
 	}, option)

internal/config/config.go

@@ -151,9 +151,9 @@ func (o *Orbital) Validate() error {
 }
 
 func (o *Orbital) GetWorker(workerName string) *Worker {
-	for _, worker := range o.Workers {
-		if worker.Name == workerName {
-			return &worker
+	for i := range o.Workers {
+		if o.Workers[i].Name == workerName {
+			return &o.Workers[i]
 		}
 	}
 
@@ -237,13 +237,13 @@ func (c *Connection) validate() error {
 }
 
 type AMQP struct {
-	Url    string `yaml:"url" json:"url"`
+	URL    string `yaml:"url" json:"url"`
 	Source string `yaml:"source" json:"source"`
 	Target string `yaml:"target" json:"target"`
 }
 
 func (a *AMQP) validate() error {
-	if a.Url == "" {
+	if a.URL == "" {
 		return ErrEmptyURL
 	}
 

internal/config/config_test.go

@@ -15,7 +15,7 @@ func TestValidateTarget(t *testing.T) {
 		Connection: &config.Connection{
 			Type: config.ConnectionTypeAMQP,
 			AMQP: &config.AMQP{
-				Url:    "amqp://localhost:5672",
+				URL:    "amqp://localhost:5672",
 				Source: "source",
 				Target: "target",
 			},
@@ -90,7 +90,7 @@ func TestValidateTarget(t *testing.T) {
 			name: "missing AMQP URL",
 			patchTarget: func(t config.Target) config.Target {
 				t = deepCopyTarget(t)
-				t.Connection.AMQP.Url = ""
+				t.Connection.AMQP.URL = ""
 				return t
 			},
 			expErr: config.ErrEmptyURL,
@@ -376,7 +376,7 @@ func deepCopyTarget(t config.Target) config.Target {
 		Connection: &config.Connection{
 			Type: t.Connection.Type,
 			AMQP: &config.AMQP{
-				Url:    t.Connection.AMQP.Url,
+				URL:    t.Connection.AMQP.URL,
 				Source: t.Connection.AMQP.Source,
 				Target: t.Connection.AMQP.Target,
 			},

internal/interceptor/metrics.go

@@ -89,8 +89,8 @@ func (m *Meters) StreamInterceptor(srv any, stream grpc.ServerStream, info *grpc
 			attribute.String("status", statusCode),
 		)...,
 	)
-	m.requestDurations.Record(context.Background(), elapsedTime, attrs)
-	m.requestCounts.Add(context.Background(), 1, attrs)
+	m.requestDurations.Record(stream.Context(), elapsedTime, attrs)
+	m.requestCounts.Add(stream.Context(), 1, attrs)
 
 	return err
 }

internal/interceptor/metrics_test.go

@@ -11,13 +11,26 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 
 	"github.com/openkcm/registry/internal/interceptor"
 )
 
+// mockServerStream is a minimal grpc.ServerStream for testing.
+type mockServerStream struct {
+	ctxFunc func() context.Context
+}
+
+func (m *mockServerStream) Context() context.Context     { return m.ctxFunc() }
+func (m *mockServerStream) SetHeader(metadata.MD) error  { return nil }
+func (m *mockServerStream) SendHeader(metadata.MD) error { return nil }
+func (m *mockServerStream) SetTrailer(metadata.MD)       {}
+func (m *mockServerStream) SendMsg(any) error            { return nil }
+func (m *mockServerStream) RecvMsg(any) error            { return nil }
+
 func TestMetricsUnaryInterceptor(t *testing.T) {
 	ctx := t.Context()
 	app := &commoncfg.Application{}
@@ -103,7 +116,7 @@ func TestMetricsStreamInterceptor(t *testing.T) {
 
 	err = met.StreamInterceptor(
 		nil,
-		nil,
+		&mockServerStream{ctxFunc: t.Context},
 		&grpc.StreamServerInfo{FullMethod: "/test.method"},
 		handler,
 	)

internal/interceptor/recover_test.go

@@ -54,17 +54,11 @@ func TestServerPanic(t *testing.T) {
 			)
 			// registering server
 			servicetest.RegisterTestServiceServer(srv, serviceTest)
+			t.Cleanup(srv.Stop)
 
-			go func(t *testing.T, srv *grpc.Server, ls *bufconn.Listener) {
-				t.Helper()
-
-				defer srv.Stop()
-
-				err := srv.Serve(ls)
-				if err != nil {
-					assert.NoError(t, err, "server could not be started")
-				}
-			}(t, srv, ls)
+			go func() {
+				_ = srv.Serve(ls)
+			}()
 
 			// creating client connection
 			conn, err := grpc.NewClient("passthrough://bufnet",
@@ -126,17 +120,11 @@ func TestServerPanic(t *testing.T) {
 
 			// registering server
 			servicetest.RegisterTestServiceServer(srv, serviceTest)
+			t.Cleanup(srv.Stop)
 
-			go func(t *testing.T, srv *grpc.Server, ls *bufconn.Listener) {
-				t.Helper()
-
-				defer srv.Stop()
-
-				err := srv.Serve(ls)
-				if err != nil {
-					assert.NoError(t, err, "server could not be started")
-				}
-			}(t, srv, ls)
+			go func() {
+				_ = srv.Serve(ls)
+			}()
 
 			// creating client connection
 			conn, err := grpc.NewClient("passthrough://bufnet",

internal/model/auth.go

@@ -96,22 +96,22 @@ type AuthStatusConstraint struct{}
 
 var validAuthStatuses map[string]struct{}
 
+func init() {
+	validAuthStatuses = make(map[string]struct{}, len(pb.AuthStatus_name)-1)
+	for _, v := range pb.AuthStatus_name {
+		if v != pb.AuthStatus_AUTH_STATUS_UNSPECIFIED.String() {
+			validAuthStatuses[v] = struct{}{}
+		}
+	}
+}
+
 // Validate checks if the provided value is a valid Auth status.
 // Auth status must be one of the defined enum values in pb.AuthStatus.
 func (c AuthStatusConstraint) Validate(value any) error {
 	statusValue, ok := value.(string)
 	if !ok {
 		return fmt.Errorf("%w: %T", validation.ErrWrongType, value)
 	}
-	// lazy initialization of validAuthStatuses
-	if validAuthStatuses == nil {
-		validAuthStatuses = make(map[string]struct{}, len(pb.AuthStatus_name)-1)
-		for _, v := range pb.AuthStatus_name {
-			if v != pb.AuthStatus_AUTH_STATUS_UNSPECIFIED.String() {
-				validAuthStatuses[v] = struct{}{}
-			}
-		}
-	}
 
 	if _, ok := validAuthStatuses[statusValue]; !ok {
 		return validation.ErrValueNotAllowed

internal/model/regional_system.go

@@ -129,23 +129,22 @@ type RegionalSystemStatusConstraint struct{}
 
 var validSystemStatuses map[string]struct{}
 
+func init() {
+	validSystemStatuses = make(map[string]struct{}, len(typespb.Status_name)-1)
+	for _, v := range typespb.Status_name {
+		if v != typespb.Status_STATUS_UNSPECIFIED.String() {
+			validSystemStatuses[v] = struct{}{}
+		}
+	}
+}
+
 // Validate checks if the provided system status is valid.
 func (c RegionalSystemStatusConstraint) Validate(value any) error {
 	status, ok := value.(string)
 	if !ok {
 		return validation.ErrWrongType
 	}
 
-	// lazy initialization of valid system statuses
-	if validSystemStatuses == nil {
-		validSystemStatuses = make(map[string]struct{})
-		for _, v := range typespb.Status_name {
-			if v != typespb.Status_STATUS_UNSPECIFIED.String() {
-				validSystemStatuses[v] = struct{}{}
-			}
-		}
-	}
-
 	if _, exists := validSystemStatuses[status]; !exists {
 		return validation.ErrValueNotAllowed
 	}

internal/model/tenant.go

@@ -95,21 +95,22 @@ type TenantRoleConstraint struct{}
 
 var validTenantRoles map[string]struct{}
 
+func init() {
+	validTenantRoles = make(map[string]struct{}, len(tenantgrpc.Role_name)-1)
+	for _, v := range tenantgrpc.Role_name {
+		if v != tenantgrpc.Role_ROLE_UNSPECIFIED.String() {
+			validTenantRoles[v] = struct{}{}
+		}
+	}
+}
+
 // Validate checks if the provided value is a valid Tenant role.
 // Tenant role must be one of the defined enum values in tenant proto Role.
 func (t TenantRoleConstraint) Validate(value any) error {
 	roleValue, ok := value.(string)
 	if !ok {
 		return fmt.Errorf("%w: %T", validation.ErrWrongType, value)
 	}
-	if validTenantRoles == nil {
-		validTenantRoles = make(map[string]struct{}, len(tenantgrpc.Role_name)-1)
-		for _, v := range tenantgrpc.Role_name {
-			if v != tenantgrpc.Role_ROLE_UNSPECIFIED.String() {
-				validTenantRoles[v] = struct{}{}
-			}
-		}
-	}
 	if _, ok := validTenantRoles[roleValue]; !ok {
 		return validation.ErrValueNotAllowed
 	}

internal/repository/sql/export_test.go

@@ -0,0 +1,3 @@
+package sql
+
+var HandleQueryField = handleQueryField