Skip to content

Commit

Permalink
feat: external feed trigger resource
Browse files Browse the repository at this point in the history
* Upgrade octopus library version

* New Terraform resources for External feed CreateRelease triggers

* New integration test for the new trigger resource

* Point integration test Docker image to the latest Octopus server versions available to Cloud customers so that they can start using Terraform provider changes when the feature is rolled out to Cloud

* Remove external_security_group since new db entry for TeamExternalSecurityGroup does not allow null GroupId. The test isn't making assertions on this either.

* Remove PollingRequestMaximumMessageProcessingTimeout from machine policy as it has been removed from Octopus Server
  • Loading branch information
kevjt committed Mar 22, 2024
1 parent f158fa4 commit 96ae3a0
Show file tree
Hide file tree
Showing 44 changed files with 719 additions and 181 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ jobs:
OCTODISABLEOCTOCONTAINERLOGGING: true
OCTOTESTSKIPINIT: true
GOMAXPROCS: 1
OCTOTESTVERSION: 2023.4
OCTOTESTVERSION: latest
OCTOTESTIMAGEURL: docker.packages.octopushq.com/octopusdeploy/octopusdeploy
- name: Upload test artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
1 change: 0 additions & 1 deletion docs/data-sources/machine_policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ Read-Only:
- `machine_health_check_policy` (Set of Object) (see [below for nested schema](#nestedatt--machine_policies--machine_health_check_policy))
- `machine_update_policy` (Set of Object) (see [below for nested schema](#nestedatt--machine_policies--machine_update_policy))
- `name` (String) The name of this resource.
- `polling_request_maximum_message_processing_timeout` (Number) In nanoseconds.
- `polling_request_queue_timeout` (Number) In nanoseconds.
- `space_id` (String) The space ID associated with this resource.

Expand Down
1 change: 1 addition & 0 deletions docs/data-sources/tenants.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Provides information about existing tenants.
- `partial_name` (String) A filter to search by the partial match of a name.
- `project_id` (String) A filter to search by a project ID.
- `skip` (Number) A filter to specify the number of items to skip in the response.
- `space_id` (String) A Space ID to filter by. Will revert what is specified on the provider if not set.
- `tags` (List of String) A filter to search by a list of tags.
- `take` (Number) A filter to specify the number of items to take (or return) in the response.

Expand Down
3 changes: 3 additions & 0 deletions docs/resources/deployment_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ Optional:
- `template` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--step--apply_terraform_template_action--template))
- `template_parameters` (String)
- `tenant_tags` (List of String) A list of tenant tags associated with this resource.
- `worker_pool_id` (String) The worker pool associated with this deployment action.
- `worker_pool_variable` (String) The worker pool variable associated with this deployment action.

<a id="nestedblock--step--apply_terraform_template_action--advanced_options"></a>
### Nested Schema for `step.apply_terraform_template_action.advanced_options`
Expand Down Expand Up @@ -871,6 +873,7 @@ Optional:
- `id` (String) The unique ID for this resource.
- `is_disabled` (Boolean) Indicates the disabled status of this deployment action.
- `is_required` (Boolean) Indicates the required status of this deployment action.
- `namespace` (String)
- `notes` (String) The notes associated with this deployment action.
- `package` (Block List) The package assocated with this action. (see [below for nested schema](#nestedblock--step--run_kubectl_script_action--package))
- `primary_package` (Block List, Max: 1) The package assocated with this action. (see [below for nested schema](#nestedblock--step--run_kubectl_script_action--primary_package))
Expand Down
57 changes: 57 additions & 0 deletions docs/resources/external_feed_create_release_trigger.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
# generated by https://github.com/hashicorp/terraform-plugin-docs
page_title: "octopusdeploy_external_feed_create_release_trigger Resource - terraform-provider-octopusdeploy"
subcategory: "Triggers"
description: |-
This resource manages External feed triggers (release creation type) in Octopus Deploy.
---

# octopusdeploy_external_feed_create_release_trigger (Resource)


## Example Usage

```terraform
resource "octopusdeploy_external_feed_create_release_trigger" "my_trigger" {
name = "My feed trigger"
space_id = "Spaces-1
project_id = "Projects-2"
package {
deployment_action = "My Helm step"
package_reference = "nginx"
}
package {
deployment_action = "My container step"
package_reference = "busybox"
}
channel_id = "Channels-21"
}
```


<!-- schema generated by tfplugindocs -->
## Schema

### Required

- `channel_id` (String) The ID of the channel in which the release will be created if the action type is CreateRelease.
- `name` (String) The name of this resource.
- `package` (Block List, Min: 1) List of package references that will cause the trigger to fire. The triggering condition is if any of the packages are updated. (see [below for nested schema](#nestedblock--package))
- `project_id` (String) The ID of the project to attach the trigger.
- `space_id` (String) The space ID associated with the project to attach the trigger.

### Optional

- `is_disabled` (Boolean) Disables the trigger from being run when set.

### Read-Only

- `id` (String) The ID of this resource.

<a id="nestedblock--package"></a>
### Nested Schema for `package`

Optional:

- `deployment_action` (String)
- `package_reference` (String)
1 change: 0 additions & 1 deletion docs/resources/machine_policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ This resource manages machine policies in Octopus Deploy.
- `machine_connectivity_policy` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--machine_connectivity_policy))
- `machine_health_check_policy` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--machine_health_check_policy))
- `machine_update_policy` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--machine_update_policy))
- `polling_request_maximum_message_processing_timeout` (Number) In nanoseconds.
- `polling_request_queue_timeout` (Number) In nanoseconds.
- `space_id` (String) The space ID associated with this resource.

Expand Down
2 changes: 2 additions & 0 deletions docs/resources/project.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ resource "octopusdeploy_project" "example" {
name = "Development Project (OK to Delete)"
project_group_id = "ProjectGroups-123"
tenanted_deployment_participation = "TenantedOrUntenanted"
included_library_variable_sets = [ "LibraryVariablesSets-456", "LibraryVariablesSets-789" ]
connectivity_policy {
allow_deployments_to_no_targets = false
Expand Down
3 changes: 3 additions & 0 deletions docs/resources/runbook_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ Optional:
- `template` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--step--apply_terraform_template_action--template))
- `template_parameters` (String)
- `tenant_tags` (List of String) A list of tenant tags associated with this resource.
- `worker_pool_id` (String) The worker pool associated with this deployment action.
- `worker_pool_variable` (String) The worker pool variable associated with this deployment action.

<a id="nestedblock--step--apply_terraform_template_action--advanced_options"></a>
### Nested Schema for `step.apply_terraform_template_action.advanced_options`
Expand Down Expand Up @@ -749,6 +751,7 @@ Optional:
- `id` (String) The unique ID for this resource.
- `is_disabled` (Boolean) Indicates the disabled status of this deployment action.
- `is_required` (Boolean) Indicates the required status of this deployment action.
- `namespace` (String)
- `notes` (String) The notes associated with this deployment action.
- `package` (Block List) The package assocated with this action. (see [below for nested schema](#nestedblock--step--run_kubectl_script_action--package))
- `primary_package` (Block List, Max: 1) The package assocated with this action. (see [below for nested schema](#nestedblock--step--run_kubectl_script_action--primary_package))
Expand Down
94 changes: 58 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,64 +1,72 @@
module github.com/OctopusDeploy/terraform-provider-octopusdeploy

go 1.20
go 1.21

require (
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.40.0
github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20230705105638-f5ef7c07973b
github.com/google/uuid v1.3.0
github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240314225537-8e0a92384cf9
github.com/google/uuid v1.6.0
github.com/gruntwork-io/terratest v0.41.11
github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
github.com/hashicorp/terraform-plugin-docs v0.13.0
github.com/hashicorp/terraform-plugin-log v0.8.0
github.com/hashicorp/terraform-plugin-sdk v1.17.2
github.com/hashicorp/terraform-plugin-sdk/v2 v2.25.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
golang.org/x/text v0.8.0
golang.org/x/text v0.13.0
k8s.io/utils v0.0.0-20230505201702-9f6742963106
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.21.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.12.0 // indirect
cloud.google.com/go/storage v1.28.1 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/avast/retry-go/v4 v4.3.3 // indirect
github.com/avast/retry-go/v4 v4.5.0 // indirect
github.com/aws/aws-sdk-go v1.44.164 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/containerd/containerd v1.6.19 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dghubble/sling v1.4.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v23.0.5+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/docker v25.0.3+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.11.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand Down Expand Up @@ -86,6 +94,7 @@ require (
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.16.0 // indirect
github.com/leodido/go-urn v1.2.2 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand All @@ -98,42 +107,55 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/patternmatcher v0.5.0 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/testcontainers/testcontainers-go v0.21.0 // indirect
github.com/testcontainers/testcontainers-go v0.29.1 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tmccombs/hcl2json v0.3.6 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.7 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
github.com/zclconf/go-cty v1.12.1 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/tools v0.6.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/tools v0.13.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.110.0 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.3.0 // indirect
)

0 comments on commit 96ae3a0

Please sign in to comment.