refactor: rename list validate function

hashicorp · Nov 3, 2023 · 1cf2c79 · 1cf2c79
1 parent 82f7ad9
commit 1cf2c79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/agent/grpc-external/services/resource/watch.go b/agent/grpc-external/services/resource/watch.go
@@ -16,7 +16,7 @@ import (
 )
 
 func (s *Server) WatchList(req *pbresource.WatchListRequest, stream pbresource.ResourceService_WatchListServer) error {
-	reg, err := s.validateWatchListRequest(req)
+	reg, err := s.ensureWatchListRequestValid(req)
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func (s *Server) WatchList(req *pbresource.WatchListRequest, stream pbresource.R
 	}
 }
 
-func (s *Server) validateWatchListRequest(req *pbresource.WatchListRequest) (*resource.Registration, error) {
+func (s *Server) ensureWatchListRequestValid(req *pbresource.WatchListRequest) (*resource.Registration, error) {
 	if req.Type == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "type is required")
 	}
@@ -104,7 +104,7 @@ func (s *Server) validateWatchListRequest(req *pbresource.WatchListRequest) (*re
 
 	// if no tenancy is passed defaults to wildcard
 	if req.Tenancy == nil {
-		req.Tenancy = getDefaultTenancy(reg.Scope)
+		req.Tenancy = wildcardTenancyFor(reg.Scope)
 	}
 
 	if err = checkV2Tenancy(s.UseV2Tenancy, req.Type); err != nil {
@@ -123,7 +123,7 @@ func (s *Server) validateWatchListRequest(req *pbresource.WatchListRequest) (*re
 	return reg, nil
 }
 
-func getDefaultTenancy(scope resource.Scope) *pbresource.Tenancy {
+func wildcardTenancyFor(scope resource.Scope) *pbresource.Tenancy {
 	var defaultTenancy *pbresource.Tenancy
 
 	switch scope {

diff --git a/agent/grpc-external/services/resource/watch_test.go b/agent/grpc-external/services/resource/watch_test.go
@@ -407,7 +407,6 @@ func TestWatchList_NoTenancy(t *testing.T) {
 	require.NoError(t, err)
 	rspCh := handleResourceStream(t, stream)
 
-	// Testcase will pick one of recordLabel or artist based on scope of type.
 	recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
 	require.NoError(t, err)