grpcservice: align with finalized AllowedGRPCService API

Author: mbissa

internal/xds/bootstrap/bootstrap.go

@@ -643,10 +643,10 @@ func (c *Config) AllowedGRPCServices() AllowedGRPCServices {
 	return c.allowedGRPCServices
 }
 
-// AllowedGrpcService returns the allowed gRPC service configured for the
+// AllowedGRPCService returns the allowed gRPC service configured for the
 // given target URI, if any.
-func (c *Config) AllowedGrpcService(targetURI string) (*AllowedGrpcService, bool) {
-	svc, ok := c.allowedGrpcServices[targetURI]
+func (c *Config) AllowedGRPCService(targetURI string) (*AllowedGRPCService, bool) {
+	svc, ok := c.allowedGRPCServices[targetURI]
 	return svc, ok
 }
 

internal/xds/grpcservice/grpcservice.go

@@ -116,7 +116,7 @@ func (g *GrpcService) Parse(gs *v3corepb.GrpcService) (Config, error) {
 		// allowlist, but the credentials themselves are resolved later,
 		// at channel creation time; they are left empty in the parsed
 		// config here.
-		allowedSvc, ok := g.config.AllowedGrpcService(targetURI)
+		allowedSvc, ok := g.config.AllowedGRPCService(targetURI)
 		if !ok {
 			return Config{}, fmt.Errorf("grpcservice: target_uri %q is not present in allowed_grpc_services", targetURI)
 		}

internal/xds/grpcservice/grpcservice_test.go

@@ -25,6 +25,8 @@ import (
 
 	v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	"github.com/google/go-cmp/cmp"
+	"google.golang.org/grpc/internal/envconfig"
+	"google.golang.org/grpc/internal/testutils"
 	"google.golang.org/grpc/internal/xds/bootstrap"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/types/known/anypb"
@@ -40,7 +42,7 @@ func bootstrapConfig(t *testing.T, allowed string) *bootstrap.Config {
 	contents, err := bootstrap.NewContentsForTesting(bootstrap.ConfigOptionsForTesting{
 		Servers:             json.RawMessage(`[{"server_uri":"td.googleapis.com:443","channel_creds":[{"type":"insecure"}]}]`),
 		Node:                json.RawMessage(`{}`),
-		AllowedGrpcServices: json.RawMessage(allowed),
+		AllowedGRPCServices: json.RawMessage(allowed),
 	})
 	if err != nil {
 		t.Fatalf("NewContentsForTesting() failed: %v", err)
@@ -65,6 +67,10 @@ func googleGrpcService(target string, channelPlugins []*anypb.Any, timeout *dura
 }
 
 func TestParse(t *testing.T) {
+	// The allowed_grpc_services bootstrap field is parsed only when a
+	// consuming feature is enabled.
+	testutils.SetEnvConfig(t, &envconfig.XDSClientExtProcEnabled, true)
+
 	insecurePlugin := &anypb.Any{TypeUrl: insecureCredsTypeURL}
 	allowedInsecure := `{"dns:///my-service:443":{"channel_creds":[{"type":"insecure"}]}}`