WIP - Deployment process migration

octopusdeploy/provider.go

@@ -43,7 +43,6 @@ func Provider() *schema.Provider {
 			"octopusdeploy_certificate":                                    resourceCertificate(),
 			"octopusdeploy_channel":                                        resourceChannel(),
 			"octopusdeploy_cloud_region_deployment_target":                 resourceCloudRegionDeploymentTarget(),
-			"octopusdeploy_deployment_process":                             resourceDeploymentProcess(),
 			"octopusdeploy_dynamic_worker_pool":                            resourceDynamicWorkerPool(),
 			"octopusdeploy_gcp_account":                                    resourceGoogleCloudPlatformAccount(),
 			"octopusdeploy_kubernetes_agent_deployment_target":             resourceKubernetesAgentDeploymentTarget(),

octopusdeploy/resource_deployment_process_test.go

@@ -171,7 +171,7 @@ func TestAccOctopusDeployDeploymentProcessWithImpliedPrimaryPackage(t *testing.T
 					resource.TestCheckResourceAttr(resourceName, "step.0.start_trigger", "StartAfterPrevious"),
 					resource.TestCheckResourceAttr(resourceName, "step.0.action.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "step.0.action.0.action_type", "Octopus.TransferPackage"),
-					resource.TestCheckResourceAttr(resourceName, "step.0.action.0.container.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "step.0.action.0.container.#", "0"),
 					resource.TestCheckNoResourceAttr(resourceName, "step.0.action.0.channels.0"),
 					resource.TestCheckResourceAttr(resourceName, "step.0.action.0.condition", "Success"),
 					resource.TestCheckResourceAttr(resourceName, "step.0.action.0.environments.#", "0"),
@@ -206,9 +206,9 @@ func testAccDeploymentProcessBasic(localName string) string {
 				window_size = "5"
 
 				run_script_action {
-					// channels = ["Channels-1"]
-					// environments = ["Environments-1"]
-					// excluded_environments = ["Environments-2"]
+					//channels = ["Channels-1"]
+					//environments = ["Environments-1"]
+					//excluded_environments = ["Environments-2"]
 					is_disabled = false
 					is_required = true
 					name = "Test"
@@ -217,11 +217,18 @@ func testAccDeploymentProcessBasic(localName string) string {
 					script_source = "Package"
 					tenant_tags = ["tag/tag"]
 					sort_order  = 1
+					container {
+						feed_id = "Feeds-123"
+						image = "blah"
+					}
 
 					primary_package {
 						acquisition_location = "Server"
 						feed_id = "feeds-builtin"
 						package_id = "MyPackage"
+						properties = {
+							"Extract" = "true"
+						}
 					}
 
 					package {
@@ -230,6 +237,9 @@ func testAccDeploymentProcessBasic(localName string) string {
 						feed_id = "feeds-builtin"
 						name = "ThePackage"
 						package_id = "MyPackage"
+						properties = {
+							"Extract" = "true"
+						}
 					}
 
 					package {
@@ -238,21 +248,29 @@ func testAccDeploymentProcessBasic(localName string) string {
 						feed_id = "feeds-builtin"
 						name = "ThePackage2"
 						package_id = "MyPackage2"
+						properties = {
+							"Extract" = "true"
+						}
+					}
+
+					action_template {
+						id = "actiontemplates-1"
+						version = "1.2.3"
 					}
 				}
 			}
 
  			step {
-			  name = "Step2"
-			  start_trigger = "StartWithPrevious"
-			  target_roles = ["WebServer"]
-
-			  run_script_action {
-				  name = "Step2"
- 				  sort_order = 1
-				  run_on_server = true
-				  script_body = "Write-Host 'hi'"
-			  }
+				name = "Step2"
+				start_trigger = "StartWithPrevious"
+				target_roles = ["WebServer"]
+				
+				run_script_action {
+					  name = "Step2"
+					  sort_order = 1
+					  run_on_server = true
+					  script_body = "Write-Host 'hi'"
+				}
 			}
 		}`, localName, projectLocalName)
 }
@@ -298,6 +316,7 @@ func testAccProcessWithImpliedPrimaryPackage(spaceID string, localName string) s
 
 						properties = {
 							"SelectionMode" = "immediate"
+							"Extract" = "true"
 						}
 					}
 

octopusdeploy/schema_action_run_kubectl_script_test.go

@@ -38,6 +38,9 @@ func testAccRunKubectlScriptAction() string {
 			primary_package {
 				package_id = "MyPackage"
 				feed_id = "feeds-builtin"
+				properties = {
+					"Extract" = "true"
+				}
 			}
 
 			script_file_name = "Test.ps1"

octopusdeploy/schema_deployment_step.go

@@ -133,6 +133,7 @@ func flattenDeploymentSteps(deploymentSteps []*deployments.DeploymentStep) []map
 			}
 
 			action := fp(deploymentStep.Actions[i])
+
 			action["sort_order"] = i + 1
 			flattenedDeploymentStep[step_type_name] = append(flattenedDeploymentStep[step_type_name].([]map[string]interface{}), action)
 		}

octopusdeploy_framework/framework_provider.go

@@ -85,6 +85,7 @@ func (p *octopusDeployFrameworkProvider) Resources(ctx context.Context) []func()
 		NewEnvironmentResource,
 		NewGitCredentialResource,
 		NewHelmFeedResource,
+		NewDeploymentProcessResource,
 		NewArtifactoryGenericFeedResource,
 		NewGitHubRepositoryFeedResource,
 		NewAwsElasticContainerRegistryFeedResource,

octopusdeploy_framework/mappers/actions/action.go

@@ -0,0 +1,32 @@
+package actions
+
+import (
+	"context"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+type Action struct{}
+
+func (a Action) ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics {
+	diags := mapBaseDeploymentActionToState(ctx, action, newAction)
+	if diags.HasError() {
+		return diags
+	}
+
+	newAction["action_type"] = types.StringValue(action.ActionType)
+	mapPropertyToStateBool(action, newAction, "Octopus.Action.RunOnServer", "run_on_server", false)
+	newAction["worker_pool_id"] = types.StringValue(action.WorkerPool)
+	newAction["worker_pool_variable"] = types.StringValue(action.WorkerPoolVariable)
+	return nil
+}
+
+func (a Action) ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction {
+
+	return GetBaseAction(actionAttribute)
+
+}
+
+var _ MappableAction = &Action{}

octopusdeploy_framework/mappers/actions/action_mapper.go

@@ -0,0 +1,13 @@
+package actions
+
+import (
+	"context"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+)
+
+type MappableAction interface {
+	ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics
+	ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction
+}

octopusdeploy_framework/mappers/actions/kubectl_script.go

@@ -0,0 +1,39 @@
+package actions
+
+import (
+	"context"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+)
+
+type KubectlScriptActionMapper struct{}
+
+func (k KubectlScriptActionMapper) ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics {
+	diag := mapBaseDeploymentActionToState(ctx, action, newAction)
+	if diag.HasError() {
+		return diag
+	}
+
+	mapPropertyToStateString(action, newAction, "Octopus.Action.KubernetesContainers.Namespace", "namespace")
+
+	return nil
+}
+
+func (k KubectlScriptActionMapper) ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction {
+	actionAttrs := GetActionAttributes(actionAttribute)
+	if actionAttrs == nil {
+		return nil
+	}
+
+	runscriptMapper := RunScriptActionMapper{}
+	action := runscriptMapper.ToDeploymentAction(actionAttribute)
+	if action == nil {
+		return nil
+	}
+	action.ActionType = "Octopus.KubernetesRunScript"
+	mapAttributeToProperty(action, actionAttrs, "namespace", "Octopus.Action.KubernetesContainers.Namespace")
+	return action
+}
+
+var _ MappableAction = &KubectlScriptActionMapper{}

octopusdeploy_framework/mappers/actions/kubernetes_secret.go

@@ -0,0 +1,73 @@
+package actions
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/core"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+type KubernetesSecretActionMapper struct{}
+
+var _ MappableAction = &KubernetesSecretActionMapper{}
+
+func (k KubernetesSecretActionMapper) ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics {
+	diag := mapBaseDeploymentActionToState(ctx, action, newAction)
+	if diag.HasError() {
+		return diag
+	}
+
+	mapPropertyToStateBool(action, newAction, "Octopus.Action.RunOnServer", "run_on_server", false)
+	mapPropertyToStateString(action, newAction, "Octopus.Action.KubernetesContainers.SecretName", "secret_name")
+	mapPropertyToStateBool(action, newAction, "Octopus.Action.Kubernetes.ResourceStatusCheck", "kubernetes_object_status_check_enabled", false)
+	newAction["worker_pool_id"] = types.StringValue(action.WorkerPool)
+	newAction["worker_pool_variable"] = types.StringValue(action.WorkerPoolVariable)
+
+	if v, ok := action.Properties["Octopus.Action.KubernetesContainers.SecretValues"]; ok {
+		var secretKeyValues map[string]string
+		json.Unmarshal([]byte(v.Value), &secretKeyValues)
+		mappedSecrets := make(map[string]attr.Value)
+		for key, value := range secretKeyValues {
+			mappedSecrets[key] = types.StringValue(value)
+		}
+		newAction["secret_values"], diag = types.MapValue(types.StringType, mappedSecrets)
+		if diag.HasError() {
+			return diag
+		}
+	} else {
+		newAction["secret_values"] = types.MapNull(types.StringType)
+	}
+
+	return nil
+}
+
+func (k KubernetesSecretActionMapper) ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction {
+	actionAttrs := GetActionAttributes(actionAttribute)
+	if actionAttrs == nil {
+		return nil
+	}
+
+	action := GetBaseAction(actionAttribute)
+	if action == nil {
+		return nil
+	}
+
+	mapAttributeToProperty(action, actionAttrs, "secret_name", "Octopus.Action.KubernetesContainers.SecretName")
+	mapAttributeToProperty(action, actionAttrs, "kubernetes_object_status_check_enabled", "Octopus.Action.Kubernetes.ResourceStatusCheck")
+
+	if attrValue, ok := actionAttrs["secret_values"]; ok {
+		secretValues := attrValue.(types.Map)
+		mappedValues := make(map[string]string)
+		for key, value := range secretValues.Elements() {
+			mappedValues[key] = value.String()
+		}
+
+		j, _ := json.Marshal(secretValues)
+		action.Properties["Octopus.Action.KubernetesContainers.SecretValues"] = core.NewPropertyValue(string(j), false)
+	}
+
+	return action
+}

octopusdeploy_framework/mappers/actions/manual_intervention.go

@@ -0,0 +1,41 @@
+package actions
+
+import (
+	"context"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+)
+
+type ManualInterventionActionMapper struct{}
+
+var _ MappableAction = &ManualInterventionActionMapper{}
+
+func (m *ManualInterventionActionMapper) ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics {
+	diag := mapBaseDeploymentActionToState(ctx, action, newAction)
+	if diag.HasError() {
+		return diag
+	}
+
+	mapPropertyToStateString(action, newAction, "Octopus.Action.Manual.Instructions", "instructions")
+	mapPropertyToStateString(action, newAction, "Octopus.Action.Manual.ResponsibleTeamIds", "responsible_teams")
+
+	return nil
+}
+
+func (m *ManualInterventionActionMapper) ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction {
+	actionAttrs := GetActionAttributes(actionAttribute)
+	if actionAttrs == nil {
+		return nil
+	}
+
+	action := GetBaseAction(actionAttribute)
+	if action == nil {
+		return nil
+	}
+
+	mapAttributeToProperty(action, actionAttrs, "instructions", "Octopus.Action.Manual.Instructions")
+	mapAttributeToProperty(action, actionAttrs, "responsible_teams", "Octopus.Action.Manual.ResponsibleTeamIds")
+
+	return action
+}

octopusdeploy_framework/mappers/actions/package.go

@@ -0,0 +1,59 @@
+package actions
+
+import (
+	"context"
+	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/deployments"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	"strings"
+)
+
+type PackageActionMapper struct{}
+
+func (p PackageActionMapper) ToState(ctx context.Context, action *deployments.DeploymentAction, newAction map[string]attr.Value) diag.Diagnostics {
+	diag := mapBaseDeploymentActionToState(ctx, action, newAction)
+	if diag.HasError() {
+		return diag
+	}
+
+	if v, ok := action.Properties["Octopus.Action.EnabledFeatures"]; ok {
+		if strings.Contains(v.Value, "Octopus.Features.WindowsService") {
+			attrs := make(map[string]attr.Value)
+			mapWindowsServicePropertiesToState(action, attrs)
+			list := make([]attr.Value, 1)
+			list[0] = types.ObjectValueMust(getWindowsServiceAttrTypes(), attrs)
+			newAction["windows_service"] = types.ListValueMust(types.ObjectType{AttrTypes: getWindowsServiceAttrTypes()}, list)
+		} else {
+			newAction["windows_service"] = types.ListNull(types.ObjectType{AttrTypes: getWindowsServiceAttrTypes()})
+		}
+	}
+
+	return nil
+}
+
+func (p PackageActionMapper) ToDeploymentAction(actionAttribute attr.Value) *deployments.DeploymentAction {
+	actionAttrs := GetActionAttributes(actionAttribute)
+	if actionAttrs == nil {
+		return nil
+	}
+
+	action := GetBaseAction(actionAttribute)
+	if action == nil {
+		return nil
+	}
+
+	action.ActionType = "Octopus.TentaclePackage"
+
+	if v, ok := actionAttrs["windows_service"]; ok {
+		list := v.(types.List).Elements()
+		for _, item := range list {
+			mapWindowsServiceProperties(action, item.(types.Object).Attributes())
+			return action
+		}
+	}
+
+	return action
+}
+
+var _ MappableAction = &PackageActionMapper{}