move the check for XDSBootstrapCallCredsEnabled when unmarshalling bootstrap config

Author: dimpavloff

internal/xds/bootstrap/bootstrap.go

@@ -349,25 +349,27 @@ func (sc *ServerConfig) UnmarshalJSON(data []byte) error {
 		break
 	}
 
-	// Process call credentials - unlike channel creds, we use ALL supported
-	// types. Also, call credentials are optional as per gRFC A97.
-	for _, callCredConfig := range server.CallCreds {
-		c := bootstrap.GetCallCredentials(callCredConfig.Type)
-		if c == nil {
-			// Skip unsupported call credential types (don't fail bootstrap).
-			continue
-		}
-		callCred, cancel, err := c.Build(callCredConfig.Config)
-		if err != nil {
-			// Call credential validation failed - this should fail bootstrap.
-			return fmt.Errorf("failed to build call credentials from bootstrap for %q: %v", callCredConfig.Type, err)
-		}
-		if callCred == nil {
-			continue
+	if envconfig.XDSBootstrapCallCredsEnabled {
+		// Process call credentials - unlike channel creds, we use ALL supported
+		// types. Also, call credentials are optional as per gRFC A97.
+		for _, callCredConfig := range server.CallCreds {
+			c := bootstrap.GetCallCredentials(callCredConfig.Type)
+			if c == nil {
+				// Skip unsupported call credential types (don't fail bootstrap).
+				continue
+			}
+			callCred, cancel, err := c.Build(callCredConfig.Config)
+			if err != nil {
+				// Call credential validation failed - this should fail bootstrap.
+				return fmt.Errorf("failed to build call credentials from bootstrap for %q: %v", callCredConfig.Type, err)
+			}
+			if callCred == nil {
+				continue
+			}
+			sc.selectedCallCreds = append(sc.selectedCallCreds, callCred)
+			sc.extraDialOptions = append(sc.extraDialOptions, grpc.WithPerRPCCredentials(callCred))
+			sc.cleanups = append(sc.cleanups, cancel)
 		}
-		sc.selectedCallCreds = append(sc.selectedCallCreds, callCred)
-		sc.extraDialOptions = append(sc.extraDialOptions, grpc.WithPerRPCCredentials(callCred))
-		sc.cleanups = append(sc.cleanups, cancel)
 	}
 
 	if sc.serverURI == "" {

xds/bootstrap/bootstrap.go

@@ -29,7 +29,6 @@ import (
 	"encoding/json"
 
 	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/internal/envconfig"
 )
 
 // channelCredsRegistry is a map from credential type name to ChannelCredential builder.
@@ -91,9 +90,6 @@ func RegisterCallCredentials(c CallCredentials) {
 // GetCallCredentials returns the credentials associated with a given name.
 // If no credentials are registered with the name, nil will be returned.
 func GetCallCredentials(name string) CallCredentials {
-	if name == "jwt_token_file" && !envconfig.XDSBootstrapCallCredsEnabled {
-		return nil
-	}
 	if c, ok := callCredsRegistry[name]; ok {
 		return c
 	}