diff --git a/docs/resources/project.md b/docs/resources/project.md index e9b5cb41..4c0ff89c 100644 --- a/docs/resources/project.md +++ b/docs/resources/project.md @@ -13,11 +13,9 @@ This resource manages projects in Octopus Deploy. ```terraform resource "octopusdeploy_project" "example" { - allow_deployments_to_no_targets = false auto_create_release = false default_guided_failure_mode = "EnvironmentDefault" default_to_skip_if_already_installed = false - deployment_process_id = "deploymentprocess-Projects-123" description = "The development project." discrete_channel_release = false is_disabled = false @@ -26,19 +24,13 @@ resource "octopusdeploy_project" "example" { lifecycle_id = "Lifecycles-123" name = "Development Project (OK to Delete)" project_group_id = "ProjectGroups-123" - slug = "development-project" tenanted_deployment_participation = "TenantedOrUntenanted" - variable_set_id = "variableset-Projects-123" connectivity_policy { allow_deployments_to_no_targets = false exclude_unhealthy_targets = false skip_machine_behavior = "SkipUnavailableMachines" } - - versioning_strategy { - template = "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}" - } } ``` diff --git a/examples/resources/octopusdeploy_project/resource.tf b/examples/resources/octopusdeploy_project/resource.tf index bcf3637f..104c4d2b 100644 --- a/examples/resources/octopusdeploy_project/resource.tf +++ b/examples/resources/octopusdeploy_project/resource.tf @@ -1,9 +1,7 @@ resource "octopusdeploy_project" "example" { - allow_deployments_to_no_targets = false auto_create_release = false default_guided_failure_mode = "EnvironmentDefault" default_to_skip_if_already_installed = false - deployment_process_id = "deploymentprocess-Projects-123" description = "The development project." discrete_channel_release = false is_disabled = false @@ -12,17 +10,11 @@ resource "octopusdeploy_project" "example" { lifecycle_id = "Lifecycles-123" name = "Development Project (OK to Delete)" project_group_id = "ProjectGroups-123" - slug = "development-project" tenanted_deployment_participation = "TenantedOrUntenanted" - variable_set_id = "variableset-Projects-123" connectivity_policy { allow_deployments_to_no_targets = false exclude_unhealthy_targets = false skip_machine_behavior = "SkipUnavailableMachines" } - - versioning_strategy { - template = "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}" - } } \ No newline at end of file diff --git a/go.mod b/go.mod index d24882e0..35350418 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/OctopusDeploy/terraform-provider-octopusdeploy require ( - github.com/OctopusDeploy/go-octopusdeploy v1.7.3-0.20201211022823-921bafd0dd48 + github.com/OctopusDeploy/go-octopusdeploy v1.7.3-0.20201214082559-4fdcca10bdb7 github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/aws/aws-sdk-go v1.35.35 // indirect diff --git a/octopusdeploy/schema_deployment_action_package.go b/octopusdeploy/schema_deployment_action_package.go index 60d583af..db8cc279 100644 --- a/octopusdeploy/schema_deployment_action_package.go +++ b/octopusdeploy/schema_deployment_action_package.go @@ -6,6 +6,10 @@ import ( ) func expandDeploymentActionPackage(deploymentActionPackage []interface{}) *octopusdeploy.DeploymentActionPackage { + if len(deploymentActionPackage) == 0 { + return nil + } + flattenedMap := deploymentActionPackage[0].(map[string]interface{}) return &octopusdeploy.DeploymentActionPackage{ DeploymentAction: flattenedMap["deployment_action"].(string), diff --git a/octopusdeploy/schema_release_creation_strategy.go b/octopusdeploy/schema_release_creation_strategy.go index 279b572a..f8ec14b1 100644 --- a/octopusdeploy/schema_release_creation_strategy.go +++ b/octopusdeploy/schema_release_creation_strategy.go @@ -6,11 +6,15 @@ import ( ) func expandReleaseCreationStrategy(releaseCreationStrategy []interface{}) *octopusdeploy.ReleaseCreationStrategy { + if len(releaseCreationStrategy) == 0 { + return nil + } + releaseCreationStrategyMap := releaseCreationStrategy[0].(map[string]interface{}) return &octopusdeploy.ReleaseCreationStrategy{ ChannelID: releaseCreationStrategyMap["channel_id"].(string), ReleaseCreationPackage: expandDeploymentActionPackage(releaseCreationStrategyMap["release_creation_package"].([]interface{})), - ReleaseCreationPackageStepID: releaseCreationStrategyMap["release_creation_package_step_id"].(*string), + ReleaseCreationPackageStepID: releaseCreationStrategyMap["release_creation_package_step_id"].(string), } }