logging: add missing capability MoveResourceState (#432)

grongor · web-flow · commit 94d8cc586c20 · 2024-09-17T16:27:19.000-04:00
* logging: add missing capability MoveResourceState

---------
diff --git a/.changes/unreleased/BUG FIXES-20240917-162414.yaml b/.changes/unreleased/BUG FIXES-20240917-162414.yaml
@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: 'logging: Add existing `MoveResourceState` server capability to v5 and v6 logging'
+time: 2024-09-17T16:24:14.06442-04:00
+custom:
+  Issue: "432"
diff --git a/internal/logging/keys.go b/internal/logging/keys.go
@@ -69,6 +69,9 @@ const (
 	// Whether the GetProviderSchemaOptional server capability is enabled
 	KeyServerCapabilityGetProviderSchemaOptional = "tf_server_capability_get_provider_schema_optional"
 
+	// Whether the MoveResourceState server capability is enabled
+	KeyServerCapabilityMoveResourceState = "tf_server_capability_move_resource_state"
+
 	// Whether the PlanDestroy server capability is enabled
 	KeyServerCapabilityPlanDestroy = "tf_server_capability_plan_destroy"
 
diff --git a/tfprotov5/internal/tf5serverlogging/server_capabilities.go b/tfprotov5/internal/tf5serverlogging/server_capabilities.go
@@ -14,11 +14,13 @@ import (
 func ServerCapabilities(ctx context.Context, capabilities *tfprotov5.ServerCapabilities) {
 	responseFields := map[string]interface{}{
 		logging.KeyServerCapabilityGetProviderSchemaOptional: false,
+		logging.KeyServerCapabilityMoveResourceState:         false,
 		logging.KeyServerCapabilityPlanDestroy:               false,
 	}
 
 	if capabilities != nil {
 		responseFields[logging.KeyServerCapabilityGetProviderSchemaOptional] = capabilities.GetProviderSchemaOptional
+		responseFields[logging.KeyServerCapabilityMoveResourceState] = capabilities.MoveResourceState
 		responseFields[logging.KeyServerCapabilityPlanDestroy] = capabilities.PlanDestroy
 	}
 
diff --git a/tfprotov5/internal/tf5serverlogging/server_capabilities_test.go b/tfprotov5/internal/tf5serverlogging/server_capabilities_test.go
@@ -31,6 +31,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -43,6 +44,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -57,6 +59,22 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": true,
+					"tf_server_capability_move_resource_state":          false,
+					"tf_server_capability_plan_destroy":                 false,
+				},
+			},
+		},
+		"move_resource_state": {
+			capabilities: &tfprotov5.ServerCapabilities{
+				MoveResourceState: true,
+			},
+			expected: []map[string]interface{}{
+				{
+					"@level":   "trace",
+					"@message": "Announced server capabilities",
+					"@module":  "sdk.proto",
+					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          true,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -71,6 +89,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 true,
 				},
 			},
diff --git a/tfprotov6/internal/tf6serverlogging/server_capabilities.go b/tfprotov6/internal/tf6serverlogging/server_capabilities.go
@@ -14,11 +14,13 @@ import (
 func ServerCapabilities(ctx context.Context, capabilities *tfprotov6.ServerCapabilities) {
 	responseFields := map[string]interface{}{
 		logging.KeyServerCapabilityGetProviderSchemaOptional: false,
+		logging.KeyServerCapabilityMoveResourceState:         false,
 		logging.KeyServerCapabilityPlanDestroy:               false,
 	}
 
 	if capabilities != nil {
 		responseFields[logging.KeyServerCapabilityGetProviderSchemaOptional] = capabilities.GetProviderSchemaOptional
+		responseFields[logging.KeyServerCapabilityMoveResourceState] = capabilities.MoveResourceState
 		responseFields[logging.KeyServerCapabilityPlanDestroy] = capabilities.PlanDestroy
 	}
 
diff --git a/tfprotov6/internal/tf6serverlogging/server_capabilities_test.go b/tfprotov6/internal/tf6serverlogging/server_capabilities_test.go
@@ -31,6 +31,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -43,6 +44,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -57,6 +59,22 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": true,
+					"tf_server_capability_move_resource_state":          false,
+					"tf_server_capability_plan_destroy":                 false,
+				},
+			},
+		},
+		"move_resource_state": {
+			capabilities: &tfprotov6.ServerCapabilities{
+				MoveResourceState: true,
+			},
+			expected: []map[string]interface{}{
+				{
+					"@level":   "trace",
+					"@message": "Announced server capabilities",
+					"@module":  "sdk.proto",
+					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          true,
 					"tf_server_capability_plan_destroy":                 false,
 				},
 			},
@@ -71,6 +89,7 @@ func TestServerCapabilities(t *testing.T) {
 					"@message": "Announced server capabilities",
 					"@module":  "sdk.proto",
 					"tf_server_capability_get_provider_schema_optional": false,
+					"tf_server_capability_move_resource_state":          false,
 					"tf_server_capability_plan_destroy":                 true,
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,13 @@ import (`
`14`	`14`	`func ServerCapabilities(ctx context.Context, capabilities *tfprotov5.ServerCapabilities) {`
`15`	`15`	`responseFields := map[string]interface{}{`
`16`	`16`	`logging.KeyServerCapabilityGetProviderSchemaOptional: false,`
	`17`	`+ logging.KeyServerCapabilityMoveResourceState: false,`
`17`	`18`	`logging.KeyServerCapabilityPlanDestroy: false,`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`if capabilities != nil {`
`21`	`22`	`responseFields[logging.KeyServerCapabilityGetProviderSchemaOptional] = capabilities.GetProviderSchemaOptional`
	`23`	`+ responseFields[logging.KeyServerCapabilityMoveResourceState] = capabilities.MoveResourceState`
`22`	`24`	`responseFields[logging.KeyServerCapabilityPlanDestroy] = capabilities.PlanDestroy`
`23`	`25`	`}`
`24`	`26`