Skip to content

Rename controlapi.Service -> RpcService #1148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tim Hockin (thockin) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename controlapi.Service -> RpcService #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions cmd/ateapi/internal/controlapi/actor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
)

func (s *Service) CreateActor(ctx context.Context, req *ateapipb.CreateActorRequest) (created *ateapipb.Actor, err error) {
func (s *RpcService) CreateActor(ctx context.Context, req *ateapipb.CreateActorRequest) (created *ateapipb.Actor, err error) {
if errs := validateCreateActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -118,7 +118,7 @@ func (s *Service) CreateActor(ctx context.Context, req *ateapipb.CreateActorRequ
// resolveSnapshotSource resolves a CreateActor request's source snapshot tag
// and checks that its scope and ActorSnapshot are compatible with creating
// an Actor in actorAtespace from template.
func (s *Service) resolveSnapshotSource(ctx context.Context, actorAtespace string, tagRef *ateapipb.ObjectRef, template *atev1alpha1.ActorTemplate) (*ateapipb.ActorSourceSnapshotStatus, error) {
func (s *RpcService) resolveSnapshotSource(ctx context.Context, actorAtespace string, tagRef *ateapipb.ObjectRef, template *atev1alpha1.ActorTemplate) (*ateapipb.ActorSourceSnapshotStatus, error) {
tag, err := s.persistence.GetActorSnapshotTag(ctx, tagRef.GetAtespace(), tagRef.GetName())
if errors.Is(err, store.ErrNotFound) {
return nil, status.Error(codes.NotFound, "ActorSnapshot not found")
Expand Down Expand Up @@ -210,7 +210,7 @@ func validateCreateActorRequest(req *ateapipb.CreateActorRequest) field.ErrorLis
return errs
}

func (s *Service) GetActor(ctx context.Context, req *ateapipb.GetActorRequest) (*ateapipb.Actor, error) {
func (s *RpcService) GetActor(ctx context.Context, req *ateapipb.GetActorRequest) (*ateapipb.Actor, error) {
if errs := validateGetActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand All @@ -237,7 +237,7 @@ func validateGetActorRequest(req *ateapipb.GetActorRequest) field.ErrorList {
return errs
}

func (s *Service) ListActors(ctx context.Context, req *ateapipb.ListActorsRequest) (*ateapipb.ListActorsResponse, error) {
func (s *RpcService) ListActors(ctx context.Context, req *ateapipb.ListActorsRequest) (*ateapipb.ListActorsResponse, error) {
if errs := validateListActorsRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -275,7 +275,7 @@ var actorMutableFields = fieldmask.NewMutableFields(
"worker_selector.match_labels",
)

func (s *Service) UpdateActor(ctx context.Context, req *ateapipb.UpdateActorRequest) (*ateapipb.Actor, error) {
func (s *RpcService) UpdateActor(ctx context.Context, req *ateapipb.UpdateActorRequest) (*ateapipb.Actor, error) {
if errs := validateUpdateActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -328,7 +328,7 @@ func validateUpdateActorRequest(req *ateapipb.UpdateActorRequest) field.ErrorLis
return errs
}

func (s *Service) DeleteActor(ctx context.Context, req *ateapipb.DeleteActorRequest) (deleted *ateapipb.Actor, err error) {
func (s *RpcService) DeleteActor(ctx context.Context, req *ateapipb.DeleteActorRequest) (deleted *ateapipb.Actor, err error) {
if errs := validateDeleteActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -370,7 +370,7 @@ func validateDeleteActorRequest(req *ateapipb.DeleteActorRequest) field.ErrorLis
return errs
}

func (s *Service) PauseActor(ctx context.Context, req *ateapipb.PauseActorRequest) (*ateapipb.PauseActorResponse, error) {
func (s *RpcService) PauseActor(ctx context.Context, req *ateapipb.PauseActorRequest) (*ateapipb.PauseActorResponse, error) {
if errs := validatePauseActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -405,7 +405,7 @@ func validatePauseActorRequest(req *ateapipb.PauseActorRequest) field.ErrorList
return errs
}

func (s *Service) ResumeActor(ctx context.Context, req *ateapipb.ResumeActorRequest) (*ateapipb.ResumeActorResponse, error) {
func (s *RpcService) ResumeActor(ctx context.Context, req *ateapipb.ResumeActorRequest) (*ateapipb.ResumeActorResponse, error) {
if errs := validateResumeActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -440,7 +440,7 @@ func validateResumeActorRequest(req *ateapipb.ResumeActorRequest) field.ErrorLis
return errs
}

func (s *Service) SuspendActor(ctx context.Context, req *ateapipb.SuspendActorRequest) (*ateapipb.SuspendActorResponse, error) {
func (s *RpcService) SuspendActor(ctx context.Context, req *ateapipb.SuspendActorRequest) (*ateapipb.SuspendActorResponse, error) {
if errs := validateSuspendActorRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/ateapi/internal/controlapi/actor_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var actorSnapshotTagScopeNames = func() []string {
return names
}()

func (s *Service) GetActorSnapshot(ctx context.Context, req *ateapipb.GetActorSnapshotRequest) (*ateapipb.ActorSnapshot, error) {
func (s *RpcService) GetActorSnapshot(ctx context.Context, req *ateapipb.GetActorSnapshotRequest) (*ateapipb.ActorSnapshot, error) {
if errs := validateGetActorSnapshotRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand All @@ -74,7 +74,7 @@ func validateGetActorSnapshotRequest(req *ateapipb.GetActorSnapshotRequest) fiel
return errs
}

func (s *Service) GetActorSnapshotTag(ctx context.Context, req *ateapipb.GetActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
func (s *RpcService) GetActorSnapshotTag(ctx context.Context, req *ateapipb.GetActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
if errs := validateGetActorSnapshotTagRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand All @@ -101,7 +101,7 @@ func validateGetActorSnapshotTagRequest(req *ateapipb.GetActorSnapshotTagRequest
return errs
}

func (s *Service) ListActorSnapshots(ctx context.Context, req *ateapipb.ListActorSnapshotsRequest) (*ateapipb.ListActorSnapshotsResponse, error) {
func (s *RpcService) ListActorSnapshots(ctx context.Context, req *ateapipb.ListActorSnapshotsRequest) (*ateapipb.ListActorSnapshotsResponse, error) {
if errs := validateListActorSnapshotsRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand All @@ -128,7 +128,7 @@ func validateListActorSnapshotsRequest(req *ateapipb.ListActorSnapshotsRequest)
return errs
}

func (s *Service) CreateActorSnapshotTag(ctx context.Context, req *ateapipb.CreateActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
func (s *RpcService) CreateActorSnapshotTag(ctx context.Context, req *ateapipb.CreateActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
if errs := validateCreateActorSnapshotTagRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -180,7 +180,7 @@ func validateCreateActorSnapshotTagRequest(req *ateapipb.CreateActorSnapshotTagR
// may name in an UpdateActorSnapshotTag update_mask.
var actorSnapshotTagMutableFields = fieldmask.NewMutableFields("scope")

func (s *Service) UpdateActorSnapshotTag(ctx context.Context, req *ateapipb.UpdateActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
func (s *RpcService) UpdateActorSnapshotTag(ctx context.Context, req *ateapipb.UpdateActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
if errs := validateUpdateActorSnapshotTagRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -228,7 +228,7 @@ func validateUpdateActorSnapshotTagRequest(req *ateapipb.UpdateActorSnapshotTagR
return errs
}

func (s *Service) DeleteActorSnapshotTag(ctx context.Context, req *ateapipb.DeleteActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
func (s *RpcService) DeleteActorSnapshotTag(ctx context.Context, req *ateapipb.DeleteActorSnapshotTagRequest) (*ateapipb.ActorSnapshotTag, error) {
if errs := validateDeleteActorSnapshotTagRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down
18 changes: 9 additions & 9 deletions cmd/ateapi/internal/controlapi/actor_snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func TestUpdateActorSnapshotTag_FieldMasks(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tt.stored.Metadata = &ateapipb.ResourceMetadata{Atespace: testAtespace, Name: "tag1"}
svc, stored := serviceWithActorSnapshotTag(t, tt.stored)
svc, stored := rpcServiceWithActorSnapshotTag(t, tt.stored)

tt.req.Metadata = stored.GetMetadata()
// Sent but not in the mask - must be ignored.
Expand All @@ -322,7 +322,7 @@ func TestUpdateActorSnapshotTag_FieldMasks(t *testing.T) {
// scope without populating it is rejected.
func TestUpdateActorSnapshotTag_UnsetScopeDoesNotUnpublish(t *testing.T) {
ctx := context.Background()
svc, stored := serviceWithActorSnapshotTag(t, &ateapipb.ActorSnapshotTag{
svc, stored := rpcServiceWithActorSnapshotTag(t, &ateapipb.ActorSnapshotTag{
Metadata: &ateapipb.ResourceMetadata{Atespace: testAtespace, Name: "tag1"},
Scope: ateapipb.ActorSnapshotTagScope_ACTOR_SNAPSHOT_TAG_SCOPE_PUBLISHED,
})
Expand Down Expand Up @@ -354,7 +354,7 @@ func TestUpdateActorSnapshotTag_UnsetScopeDoesNotUnpublish(t *testing.T) {
// creation.
func TestCreateActorSnapshotTag_RejectsUnsetScope(t *testing.T) {
ctx := context.Background()
svc, stored := serviceWithActorSnapshotTag(t, &ateapipb.ActorSnapshotTag{
svc, stored := rpcServiceWithActorSnapshotTag(t, &ateapipb.ActorSnapshotTag{
Metadata: &ateapipb.ResourceMetadata{Atespace: testAtespace, Name: "tag1"},
Scope: ateapipb.ActorSnapshotTagScope_ACTOR_SNAPSHOT_TAG_SCOPE_ATESPACE,
})
Expand All @@ -370,9 +370,9 @@ func TestCreateActorSnapshotTag_RejectsUnsetScope(t *testing.T) {
}
}

// serviceWithActorSnapshotTag seeds an ActorSnapshot and a tag pointing at it
// in a miniredis-backed store, and returns a Service over it.
func serviceWithActorSnapshotTag(t *testing.T, tag *ateapipb.ActorSnapshotTag) (*Service, *ateapipb.ActorSnapshotTag) {
// rpcServiceWithActorSnapshotTag seeds an ActorSnapshot and a tag pointing at it
// in a miniredis-backed store, and returns a RpcService over it.
func rpcServiceWithActorSnapshotTag(t *testing.T, tag *ateapipb.ActorSnapshotTag) (*RpcService, *ateapipb.ActorSnapshotTag) {
t.Helper()
persistence, cleanup := storetest.SetupTestStore(t)
t.Cleanup(cleanup)
Expand All @@ -390,7 +390,7 @@ func serviceWithActorSnapshotTag(t *testing.T, tag *ateapipb.ActorSnapshotTag) (
if err != nil {
t.Fatalf("Failed to CreateActorSnapshotTag: %v", err)
}
return &Service{persistence: persistence}, created
return &RpcService{persistence: persistence}, created
}

// TestUpdateActorSnapshotTag_DeleteRecreateRace checks that an update is not
Expand Down Expand Up @@ -438,7 +438,7 @@ func TestUpdateActorSnapshotTag_DeleteRecreateRace(t *testing.T) {
}
},
}
svc := &Service{persistence: racing}
svc := &RpcService{persistence: racing}

// The client asserts "only update the tag with uid A". Its version guard is
// satisfied by B as well, because re-tagging resets the version to 1: the
Expand Down Expand Up @@ -503,7 +503,7 @@ func TestUpdateActorSnapshotTag_ConcurrentUpdate(t *testing.T) {
}
},
}
svc := &Service{persistence: racing}
svc := &RpcService{persistence: racing}

originalTag.Scope = ateapipb.ActorSnapshotTagScope_ACTOR_SNAPSHOT_TAG_SCOPE_PUBLISHED
_, err = svc.UpdateActorSnapshotTag(ctx, &ateapipb.UpdateActorSnapshotTagRequest{
Expand Down
8 changes: 4 additions & 4 deletions cmd/ateapi/internal/controlapi/actor_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
)

func (s *Service) CreateActorTemplate(ctx context.Context, req *ateapipb.CreateActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
func (s *RpcService) CreateActorTemplate(ctx context.Context, req *ateapipb.CreateActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
if errs := validateCreateActorTemplateRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -148,7 +148,7 @@ func validateCreateActorTemplateRequest(req *ateapipb.CreateActorTemplateRequest
return errs
}

func (s *Service) GetActorTemplate(ctx context.Context, req *ateapipb.GetActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
func (s *RpcService) GetActorTemplate(ctx context.Context, req *ateapipb.GetActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
if errs := validateGetActorTemplateRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -177,7 +177,7 @@ func validateGetActorTemplateRequest(req *ateapipb.GetActorTemplateRequest) fiel
return errs
}

func (s *Service) ListActorTemplates(ctx context.Context, req *ateapipb.ListActorTemplatesRequest) (*ateapipb.ListActorTemplatesResponse, error) {
func (s *RpcService) ListActorTemplates(ctx context.Context, req *ateapipb.ListActorTemplatesRequest) (*ateapipb.ListActorTemplatesResponse, error) {
if errs := validateListActorTemplatesRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -208,7 +208,7 @@ func validateListActorTemplatesRequest(req *ateapipb.ListActorTemplatesRequest)
return errs
}

func (s *Service) DeleteActorTemplate(ctx context.Context, req *ateapipb.DeleteActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
func (s *RpcService) DeleteActorTemplate(ctx context.Context, req *ateapipb.DeleteActorTemplateRequest) (*ateapipb.ActorTemplate, error) {
if errs := validateDeleteActorTemplateRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ateapi/internal/controlapi/actor_template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func TestValidateCreateActorTemplateRequest(t *testing.T) {
// while the atespace is missing, and succeeds once the atespace exists.
func TestCreateActorTemplate(t *testing.T) {
persistence := newTestPersistence(t)
s := &Service{persistence: persistence}
s := &RpcService{persistence: persistence}
ctx := context.Background()
req := func(atespace, name string) *ateapipb.CreateActorTemplateRequest {
return &ateapipb.CreateActorTemplateRequest{ActorTemplate: validActorTemplate(func(tmpl *ateapipb.ActorTemplate) {
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestCreateActorTemplate(t *testing.T) {
// guard.
func TestCreateActorTemplateIgnoresServerOwnedFields(t *testing.T) {
persistence := newTestPersistence(t)
s := &Service{persistence: persistence}
s := &RpcService{persistence: persistence}
ctx := context.Background()

if _, err := persistence.CreateAtespace(ctx, &ateapipb.Atespace{Metadata: &ateapipb.ResourceMetadata{Name: "ns1"}}); err != nil {
Expand Down
14 changes: 7 additions & 7 deletions cmd/ateapi/internal/controlapi/actor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func TestUpdateActor_FieldMasks(t *testing.T) {
tt.stored.Metadata = &ateapipb.ResourceMetadata{Atespace: testAtespace, Name: testActorID}
tt.stored.ActorTemplateNamespace = "ns1"
tt.stored.ActorTemplateName = "tmpl1"
svc, created := serviceWithActor(t, tt.stored)
svc, created := rpcServiceWithActor(t, tt.stored)

tt.req.Metadata = created.GetMetadata()
updated, err := svc.UpdateActor(context.Background(), &ateapipb.UpdateActorRequest{
Expand Down Expand Up @@ -433,7 +433,7 @@ func TestUpdateActor_DeleteRecreateRace(t *testing.T) {
}
},
}
svc := &Service{persistence: racing}
svc := &RpcService{persistence: racing}

// The client asserts "only update the actor with uid A".
original.WorkerSelector = &ateapipb.Selector{MatchLabels: map[string]string{"tier": "paid"}}
Expand Down Expand Up @@ -501,7 +501,7 @@ func TestUpdateActor_ConcurrentDisjointUpdates(t *testing.T) {
}
},
}
svc := &Service{persistence: racing}
svc := &RpcService{persistence: racing}

// Update operation is changing the worker_selector field, not the actor's state (like the concurrent op)
// This update must fail: the racing update bumped the version.
Expand Down Expand Up @@ -561,9 +561,9 @@ func withSelector(labels map[string]string) func(*ateapipb.UpdateActorRequest) {
}
}

// serviceWithActor seeds one actor in a miniredis-backed store and returns a
// Service over it.
func serviceWithActor(t *testing.T, actor *ateapipb.Actor) (*Service, *ateapipb.Actor) {
// rpcServiceWithActor seeds one actor in a miniredis-backed store and returns a
// RpcService over it.
func rpcServiceWithActor(t *testing.T, actor *ateapipb.Actor) (*RpcService, *ateapipb.Actor) {
t.Helper()
persistence, cleanup := storetest.SetupTestStore(t)
t.Cleanup(cleanup)
Expand All @@ -572,7 +572,7 @@ func serviceWithActor(t *testing.T, actor *ateapipb.Actor) (*Service, *ateapipb.
if err != nil {
t.Fatalf("Failed to CreateActor: %v", err)
}
return &Service{persistence: persistence}, created
return &RpcService{persistence: persistence}, created
}

func TestValidateDeleteActorRequest(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/ateapi/internal/controlapi/atespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
)

func (s *Service) CreateAtespace(ctx context.Context, req *ateapipb.CreateAtespaceRequest) (*ateapipb.Atespace, error) {
func (s *RpcService) CreateAtespace(ctx context.Context, req *ateapipb.CreateAtespaceRequest) (*ateapipb.Atespace, error) {
if errs := validateCreateAtespaceRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -74,7 +74,7 @@ func validateCreateAtespaceRequest(req *ateapipb.CreateAtespaceRequest) field.Er
return errs
}

func (s *Service) GetAtespace(ctx context.Context, req *ateapipb.GetAtespaceRequest) (*ateapipb.Atespace, error) {
func (s *RpcService) GetAtespace(ctx context.Context, req *ateapipb.GetAtespaceRequest) (*ateapipb.Atespace, error) {
if errs := validateGetAtespaceRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down Expand Up @@ -103,7 +103,7 @@ func validateGetAtespaceRequest(req *ateapipb.GetAtespaceRequest) field.ErrorLis
return errs
}

func (s *Service) ListAtespaces(ctx context.Context, req *ateapipb.ListAtespacesRequest) (*ateapipb.ListAtespacesResponse, error) {
func (s *RpcService) ListAtespaces(ctx context.Context, req *ateapipb.ListAtespacesRequest) (*ateapipb.ListAtespacesResponse, error) {
if errs := validateListAtespacesRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand All @@ -129,7 +129,7 @@ func validateListAtespacesRequest(req *ateapipb.ListAtespacesRequest) field.Erro
return errs
}

func (s *Service) DeleteAtespace(ctx context.Context, req *ateapipb.DeleteAtespaceRequest) (*ateapipb.Atespace, error) {
func (s *RpcService) DeleteAtespace(ctx context.Context, req *ateapipb.DeleteAtespaceRequest) (*ateapipb.Atespace, error) {
if errs := validateDeleteAtespaceRequest(req); len(errs) > 0 {
return nil, toGRPCStatusError(errs)
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/ateapi/internal/controlapi/functionaltest/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var (

type testContext struct {
mr *miniredis.Miniredis
service *controlapi.Service
service *controlapi.RpcService
client ateapipb.ControlClient
k8sClient kubernetes.Interface
substrateClient versioned.Interface
Expand All @@ -103,7 +103,7 @@ func setupTest(t *testing.T, ns string) *testContext {

// setupTestWithVolumePlugins is setupTest with the default mock volume plugin
// replaced by plugins, keyed by driver name. Tests that need a failure-injecting
// plugin pass it here rather than swapping it into the running Service, so each
// plugin pass it here rather than swapping it into the running RpcService, so each
// test owns its own plugin set.
func setupTestWithVolumePlugins(t *testing.T, ns string, plugins map[string]volume.VolumePluginControlPlane) *testContext {
t.Helper()
Expand Down Expand Up @@ -191,7 +191,7 @@ func setupTestWithVolumePlugins(t *testing.T, ns string, plugins map[string]volu
mockDriverName: mockPlugin,
}
}
service := controlapi.NewService(persistence, wc, actorTemplateLister, workerPoolLister, sandboxConfigLister, csiDriverConfigLister, scLister, dialer, instruments, "", volPlugins)
service := controlapi.NewRpcService(persistence, wc, actorTemplateLister, workerPoolLister, sandboxConfigLister, csiDriverConfigLister, scLister, dialer, instruments, "", volPlugins)

// 5. Start REAL gRPC Server for ATE API
grpcServer := grpc.NewServer(grpc.UnaryInterceptor(ateinterceptors.ServerUnaryInterceptor))
Expand Down
Loading
Loading