remove support for flatmap format

hashicorp · Jan 9, 2024 · 92de399 · 92de399
1 parent 5ca56a9
commit 92de399
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/docs/plugin-protocol/tfplugin5.5.proto b/docs/plugin-protocol/tfplugin5.5.proto
@@ -477,7 +477,9 @@ message MoveResourceState {
         // moved from.
         int64 source_schema_version = 3;
 
-        // The raw state of the resource being moved.
+        // The raw state of the resource being moved. Only the json field is
+        // populated, as there should be no legacy providers using the flatmap
+        // format that support newly introduced RPCs.
         RawState source_state = 4;
 
         // The resource type that the resource is being moved to.

diff --git a/docs/plugin-protocol/tfplugin6.5.proto b/docs/plugin-protocol/tfplugin6.5.proto
@@ -494,7 +494,9 @@ message MoveResourceState {
         // moved from.
         int64 source_schema_version = 3;
 
-        // The raw state of the resource being moved.
+        // The raw state of the resource being moved. Only the json field is
+        // populated, as there should be no legacy providers using the flatmap
+        // format that support newly introduced RPCs.
         RawState source_state = 4;
 
         // The resource type that the resource is being moved to.

diff --git a/internal/plugin/grpc_provider.go b/internal/plugin/grpc_provider.go
@@ -640,8 +640,7 @@ func (p *GRPCProvider) MoveResourceState(r providers.MoveResourceStateRequest) (
 		SourceTypeName:        r.SourceTypeName,
 		SourceSchemaVersion:   r.SourceSchemaVersion,
 		SourceState: &proto.RawState{
-			Json:    r.SourceStateJSON,
-			Flatmap: r.SourceStateFlatmap,
+			Json: r.SourceStateJSON,
 		},
 		TargetTypeName: r.TargetTypeName,
 	}

diff --git a/internal/plugin6/grpc_provider.go b/internal/plugin6/grpc_provider.go
@@ -629,8 +629,7 @@ func (p *GRPCProvider) MoveResourceState(r providers.MoveResourceStateRequest) (
 		SourceTypeName:        r.SourceTypeName,
 		SourceSchemaVersion:   r.SourceSchemaVersion,
 		SourceState: &proto6.RawState{
-			Json:    r.SourceStateJSON,
-			Flatmap: r.SourceStateFlatmap,
+			Json: r.SourceStateJSON,
 		},
 		TargetTypeName: r.TargetTypeName,
 	}

diff --git a/internal/providers/provider.go b/internal/providers/provider.go
@@ -406,14 +406,10 @@ type MoveResourceStateRequest struct {
 	// resource is being moved from.
 	SourceSchemaVersion int64
 
-	// SourceStateJSON and SourceStateFlatmap contain the state of the resource
-	// that is being moved. Because the schema is unknown, this contains only
-	// the raw data as stored in the state.
-	// SourceStateJSON is the current json state encoding.
-	// SourceStateFlatmap is the legacy flatmap encoding.
-	// Only one of these fields may be set for the move request.
-	SourceStateJSON    []byte
-	SourceStateFlatmap map[string]string
+	// SourceStateJSON contains the state of the resource that is being moved.
+	// Because the schema is unknown, this contains only the raw data as stored
+	// in the state.
+	SourceStateJSON []byte
 
 	// TargetTypeName is the name of the resource type that the resource is
 	// being moved to.