actions: remove future action types

removing them for now, this gives us more flexibility in the future since the schema is not yet locked in

Author: DanielMSchmidt

docs/plugin-protocol/tfplugin5.proto

@@ -146,47 +146,14 @@ message ResourceIdentityData {
 
 // ActionSchema defines the schema for an action that can be invoked by Terraform.
 message ActionSchema {
-    message LinkedResource {
-        string type_name = 1;
-        // description is a human-readable description of the role of the linked resource.
-        // For lifecycle actions this is most likely just the resource being acted upon.
-        // For linked actions where multiple resources are linked, this description should
-        // help the user understand what the resource is used for.
-        // We expect markdown formatting for the description.
-        string description = 2;
-    }
-
     // An Unlinked action is an action that is not linked to any resources. It may contain
     // references to resources but it can not change the resource state of any resource.
     message Unlinked {}
-    
-    // A Lifecycle action is an action that is linked to a resources lifecycle. It runs as part of 
-    // the lifecycle and may change the resource state of the resource it is linked to to a degree. 
-    // It can only affect computed attributes of the resource it is linked to.
-    message Lifecycle {
-        // ExecutionOrder defines if the action should be executed before or after the resource,
-        // in whose lifecycle the action runs, applies
-        enum ExecutionOrder {
-            INVALID = 0;
-            BEFORE = 1;
-            AFTER = 2;
-        }
-
-        ExecutionOrder executes = 1; 
-        LinkedResource linked_resource = 2;
-    }
-    
-    // A linked action can be linked to multiple resources and can change the resource state of those resources. It can not be run as part of plan and apply.
-    message Linked {
-        repeated LinkedResource linked_resources = 1;
-    }
 
     Schema schema = 1; // of the action itself
 
     oneof type {
         Unlinked unlinked = 2;
-        Lifecycle lifecycle = 3;
-        Linked linked = 4;
     }
 }
 

docs/plugin-protocol/tfplugin6.proto

@@ -146,46 +146,14 @@ message ResourceIdentityData {
 
 // ActionSchema defines the schema for an action that can be invoked by Terraform.
 message ActionSchema {
-    message LinkedResource {
-        string type_name = 1;
-        // description is a human-readable description of the role of the linked resource.
-        // For lifecycle actions this is most likely just the resource being acted upon.
-        // For linked actions where multiple resources are linked, this description should
-        // help the user understand what the resource is used for.
-        string description = 2;
-    }
-
     // An Unlinked action is an action that is not linked to any resources. It may contain
     // references to resources but it can not change the resource state of any resource.
     message Unlinked {}
-    
-    // A Lifecycle action is an action that is linked to a resources lifecycle. It runs as part of 
-    // the lifecycle and may change the resource state of the resource it is linked to to a degree. 
-    // It can only affect computed attributes of the resource it is linked to.
-    message Lifecycle {
-        // ExecutionOrder defines if the action should be executed before or after the resource,
-        // in whose lifecycle the action runs, applies
-        enum ExecutionOrder {
-            INVALID = 0;
-            BEFORE = 1;
-            AFTER = 2;
-        }
-
-        ExecutionOrder executes = 1; 
-        LinkedResource linked_resource = 2;
-    }
-    
-    // A linked action can be linked to multiple resources and can change the resource state of those resources. It can not be run as part of plan and apply.
-    message Linked {
-        repeated LinkedResource linked_resources = 1;
-    }
 
     Schema schema = 1; // of the action itself
 
     oneof type {
         Unlinked unlinked = 2;
-        Lifecycle lifecycle = 3;
-        Linked linked = 4;
     }
 }
 

internal/command/jsonprovider/provider_test.go

@@ -252,38 +252,6 @@ func TestMarshalProvider(t *testing.T) {
 						},
 						Unlinked: &providers.UnlinkedAction{},
 					},
-					"test_linked_action": {
-						ConfigSchema: &configschema.Block{
-							Attributes: map[string]*configschema.Attribute{
-								"opt_attr": {Type: cty.String, Optional: true},
-								"req_attr": {Type: cty.List(cty.String), Required: true},
-							},
-						},
-						Linked: &providers.LinkedAction{
-							LinkedResources: []providers.LinkedResourceSchema{
-								{
-									TypeName: "test_resource_a",
-								},
-								{
-									TypeName: "test_resource_b",
-								},
-							},
-						},
-					},
-					"test_lifecycle_action": {
-						ConfigSchema: &configschema.Block{
-							Attributes: map[string]*configschema.Attribute{
-								"opt_attr": {Type: cty.String, Optional: true},
-								"req_attr": {Type: cty.List(cty.String), Required: true},
-							},
-						},
-						Lifecycle: &providers.LifecycleAction{
-							LinkedResource: providers.LinkedResourceSchema{
-								TypeName: "test_resource_c",
-							},
-							Executes: providers.ExecutionOrderBefore,
-						},
-					},
 				},
 			},
 			true,
@@ -332,56 +300,6 @@ func TestMarshalProvider(t *testing.T) {
 						},
 						Unlinked: &UnlinkedAction{},
 					},
-					"test_linked_action": {
-						ConfigSchema: &Block{
-							Attributes: map[string]*Attribute{
-								"opt_attr": {
-									AttributeType:   json.RawMessage(`"string"`),
-									Optional:        true,
-									DescriptionKind: "plain",
-								},
-								"req_attr": {
-									AttributeType:   json.RawMessage(`["list","string"]`),
-									Required:        true,
-									DescriptionKind: "plain",
-								},
-							},
-							DescriptionKind: "plain",
-						},
-						Linked: &LinkedAction{
-							LinkedResources: []LinkedResourceSchema{
-								{
-									TypeName: "test_resource_a",
-								},
-								{
-									TypeName: "test_resource_b",
-								},
-							},
-						},
-					},
-					"test_lifecycle_action": {
-						ConfigSchema: &Block{
-							Attributes: map[string]*Attribute{
-								"opt_attr": {
-									AttributeType:   json.RawMessage(`"string"`),
-									Optional:        true,
-									DescriptionKind: "plain",
-								},
-								"req_attr": {
-									AttributeType:   json.RawMessage(`["list","string"]`),
-									Required:        true,
-									DescriptionKind: "plain",
-								},
-							},
-							DescriptionKind: "plain",
-						},
-						Lifecycle: &LifecycleAction{
-							LinkedResource: LinkedResourceSchema{
-								TypeName: "test_resource_c",
-							},
-							ExecutionOrder: "before",
-						},
-					},
 				},
 			},
 		},

internal/command/jsonprovider/schema.go

@@ -72,24 +72,11 @@ func marshalIdentitySchemas(schemas map[string]providers.Schema) map[string]*Ide
 type ActionSchema struct {
 	ConfigSchema *Block `json:"block,omitempty"`
 
-	// One of the following must be set
-	Unlinked  *UnlinkedAction  `json:"unlinked,omitempty"`
-	Linked    *LinkedAction    `json:"linked,omitempty"`
-	Lifecycle *LifecycleAction `json:"lifecycle,omitempty"`
+	// Only unlinked actions are supported.
+	Unlinked *UnlinkedAction `json:"unlinked,omitempty"`
 }
 
 type UnlinkedAction struct{}
-type LinkedAction struct {
-	LinkedResources []LinkedResourceSchema `json:"linked_resources,omitempty"`
-}
-type LinkedResourceSchema struct {
-	TypeName string `json:"type_name"`
-}
-
-type LifecycleAction struct {
-	LinkedResource LinkedResourceSchema `json:"linked_resource"`
-	ExecutionOrder string               `json:"execution_order"`
-}
 
 func marshalActionSchemas(schemas map[string]providers.ActionSchema) map[string]*ActionSchema {
 	ret := make(map[string]*ActionSchema, len(schemas))
@@ -106,23 +93,6 @@ func marshalActionSchema(schema providers.ActionSchema) *ActionSchema {
 
 	if schema.Unlinked != nil {
 		ret.Unlinked = &UnlinkedAction{}
-	} else if schema.Linked != nil {
-		linkedResources := []LinkedResourceSchema{}
-		for _, linkedResource := range schema.Linked.LinkedResources {
-			linkedResources = append(linkedResources, LinkedResourceSchema{
-				TypeName: linkedResource.TypeName,
-			})
-		}
-		ret.Linked = &LinkedAction{
-			LinkedResources: linkedResources,
-		}
-	} else if schema.Lifecycle != nil {
-		ret.Lifecycle = &LifecycleAction{
-			LinkedResource: LinkedResourceSchema{
-				TypeName: schema.Lifecycle.LinkedResource.TypeName,
-			},
-			ExecutionOrder: string(schema.Lifecycle.Executes),
-		}
 	}
 
 	return ret

internal/grpcwrap/provider.go

@@ -103,20 +103,8 @@ func (p *provider) GetSchema(_ context.Context, req *tfplugin5.GetProviderSchema
 
 		if act.Unlinked != nil {
 			newAct.Type = &tfplugin5.ActionSchema_Unlinked_{}
-		} else if act.Lifecycle != nil {
-			newAct.Type = &tfplugin5.ActionSchema_Lifecycle_{
-				Lifecycle: &tfplugin5.ActionSchema_Lifecycle{
-					Executes:       convert.ExecutionOrderToProto(act.Lifecycle.Executes),
-					LinkedResource: convert.LinkedResourceToProto(act.Lifecycle.LinkedResource),
-				},
-			}
-		} else if act.Linked != nil {
-			newAct.Type = &tfplugin5.ActionSchema_Linked_{
-				Linked: &tfplugin5.ActionSchema_Linked{
-					LinkedResources: convert.LinkedResourcesToProto(act.Linked.LinkedResources),
-				},
-			}
 		}
+
 		resp.ActionSchemas[typ] = &newAct
 	}
 

internal/grpcwrap/provider6.go

@@ -112,20 +112,8 @@ func (p *provider6) GetProviderSchema(_ context.Context, req *tfplugin6.GetProvi
 
 		if act.Unlinked != nil {
 			newAct.Type = &tfplugin6.ActionSchema_Unlinked_{}
-		} else if act.Lifecycle != nil {
-			newAct.Type = &tfplugin6.ActionSchema_Lifecycle_{
-				Lifecycle: &tfplugin6.ActionSchema_Lifecycle{
-					Executes:       convert.ExecutionOrderToProto(act.Lifecycle.Executes),
-					LinkedResource: convert.LinkedResourceToProto(act.Lifecycle.LinkedResource),
-				},
-			}
-		} else if act.Linked != nil {
-			newAct.Type = &tfplugin6.ActionSchema_Linked_{
-				Linked: &tfplugin6.ActionSchema_Linked{
-					LinkedResources: convert.LinkedResourcesToProto(act.Linked.LinkedResources),
-				},
-			}
 		}
+
 		resp.ActionSchemas[typ] = &newAct
 	}
 

internal/plugin/convert/schema.go

@@ -105,83 +105,16 @@ func ProtoToProviderSchema(s *proto.Schema, id *proto.ResourceIdentitySchema) pr
 	return schema
 }
 
-func ProtoToExecutionOrder(s proto.ActionSchema_Lifecycle_ExecutionOrder) providers.ExecutionOrder {
-	switch s {
-	case proto.ActionSchema_Lifecycle_INVALID:
-		return providers.ExecutionOrderInvalid
-	case proto.ActionSchema_Lifecycle_BEFORE:
-		return providers.ExecutionOrderBefore
-	case proto.ActionSchema_Lifecycle_AFTER:
-		return providers.ExecutionOrderAfter
-	default:
-		panic("Unknown Execution Order, expected Invalid, Before, or After")
-	}
-}
-
-func ExecutionOrderToProto(s providers.ExecutionOrder) proto.ActionSchema_Lifecycle_ExecutionOrder {
-	switch s {
-	case providers.ExecutionOrderInvalid:
-		return proto.ActionSchema_Lifecycle_INVALID
-	case providers.ExecutionOrderBefore:
-		return proto.ActionSchema_Lifecycle_BEFORE
-	case providers.ExecutionOrderAfter:
-		return proto.ActionSchema_Lifecycle_AFTER
-	default:
-		panic("Unknown Execution Order, expected Invalid, Before, or After")
-	}
-}
-
-func ProtoToLinkedResource(lr *proto.ActionSchema_LinkedResource) providers.LinkedResourceSchema {
-	if lr == nil {
-		return providers.LinkedResourceSchema{}
-	}
-
-	return providers.LinkedResourceSchema{
-		TypeName: lr.TypeName,
-	}
-}
-
-func LinkedResourceToProto(lr providers.LinkedResourceSchema) *proto.ActionSchema_LinkedResource {
-	return &proto.ActionSchema_LinkedResource{
-		TypeName: lr.TypeName,
-	}
-}
-
-func ProtoToLinkedResources(lrs []*proto.ActionSchema_LinkedResource) []providers.LinkedResourceSchema {
-	linkedResources := make([]providers.LinkedResourceSchema, len(lrs))
-	for i, lr := range lrs {
-		linkedResources[i] = ProtoToLinkedResource(lr)
-	}
-	return linkedResources
-}
-
-func LinkedResourcesToProto(lrs []providers.LinkedResourceSchema) []*proto.ActionSchema_LinkedResource {
-	linkedResources := make([]*proto.ActionSchema_LinkedResource, len(lrs))
-	for i, lr := range lrs {
-		linkedResources[i] = LinkedResourceToProto(lr)
-	}
-	return linkedResources
-}
-
 func ProtoToActionSchema(s *proto.ActionSchema) providers.ActionSchema {
 	schema := providers.ActionSchema{
 		ConfigSchema: ProtoToConfigSchema(s.Schema.Block),
 	}
 
-	switch t := s.Type.(type) {
+	switch s.Type.(type) {
 	case *proto.ActionSchema_Unlinked_:
 		schema.Unlinked = &providers.UnlinkedAction{}
-	case *proto.ActionSchema_Lifecycle_:
-		schema.Lifecycle = &providers.LifecycleAction{
-			Executes:       ProtoToExecutionOrder(t.Lifecycle.Executes),
-			LinkedResource: ProtoToLinkedResource(t.Lifecycle.LinkedResource),
-		}
-	case *proto.ActionSchema_Linked_:
-		schema.Linked = &providers.LinkedAction{
-			LinkedResources: ProtoToLinkedResources(t.Linked.LinkedResources),
-		}
 	default:
-		panic("Unknown Action Type, expected schema to contain either Unlinked, Liefecycle, or Linked")
+		panic("Unknown Action Type, expected unlinked action")
 	}
 	return schema
 }