remove dedicated logging context and temporary interface

Author: stephybun

internal/logging/context.go

@@ -109,15 +109,6 @@ func ActionContext(ctx context.Context, action string) context.Context {
 	return ctx
 }
 
-// GenerateResourceConfig injects the resource type into logger contexts.
-func GenerateResourceConfigContext(ctx context.Context, action string) context.Context {
-	ctx = tfsdklog.SetField(ctx, KeyGenerateResourceConfigType, action)
-	ctx = tfsdklog.SubsystemSetField(ctx, SubsystemProto, KeyGenerateResourceConfigType, action)
-	ctx = tflog.SetField(ctx, KeyGenerateResourceConfigType, action)
-
-	return ctx
-}
-
 // RpcContext injects the RPC name into logger contexts.
 func RpcContext(ctx context.Context, rpc string) context.Context {
 	ctx = tfsdklog.SetField(ctx, KeyRPC, rpc)

internal/logging/keys.go

@@ -66,9 +66,6 @@ const (
 	// The action being operated on
 	KeyActionType = "tf_action_type"
 
-	// The type of resource being operated on
-	KeyGenerateResourceConfigType = "tf_generate_resource_config_type"
-
 	// Path to protocol data file, such as "/tmp/example.json"
 	KeyProtocolDataFile = "tf_proto_data_file"
 
@@ -87,7 +84,7 @@ const (
 	// Whether the PlanDestroy server capability is enabled
 	KeyServerCapabilityPlanDestroy = "tf_server_capability_plan_destroy"
 
-	// Whether the PlanDestroy server capability is enabled
+	// Whether the GenerateResourceConfig server capability is enabled
 	KeyServerCapabilityGenerateResourceConfig = "tf_server_capability_generate_resource_config"
 
 	// Whether the DeferralAllowed client capability is enabled

tfprotov5/provider.go

@@ -93,21 +93,6 @@ type ProviderServerWithListResource interface {
 	ListResourceServer
 }
 
-// ProviderServerGenerateResourceConfig is a temporary interface for servers
-// to implement the GenerateResourceConfig RPC
-//
-// - GenerateResourceConfig
-//
-// Deprecated: All methods will be moved into the
-// ProviderServer interface and this interface will be removed in a future
-// version.
-type ProviderServerGenerateResourceConfig interface {
-	ProviderServer
-
-	// GenerateResourceConfig is an interface encapsulating the GenerateResourceConfig RPC request.
-	GenerateResourceConfig(context.Context, *GenerateResourceConfigRequest) (*GenerateResourceConfigResponse, error)
-}
-
 // ProviderServerWithActions is a temporary interface for servers
 // to implement Action RPCs
 //

tfprotov5/resource.go

@@ -70,15 +70,14 @@ type ResourceServer interface {
 	// identity state to upgrade it to the latest state schema.
 	UpgradeResourceIdentity(context.Context, *UpgradeResourceIdentityRequest) (*UpgradeResourceIdentityResponse, error)
 
-	// TODO: Once this interface is no longer optional we can uncomment this
 	// GenerateResourceConfig is called when Terraform wants to generate a resource
 	// configuration for importing to a resource address that doesn't exist yet.
 	// It is called during a plan when the -generate-config-out flag is provided.
 	//
 	// This functionality is only supported in Terraform 1.14 and later. The
 	// provider must have enabled the GenerateResourceConfig server capability to
 	// enable these requests.
-	// GenerateResourceConfig(context.Context, *GenerateResourceConfigRequest) (*GenerateResourceConfigResponse, error)
+	GenerateResourceConfig(context.Context, *GenerateResourceConfigRequest) (*GenerateResourceConfigResponse, error)
 }
 
 // ValidateResourceTypeConfigRequest is the request Terraform sends when it

tfprotov5/tf5server/server.go

@@ -456,7 +456,7 @@ func (s *server) stoppableContext(ctx context.Context) context.Context {
 // terraform-plugin-log loggers injected.
 func (s *server) loggingContext(ctx context.Context) context.Context {
 	if s.useTFLogSink {
-		ctx = tfsdklog.ContextWithTestLogging(ctx, s.testHandle.Name())
+		//ctx = tfsdklog.ContextWithStandardLogging(ctx, s.testHandle.Name())
 	}
 
 	ctx = logging.InitContext(ctx, s.tflogSDKOpts, s.tflogOpts)
@@ -1488,7 +1488,7 @@ func (s *server) GenerateResourceConfig(ctx context.Context, protoReq *tfplugin5
 	rpc := "GenerateResourceConfig"
 	ctx = s.loggingContext(ctx)
 	ctx = logging.RpcContext(ctx, rpc)
-	ctx = logging.GenerateResourceConfigContext(ctx, protoReq.TypeName)
+	ctx = logging.ResourceContext(ctx, protoReq.TypeName)
 	ctx = s.stoppableContext(ctx)
 	logging.ProtocolTrace(ctx, "Received request")
 	defer logging.ProtocolTrace(ctx, "Served request")
@@ -1499,31 +1499,7 @@ func (s *server) GenerateResourceConfig(ctx context.Context, protoReq *tfplugin5
 
 	ctx = tf5serverlogging.DownstreamRequest(ctx)
 
-	// TODO: Remove this check and error in preference of
-	// s.downstream.GenerateResourceConfig below once ProviderServer interface
-	// implements this RPC method.
-	// nolint:staticcheck
-	generateResourceConfigProviderServer, ok := s.downstream.(tfprotov5.ProviderServerGenerateResourceConfig)
-	if !ok {
-		logging.ProtocolError(ctx, "ProviderServer does not implement GenerateResourceConfig")
-
-		protoResp := &tfplugin5.GenerateResourceConfig_Response{
-			Diagnostics: []*tfplugin5.Diagnostic{
-				{
-					Severity: tfplugin5.Diagnostic_ERROR,
-					Summary:  "Provider GenerateResourceConfig Not Implemented",
-					Detail: "A GenerateResourceConfig call was received by the provider, however the provider does not implement the call. " +
-						"Either upgrade the provider to a version that implements action support or this is a bug in Terraform that should be reported to the Terraform maintainers.",
-				},
-			},
-		}
-
-		return protoResp, nil
-	}
-
-	// TODO: Update this to call downstream once optional interface is removed
-	// resp, err := s.downstream.GenerateResourceConfig(ctx, req)
-	resp, err := generateResourceConfigProviderServer.GenerateResourceConfig(ctx, req)
+	resp, err := s.downstream.GenerateResourceConfig(ctx, req)
 	if err != nil {
 		logging.ProtocolError(ctx, "Error from downstream", map[string]any{logging.KeyError: err})
 		return nil, err

tfprotov6/tf6server/server.go

@@ -456,7 +456,7 @@ func (s *server) stoppableContext(ctx context.Context) context.Context {
 // terraform-plugin-log loggers injected.
 func (s *server) loggingContext(ctx context.Context) context.Context {
 	if s.useTFLogSink {
-		ctx = tfsdklog.ContextWithTestLogging(ctx, s.testHandle.Name())
+		//ctx = tfsdklog.ContextWithStandardLogging(ctx, s.testHandle.Name())
 	}
 
 	ctx = logging.InitContext(ctx, s.tflogSDKOpts, s.tflogOpts)