s/Capabilities/ServerCapabilities/

docs/plugin-protocol/tfplugin5.3.proto

@@ -157,15 +157,15 @@ message GetProviderSchema {
         map<string, Schema> data_source_schemas = 3;
         repeated Diagnostic diagnostics = 4;
         Schema provider_meta = 5;
-        Capabilities capabilities = 6;
+        ServerCapabilities server_capabilities = 6;
     }
 
 
-    // Capabilities allows providers to communicate extra information regarding
-    // supported protocol features. This is used to indicate availability of
-    // certain forward-compatible changes which may be optional in a major
-    // protocol version, but cannot be tested for directly.
-    message Capabilities {
+    // ServerCapabilities allows providers to communicate extra information
+    // regarding supported protocol features. This is used to indicate
+    // availability of certain forward-compatible changes which may be optional
+    // in a major protocol version, but cannot be tested for directly.
+    message ServerCapabilities {
         // The plan_destroy capability signals that a provider expects a call
         // to PlanResourceChange when a resource is going to be destroyed.
         bool plan_destroy = 1;

docs/plugin-protocol/tfplugin6.3.proto

@@ -176,15 +176,15 @@ message GetProviderSchema {
         map<string, Schema> data_source_schemas = 3;
         repeated Diagnostic diagnostics = 4;
         Schema provider_meta = 5;
-        Capabilities capabilities = 6;
+        ServerCapabilities server_capabilities = 6;
     }
 
 
-    // Capabilities allows providers to communicate extra information regarding
-    // supported protocol features. This is used to indicate availability of
-    // certain forward-compatible changes which may be optional in a major
-    // protocol version, but cannot be tested for directly.
-    message Capabilities {
+    // ServerCapabilities allows providers to communicate extra information
+    // regarding supported protocol features. This is used to indicate
+    // availability of certain forward-compatible changes which may be optional
+    // in a major protocol version, but cannot be tested for directly.
+    message ServerCapabilities {
         // The plan_destroy capability signals that a provider expects a call
         // to PlanResourceChange when a resource is going to be destroyed.
         bool plan_destroy = 1;

internal/grpcwrap/provider.go

@@ -59,8 +59,8 @@ func (p *provider) GetSchema(_ context.Context, req *tfplugin5.GetProviderSchema
 		}
 	}
 
-	resp.Capabilities = &tfplugin5.GetProviderSchema_Capabilities{
-		PlanDestroy: p.schema.Capabilities.PlanDestroy,
+	resp.ServerCapabilities = &tfplugin5.GetProviderSchema_ServerCapabilities{
+		PlanDestroy: p.schema.ServerCapabilities.PlanDestroy,
 	}
 
 	// include any diagnostics from the original GetSchema call

internal/grpcwrap/provider6.go

@@ -59,8 +59,8 @@ func (p *provider6) GetProviderSchema(_ context.Context, req *tfplugin6.GetProvi
 		}
 	}
 
-	resp.Capabilities = &tfplugin6.GetProviderSchema_Capabilities{
-		PlanDestroy: p.schema.Capabilities.PlanDestroy,
+	resp.ServerCapabilities = &tfplugin6.GetProviderSchema_ServerCapabilities{
+		PlanDestroy: p.schema.ServerCapabilities.PlanDestroy,
 	}
 
 	// include any diagnostics from the original GetSchema call

internal/plugin/grpc_provider.go

@@ -130,8 +130,8 @@ func (p *GRPCProvider) GetProviderSchema() (resp providers.GetProviderSchemaResp
 		resp.DataSources[name] = convert.ProtoToProviderSchema(data)
 	}
 
-	if protoResp.Capabilities != nil {
-		resp.Capabilities.PlanDestroy = protoResp.Capabilities.PlanDestroy
+	if protoResp.ServerCapabilities != nil {
+		resp.ServerCapabilities.PlanDestroy = protoResp.ServerCapabilities.PlanDestroy
 	}
 
 	p.schemas = resp
@@ -415,7 +415,7 @@ func (p *GRPCProvider) PlanResourceChange(r providers.PlanResourceChangeRequest)
 	}
 
 	metaSchema := schema.ProviderMeta
-	capabilities := schema.Capabilities
+	capabilities := schema.ServerCapabilities
 
 	// If the provider doesn't support planning a destroy operation, we can
 	// return immediately.

internal/plugin6/grpc_provider.go

@@ -100,7 +100,10 @@ func (p *GRPCProvider) GetProviderSchema() (resp providers.GetProviderSchemaResp
 	// grpc response size limit is 4MB. 64MB should cover most any use case, and
 	// if we get providers nearing that we may want to consider a finer-grained
 	// API to fetch individual resource schemas.
-	// Note: this option is marked as EXPERIMENTAL in the grpc API.
+	// Note: this option is marked as EXPERIMENTAL in the grpc API. We keep
+	// this for compatibility, but recent providers all set the max message
+	// size much higher on the server side, which is the supported method for
+	// determining payload size.
 	const maxRecvSize = 64 << 20
 	protoResp, err := p.client.GetProviderSchema(p.ctx, new(proto6.GetProviderSchema_Request), grpc.MaxRecvMsgSizeCallOption{MaxRecvMsgSize: maxRecvSize})
 	if err != nil {
@@ -134,8 +137,8 @@ func (p *GRPCProvider) GetProviderSchema() (resp providers.GetProviderSchemaResp
 		resp.DataSources[name] = convert.ProtoToProviderSchema(data)
 	}
 
-	if protoResp.Capabilities != nil {
-		resp.Capabilities.PlanDestroy = protoResp.Capabilities.PlanDestroy
+	if protoResp.ServerCapabilities != nil {
+		resp.ServerCapabilities.PlanDestroy = protoResp.ServerCapabilities.PlanDestroy
 	}
 
 	p.schemas = resp
@@ -408,7 +411,7 @@ func (p *GRPCProvider) PlanResourceChange(r providers.PlanResourceChangeRequest)
 	}
 
 	metaSchema := schema.ProviderMeta
-	capabilities := schema.Capabilities
+	capabilities := schema.ServerCapabilities
 
 	// If the provider doesn't support planning a destroy operation, we can
 	// return immediately.

internal/provider-simple-v6/provider.go

@@ -43,7 +43,7 @@ func Provider() providers.Interface {
 			DataSources: map[string]providers.Schema{
 				"simple_resource": simpleResource,
 			},
-			Capabilities: providers.Capabilities{
+			ServerCapabilities: providers.ServerCapabilities{
 				PlanDestroy: true,
 			},
 		},

internal/provider-simple/provider.go

@@ -42,7 +42,7 @@ func Provider() providers.Interface {
 			DataSources: map[string]providers.Schema{
 				"simple_resource": simpleResource,
 			},
-			Capabilities: providers.Capabilities{
+			ServerCapabilities: providers.ServerCapabilities{
 				PlanDestroy: true,
 			},
 		},

internal/providers/provider.go

@@ -86,15 +86,15 @@ type GetProviderSchemaResponse struct {
 	// Diagnostics contains any warnings or errors from the method call.
 	Diagnostics tfdiags.Diagnostics
 
-	// Capabilities lists optional features supported by the provider.
-	Capabilities Capabilities
+	// ServerCapabilities lists optional features supported by the provider.
+	ServerCapabilities ServerCapabilities
 }
 
-// Capabilities allows providers to communicate extra information regarding
-// supported protocol features. This is used to indicate availability of
-// certain forward-compatible changes which may be optional in a major protocol
-// version, but cannot be tested for directly.
-type Capabilities struct {
+// ServerCapabilities allows providers to communicate extra information
+// regarding supported protocol features. This is used to indicate availability
+// of certain forward-compatible changes which may be optional in a major
+// protocol version, but cannot be tested for directly.
+type ServerCapabilities struct {
 	// PlanDestroy signals that this provider expects to receive a
 	// PlanResourceChange call for resources that are to be destroyed.
 	PlanDestroy bool