From 58c7313082f2c04fc7b71ea40dfdf934cf4ffdba Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Tue, 19 Apr 2022 10:16:01 -0400 Subject: [PATCH] tfsdk: Switch UpgradeResourceState tfsdklog to internal/logging --- tfsdk/serve.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tfsdk/serve.go b/tfsdk/serve.go index d23670814..1ef7acd4b 100644 --- a/tfsdk/serve.go +++ b/tfsdk/serve.go @@ -554,7 +554,7 @@ func (s *server) upgradeResourceState(ctx context.Context, req *tfprotov6.Upgrad // unit test helper. // Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/113 if req.Version == resourceSchema.Version { - tfsdklog.Trace(ctx, "UpgradeResourceState request version matches current Schema version, using framework defined passthrough implementation") + logging.FrameworkTrace(ctx, "UpgradeResourceState request version matches current Schema version, using framework defined passthrough implementation") resourceSchemaType := resourceSchema.TerraformType(ctx) @@ -635,7 +635,7 @@ func (s *server) upgradeResourceState(ctx context.Context, req *tfprotov6.Upgrad } if resourceStateUpgrader.PriorSchema != nil { - tfsdklog.Trace(ctx, "Initializing populated UpgradeResourceStateRequest state from provider defined prior schema and request RawState") + logging.FrameworkTrace(ctx, "Initializing populated UpgradeResourceStateRequest state from provider defined prior schema and request RawState") priorSchemaType := resourceStateUpgrader.PriorSchema.TerraformType(ctx) @@ -667,9 +667,9 @@ func (s *server) upgradeResourceState(ctx context.Context, req *tfprotov6.Upgrad // by calling the equivalent of SetAttribute(GetAttribute()) and skipping // any errors. - tfsdklog.Debug(ctx, "Calling provider defined StateUpgrader") + logging.FrameworkDebug(ctx, "Calling provider defined StateUpgrader") resourceStateUpgrader.StateUpgrader(ctx, upgradeResourceStateRequest, &upgradeResourceStateResponse) - tfsdklog.Debug(ctx, "Called provider defined StateUpgrader") + logging.FrameworkDebug(ctx, "Called provider defined StateUpgrader") resp.Diagnostics.Append(upgradeResourceStateResponse.Diagnostics...) @@ -678,7 +678,7 @@ func (s *server) upgradeResourceState(ctx context.Context, req *tfprotov6.Upgrad } if upgradeResourceStateResponse.DynamicValue != nil { - tfsdklog.Trace(ctx, "UpgradeResourceStateResponse DynamicValue set, overriding State") + logging.FrameworkTrace(ctx, "UpgradeResourceStateResponse DynamicValue set, overriding State") resp.UpgradedState = upgradeResourceStateResponse.DynamicValue return }