Adapt protocol changes

hashicorp · Mar 10, 2025 · fd2a73f · fd2a73f
1 parent 417ef49
commit fd2a73f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/internal/grpcwrap/provider.go b/internal/grpcwrap/provider.go
@@ -566,7 +566,7 @@ func (p *provider) UpgradeResourceIdentity(_ context.Context, req *tfplugin5.Upg
 	upgradeResp := p.provider.UpgradeResourceIdentity(providers.UpgradeResourceIdentityRequest{
 		TypeName:        req.TypeName,
 		Version:         req.Version,
-		RawIdentityJSON: req.RawIdentity,
+		RawIdentityJSON: req.RawIdentity.Json,
 	})
 	resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, upgradeResp.Diagnostics)
 	if upgradeResp.Diagnostics.HasErrors() {

diff --git a/internal/grpcwrap/provider6.go b/internal/grpcwrap/provider6.go
@@ -617,7 +617,7 @@ func (p *provider6) UpgradeResourceIdentity(_ context.Context, req *tfplugin6.Up
 	upgradeResp := p.provider.UpgradeResourceIdentity(providers.UpgradeResourceIdentityRequest{
 		TypeName:        req.TypeName,
 		Version:         req.Version,
-		RawIdentityJSON: req.RawIdentity,
+		RawIdentityJSON: req.RawIdentity.Json,
 	})
 	resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, upgradeResp.Diagnostics)
 

diff --git a/internal/plugin/grpc_provider.go b/internal/plugin/grpc_provider.go
@@ -387,9 +387,11 @@ func (p *GRPCProvider) UpgradeResourceIdentity(r providers.UpgradeResourceIdenti
 	}
 
 	protoReq := &proto.UpgradeResourceIdentity_Request{
-		TypeName:    r.TypeName,
-		Version:     int64(r.Version),
-		RawIdentity: r.RawIdentityJSON,
+		TypeName: r.TypeName,
+		Version:  int64(r.Version),
+		RawIdentity: &proto.RawState{
+			Json: r.RawIdentityJSON,
+		},
 	}
 
 	protoResp, err := p.client.UpgradeResourceIdentity(p.ctx, protoReq)

diff --git a/internal/plugin6/grpc_provider.go b/internal/plugin6/grpc_provider.go
@@ -382,9 +382,11 @@ func (p *GRPCProvider) UpgradeResourceIdentity(r providers.UpgradeResourceIdenti
 	}
 
 	protoReq := &proto6.UpgradeResourceIdentity_Request{
-		TypeName:    r.TypeName,
-		Version:     int64(r.Version),
-		RawIdentity: r.RawIdentityJSON,
+		TypeName: r.TypeName,
+		Version:  int64(r.Version),
+		RawIdentity: &proto6.RawState{
+			Json: r.RawIdentityJSON,
+		},
 	}
 
 	protoResp, err := p.client.UpgradeResourceIdentity(p.ctx, protoReq)