From b1ec41d5e829d90a1a4a8297a9c4a1ff6b512516 Mon Sep 17 00:00:00 2001 From: Matthew Casperson Date: Mon, 15 Apr 2024 12:13:04 +1000 Subject: [PATCH] Fixes https://github.com/OctopusDeployLabs/terraform-provider-octopusdeploy/issues/623 (#625) --- go.mod | 22 ++++---- go.sum | 44 ++++++++-------- integration_test.go | 52 +++++++++++++++++++ octopusdeploy/schema_utilities.go | 3 +- terraform/1-singlespace/config.tf | 2 +- terraform/10-helmfeed/config.tf | 2 +- terraform/10a-helmfeedds/config.tf | 2 +- terraform/11-dockerfeed/config.tf | 2 +- terraform/11a-dockerfeedds/config.tf | 2 +- terraform/12-ecrfeed/config.tf | 2 +- terraform/12a-ecrfeedds/config.tf | 2 +- terraform/13-mavenfeed/config.tf | 2 +- terraform/13a-mavenfeedds/config.tf | 2 +- terraform/14-nugetfeed/config.tf | 2 +- terraform/14a-nugetfeedds/config.tf | 2 +- terraform/15-workerpool/config.tf | 2 +- terraform/15a-workerpoolds/config.tf | 2 +- terraform/16-environment/config.tf | 2 +- terraform/16a-environmentlookup/config.tf | 2 +- terraform/17-lifecycle/config.tf | 2 +- terraform/17a-lifecycleds/config.tf | 2 +- terraform/18-variableset/config.tf | 2 +- terraform/18a-variablesetds/config.tf | 2 +- terraform/19-project/config.tf | 2 +- terraform/19a-projectds/config.tf | 2 +- terraform/19b-projectspace/config.tf | 2 +- terraform/2-projectgroup/config.tf | 2 +- terraform/20-channel/config.tf | 2 +- terraform/20a-channelds/config.tf | 2 +- terraform/21-tagset/config.tf | 2 +- terraform/22-gitcredentialtest/config.tf | 2 +- terraform/22a-gitcredentialtestds/config.tf | 2 +- terraform/23-scriptmodule/config.tf | 2 +- terraform/23a-scriptmoduleds/config.tf | 2 +- terraform/24-tenants/config.tf | 2 +- terraform/24a-tenantsds/config.tf | 2 +- terraform/25-certificates/config.tf | 2 +- terraform/25a-certificatesds/config.tf | 2 +- terraform/26-tenant_variables/config.tf | 2 +- terraform/27-machinepolicy/config.tf | 2 +- terraform/28-projecttrigger/config.tf | 2 +- terraform/29-k8starget/config.tf | 2 +- terraform/29a-k8stargetds/config.tf | 2 +- terraform/2a-projectgroupds/config.tf | 2 +- terraform/3-awsaccount/config.tf | 2 +- terraform/30-sshtarget/config.tf | 2 +- terraform/30a-sshtargetds/config.tf | 2 +- terraform/31-listeningtarget/config.tf | 2 +- terraform/31a-listeningtargetds/config.tf | 2 +- terraform/32-pollingtarget/config.tf | 2 +- terraform/32a-pollingtargetds/config.tf | 2 +- terraform/33-cloudregiontarget/config.tf | 2 +- terraform/33a-cloudregiontargetds/config.tf | 2 +- terraform/34-offlinedroptarget/config.tf | 2 +- terraform/34a-offlinedroptargetds/config.tf | 2 +- .../35-azurecloudservicetarget/config.tf | 2 +- .../35a-azurecloudservicetargetds/config.tf | 2 +- terraform/36-servicefabrictarget/config.tf | 2 +- terraform/36a-servicefabrictargetds/config.tf | 2 +- terraform/37-webapptarget/config.tf | 2 +- terraform/37a-webapptarget/config.tf | 2 +- terraform/39-projectgitusername/config.tf | 2 +- terraform/3a-awsaccountds/config.tf | 2 +- terraform/4-azureaccount/config.tf | 2 +- terraform/40-escapedollar/config.tf | 2 +- terraform/41-terraforminlinescript/config.tf | 2 +- terraform/42-terraformpackagescript/config.tf | 2 +- terraform/43-users/config.tf | 2 +- terraform/43a-usersds/config.tf | 2 +- terraform/44-githubfeed/config.tf | 2 +- terraform/44a-githubfeedds/config.tf | 2 +- .../45-projectwithscriptactions/config.tf | 2 +- terraform/46-runbooks/config.tf | 2 +- terraform/49-variables/config.tf | 2 +- terraform/5-userpassaccount/config.tf | 2 +- .../50-applyterraformtemplateaction/config.tf | 2 +- .../config.tf | 2 +- .../config.tf | 2 +- .../53-scheduledprojecttrigger/config.tf | 2 +- .../54-usernamepasswordvariable/config.tf | 5 ++ .../54-usernamepasswordvariable/project.tf | 39 ++++++++++++++ .../project_group_test.tf | 4 ++ .../54-usernamepasswordvariable/provider.tf | 5 ++ .../provider_vars.tf | 18 +++++++ .../54-usernamepasswordvariable/space.tf | 3 ++ .../usernamepassword_account.tf | 10 ++++ terraform/6-gcpaccount/config.tf | 2 +- terraform/7-sshaccount/config.tf | 2 +- .../8-azuresubscriptionaccount/config.tf | 2 +- terraform/9-tokenaccount/config.tf | 2 +- 90 files changed, 250 insertions(+), 113 deletions(-) create mode 100644 terraform/54-usernamepasswordvariable/config.tf create mode 100644 terraform/54-usernamepasswordvariable/project.tf create mode 100644 terraform/54-usernamepasswordvariable/project_group_test.tf create mode 100644 terraform/54-usernamepasswordvariable/provider.tf create mode 100644 terraform/54-usernamepasswordvariable/provider_vars.tf create mode 100644 terraform/54-usernamepasswordvariable/space.tf create mode 100644 terraform/54-usernamepasswordvariable/usernamepassword_account.tf diff --git a/go.mod b/go.mod index fecfdc270..a2d773c0a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/OctopusDeploy/go-octopusdeploy/v2 v2.40.3 - github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240314225537-8e0a92384cf9 + github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240409225949-b27d14ff2bcb 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 @@ -35,7 +35,7 @@ require ( 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.5.0 // indirect + github.com/avast/retry-go/v4 v4.5.1 // 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 @@ -48,12 +48,12 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dghubble/sling v1.4.1 // indirect github.com/distribution/reference v0.5.0 // indirect - github.com/docker/docker v25.0.3+incompatible // indirect + github.com/docker/docker v25.0.5+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/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // 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 @@ -126,7 +126,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/testcontainers/testcontainers-go v0.29.1 // indirect + github.com/testcontainers/testcontainers-go v0.30.0 // 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 @@ -138,10 +138,10 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zclconf/go-cty v1.12.1 // indirect go.opencensus.io v0.24.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 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.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 @@ -156,6 +156,6 @@ require ( 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 + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index ff7f4ed4c..e65a0f128 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7 github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= github.com/OctopusDeploy/go-octopusdeploy/v2 v2.40.3 h1:Gi3tlcwFJPQe9mmdIV0NcScnHGvOcTFcoM67L+dx6gE= github.com/OctopusDeploy/go-octopusdeploy/v2 v2.40.3/go.mod h1:GZmFu6LmN8Yg0tEoZx3ytk9FnaH+84cWm7u5TdWZC6E= -github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240314225537-8e0a92384cf9 h1:uaKQwRn5iIJnHRbRCRQrIRZKd0tqTfnOle6jSXk4wKs= -github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240314225537-8e0a92384cf9/go.mod h1:vE83OjlckiC+7quEvpR2KzQq3hvv9b+usqxaNNT4GCs= +github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240409225949-b27d14ff2bcb h1:4Lzs6TsvSZkahw99VlIDP5aAihQiJZPoCQKTw1A9el4= +github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240409225949-b27d14ff2bcb/go.mod h1:Nyg+7cyTrSQ/lMIy5YY1UdJekRuoMWf4uHIPfaGmgTM= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= @@ -97,8 +97,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg= -github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I= +github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o= +github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.44.164 h1:qDj0RutF2Ut0HZYyUJxFdReLxpYrjupsu2JmDIgCvX8= @@ -142,8 +142,8 @@ github.com/dghubble/sling v1.4.1 h1:AxjTubpVyozMvbBCtXcsWEyGGgUZutC5YGrfxPNVOcQ= github.com/dghubble/sling v1.4.1/go.mod h1:QoMB1KL3GAo+7HsD8Itd6S+6tW91who8BGZzuLvpOyc= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ= -github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE= +github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -160,8 +160,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= @@ -183,8 +183,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -545,8 +545,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/testcontainers/testcontainers-go v0.29.1 h1:z8kxdFlovA2y97RWx98v/TQ+tR+SXZm6p35M+xB92zk= -github.com/testcontainers/testcontainers-go v0.29.1/go.mod h1:SnKnKQav8UcgtKqjp/AD8bE1MqZm+3TDb/B8crE3XnI= +github.com/testcontainers/testcontainers-go v0.30.0 h1:jmn/XS22q4YRrcMwWg0pAwlClzs/abopbsBzrepyc4E= +github.com/testcontainers/testcontainers-go v0.30.0/go.mod h1:K+kHNGiM5zjklKjgTtcrEetF3uhWbMUyqAQoyoh8Pf0= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= @@ -592,20 +592,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= @@ -958,8 +958,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/integration_test.go b/integration_test.go index 45f452bba..79808fcfb 100644 --- a/integration_test.go +++ b/integration_test.go @@ -3651,3 +3651,55 @@ func TestProjectScheduledTriggerResources(t *testing.T) { return nil }) } + +// TestUsernamePasswordVariableResource verifies that a project variable referencing a username/password account +// can be created +func TestUsernamePasswordVariableResource(t *testing.T) { + testFramework := test.OctopusContainerTest{} + testFramework.ArrangeTest(t, func(t *testing.T, container *test.OctopusContainer, spaceClient *client.Client) error { + // Act + newSpaceId, err := testFramework.Act(t, container, "./terraform", "54-usernamepasswordvariable", []string{}) + + if err != nil { + return err + } + + // Assert + client, err := octoclient.CreateClient(container.URI, newSpaceId, test.ApiKey) + query := projects.ProjectsQuery{ + PartialName: "Test", + Skip: 0, + Take: 1, + } + + resources, err := projects.Get(client, newSpaceId, query) + if err != nil { + return err + } + + if len(resources.Items) == 0 { + t.Fatalf("Space must have a project called \"Test\"") + } + resource := resources.Items[0] + + projectVariables, err := variables.GetVariableSet(client, newSpaceId, resource.VariableSetID) + + if err != nil { + return err + } + + if len(projectVariables.Variables) != 1 { + t.Fatalf("The project must have 1 variable.") + } + + if projectVariables.Variables[0].Name != "UsernamePasswordVariable" { + t.Fatalf("The variable must be called UsernamePasswordVariable.") + } + + if projectVariables.Variables[0].Type != "UsernamePasswordAccount" { + t.Fatalf("The variable must have type of UsernamePasswordAccount.") + } + + return nil + }) +} diff --git a/octopusdeploy/schema_utilities.go b/octopusdeploy/schema_utilities.go index 9d6cec1c9..9950c656b 100644 --- a/octopusdeploy/schema_utilities.go +++ b/octopusdeploy/schema_utilities.go @@ -422,7 +422,7 @@ func getUsernameSchema(isRequired bool) *schema.Schema { func getVariableTypeSchema() *schema.Schema { return &schema.Schema{ - Description: "The type of variable represented by this resource. Valid types are `AmazonWebServicesAccount`, `AzureAccount`, `GoogleCloudAccount`, `Certificate`, `Sensitive`, `String`, or `WorkerPool`.", + Description: "The type of variable represented by this resource. Valid types are `AmazonWebServicesAccount`, `AzureAccount`, `GoogleCloudAccount`, `UsernamePasswordAccount`, `Certificate`, `Sensitive`, `String`, or `WorkerPool`.", Required: true, Type: schema.TypeString, ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{ @@ -433,6 +433,7 @@ func getVariableTypeSchema() *schema.Schema { "Sensitive", "String", "WorkerPool", + "UsernamePasswordAccount", }, false)), } } diff --git a/terraform/1-singlespace/config.tf b/terraform/1-singlespace/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/1-singlespace/config.tf +++ b/terraform/1-singlespace/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/10-helmfeed/config.tf b/terraform/10-helmfeed/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/10-helmfeed/config.tf +++ b/terraform/10-helmfeed/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/10a-helmfeedds/config.tf b/terraform/10a-helmfeedds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/10a-helmfeedds/config.tf +++ b/terraform/10a-helmfeedds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/11-dockerfeed/config.tf b/terraform/11-dockerfeed/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/11-dockerfeed/config.tf +++ b/terraform/11-dockerfeed/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/11a-dockerfeedds/config.tf b/terraform/11a-dockerfeedds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/11a-dockerfeedds/config.tf +++ b/terraform/11a-dockerfeedds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/12-ecrfeed/config.tf b/terraform/12-ecrfeed/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/12-ecrfeed/config.tf +++ b/terraform/12-ecrfeed/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/12a-ecrfeedds/config.tf b/terraform/12a-ecrfeedds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/12a-ecrfeedds/config.tf +++ b/terraform/12a-ecrfeedds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/13-mavenfeed/config.tf b/terraform/13-mavenfeed/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/13-mavenfeed/config.tf +++ b/terraform/13-mavenfeed/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/13a-mavenfeedds/config.tf b/terraform/13a-mavenfeedds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/13a-mavenfeedds/config.tf +++ b/terraform/13a-mavenfeedds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/14-nugetfeed/config.tf b/terraform/14-nugetfeed/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/14-nugetfeed/config.tf +++ b/terraform/14-nugetfeed/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/14a-nugetfeedds/config.tf b/terraform/14a-nugetfeedds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/14a-nugetfeedds/config.tf +++ b/terraform/14a-nugetfeedds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/15-workerpool/config.tf b/terraform/15-workerpool/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/15-workerpool/config.tf +++ b/terraform/15-workerpool/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/15a-workerpoolds/config.tf b/terraform/15a-workerpoolds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/15a-workerpoolds/config.tf +++ b/terraform/15a-workerpoolds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/16-environment/config.tf b/terraform/16-environment/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/16-environment/config.tf +++ b/terraform/16-environment/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/16a-environmentlookup/config.tf b/terraform/16a-environmentlookup/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/16a-environmentlookup/config.tf +++ b/terraform/16a-environmentlookup/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/17-lifecycle/config.tf b/terraform/17-lifecycle/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/17-lifecycle/config.tf +++ b/terraform/17-lifecycle/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/17a-lifecycleds/config.tf b/terraform/17a-lifecycleds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/17a-lifecycleds/config.tf +++ b/terraform/17a-lifecycleds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/18-variableset/config.tf b/terraform/18-variableset/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/18-variableset/config.tf +++ b/terraform/18-variableset/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/18a-variablesetds/config.tf b/terraform/18a-variablesetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/18a-variablesetds/config.tf +++ b/terraform/18a-variablesetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/19-project/config.tf b/terraform/19-project/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/19-project/config.tf +++ b/terraform/19-project/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/19a-projectds/config.tf b/terraform/19a-projectds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/19a-projectds/config.tf +++ b/terraform/19a-projectds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/19b-projectspace/config.tf b/terraform/19b-projectspace/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/19b-projectspace/config.tf +++ b/terraform/19b-projectspace/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/2-projectgroup/config.tf b/terraform/2-projectgroup/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/2-projectgroup/config.tf +++ b/terraform/2-projectgroup/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/20-channel/config.tf b/terraform/20-channel/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/20-channel/config.tf +++ b/terraform/20-channel/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/20a-channelds/config.tf b/terraform/20a-channelds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/20a-channelds/config.tf +++ b/terraform/20a-channelds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/21-tagset/config.tf b/terraform/21-tagset/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/21-tagset/config.tf +++ b/terraform/21-tagset/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/22-gitcredentialtest/config.tf b/terraform/22-gitcredentialtest/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/22-gitcredentialtest/config.tf +++ b/terraform/22-gitcredentialtest/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/22a-gitcredentialtestds/config.tf b/terraform/22a-gitcredentialtestds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/22a-gitcredentialtestds/config.tf +++ b/terraform/22a-gitcredentialtestds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/23-scriptmodule/config.tf b/terraform/23-scriptmodule/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/23-scriptmodule/config.tf +++ b/terraform/23-scriptmodule/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/23a-scriptmoduleds/config.tf b/terraform/23a-scriptmoduleds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/23a-scriptmoduleds/config.tf +++ b/terraform/23a-scriptmoduleds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/24-tenants/config.tf b/terraform/24-tenants/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/24-tenants/config.tf +++ b/terraform/24-tenants/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/24a-tenantsds/config.tf b/terraform/24a-tenantsds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/24a-tenantsds/config.tf +++ b/terraform/24a-tenantsds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/25-certificates/config.tf b/terraform/25-certificates/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/25-certificates/config.tf +++ b/terraform/25-certificates/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/25a-certificatesds/config.tf b/terraform/25a-certificatesds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/25a-certificatesds/config.tf +++ b/terraform/25a-certificatesds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/26-tenant_variables/config.tf b/terraform/26-tenant_variables/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/26-tenant_variables/config.tf +++ b/terraform/26-tenant_variables/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/27-machinepolicy/config.tf b/terraform/27-machinepolicy/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/27-machinepolicy/config.tf +++ b/terraform/27-machinepolicy/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/28-projecttrigger/config.tf b/terraform/28-projecttrigger/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/28-projecttrigger/config.tf +++ b/terraform/28-projecttrigger/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/29-k8starget/config.tf b/terraform/29-k8starget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/29-k8starget/config.tf +++ b/terraform/29-k8starget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/29a-k8stargetds/config.tf b/terraform/29a-k8stargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/29a-k8stargetds/config.tf +++ b/terraform/29a-k8stargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/2a-projectgroupds/config.tf b/terraform/2a-projectgroupds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/2a-projectgroupds/config.tf +++ b/terraform/2a-projectgroupds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/3-awsaccount/config.tf b/terraform/3-awsaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/3-awsaccount/config.tf +++ b/terraform/3-awsaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/30-sshtarget/config.tf b/terraform/30-sshtarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/30-sshtarget/config.tf +++ b/terraform/30-sshtarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/30a-sshtargetds/config.tf b/terraform/30a-sshtargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/30a-sshtargetds/config.tf +++ b/terraform/30a-sshtargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/31-listeningtarget/config.tf b/terraform/31-listeningtarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/31-listeningtarget/config.tf +++ b/terraform/31-listeningtarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/31a-listeningtargetds/config.tf b/terraform/31a-listeningtargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/31a-listeningtargetds/config.tf +++ b/terraform/31a-listeningtargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/32-pollingtarget/config.tf b/terraform/32-pollingtarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/32-pollingtarget/config.tf +++ b/terraform/32-pollingtarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/32a-pollingtargetds/config.tf b/terraform/32a-pollingtargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/32a-pollingtargetds/config.tf +++ b/terraform/32a-pollingtargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/33-cloudregiontarget/config.tf b/terraform/33-cloudregiontarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/33-cloudregiontarget/config.tf +++ b/terraform/33-cloudregiontarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/33a-cloudregiontargetds/config.tf b/terraform/33a-cloudregiontargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/33a-cloudregiontargetds/config.tf +++ b/terraform/33a-cloudregiontargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/34-offlinedroptarget/config.tf b/terraform/34-offlinedroptarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/34-offlinedroptarget/config.tf +++ b/terraform/34-offlinedroptarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/34a-offlinedroptargetds/config.tf b/terraform/34a-offlinedroptargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/34a-offlinedroptargetds/config.tf +++ b/terraform/34a-offlinedroptargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/35-azurecloudservicetarget/config.tf b/terraform/35-azurecloudservicetarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/35-azurecloudservicetarget/config.tf +++ b/terraform/35-azurecloudservicetarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/35a-azurecloudservicetargetds/config.tf b/terraform/35a-azurecloudservicetargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/35a-azurecloudservicetargetds/config.tf +++ b/terraform/35a-azurecloudservicetargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/36-servicefabrictarget/config.tf b/terraform/36-servicefabrictarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/36-servicefabrictarget/config.tf +++ b/terraform/36-servicefabrictarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/36a-servicefabrictargetds/config.tf b/terraform/36a-servicefabrictargetds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/36a-servicefabrictargetds/config.tf +++ b/terraform/36a-servicefabrictargetds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/37-webapptarget/config.tf b/terraform/37-webapptarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/37-webapptarget/config.tf +++ b/terraform/37-webapptarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/37a-webapptarget/config.tf b/terraform/37a-webapptarget/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/37a-webapptarget/config.tf +++ b/terraform/37a-webapptarget/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/39-projectgitusername/config.tf b/terraform/39-projectgitusername/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/39-projectgitusername/config.tf +++ b/terraform/39-projectgitusername/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/3a-awsaccountds/config.tf b/terraform/3a-awsaccountds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/3a-awsaccountds/config.tf +++ b/terraform/3a-awsaccountds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/4-azureaccount/config.tf b/terraform/4-azureaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/4-azureaccount/config.tf +++ b/terraform/4-azureaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/40-escapedollar/config.tf b/terraform/40-escapedollar/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/40-escapedollar/config.tf +++ b/terraform/40-escapedollar/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/41-terraforminlinescript/config.tf b/terraform/41-terraforminlinescript/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/41-terraforminlinescript/config.tf +++ b/terraform/41-terraforminlinescript/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/42-terraformpackagescript/config.tf b/terraform/42-terraformpackagescript/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/42-terraformpackagescript/config.tf +++ b/terraform/42-terraformpackagescript/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/43-users/config.tf b/terraform/43-users/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/43-users/config.tf +++ b/terraform/43-users/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/43a-usersds/config.tf b/terraform/43a-usersds/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/43a-usersds/config.tf +++ b/terraform/43a-usersds/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/44-githubfeed/config.tf b/terraform/44-githubfeed/config.tf index 4d1bace2d..2113da144 100644 --- a/terraform/44-githubfeed/config.tf +++ b/terraform/44-githubfeed/config.tf @@ -1,5 +1,5 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } } } diff --git a/terraform/44a-githubfeedds/config.tf b/terraform/44a-githubfeedds/config.tf index 4d1bace2d..2113da144 100644 --- a/terraform/44a-githubfeedds/config.tf +++ b/terraform/44a-githubfeedds/config.tf @@ -1,5 +1,5 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } } } diff --git a/terraform/45-projectwithscriptactions/config.tf b/terraform/45-projectwithscriptactions/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/45-projectwithscriptactions/config.tf +++ b/terraform/45-projectwithscriptactions/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/46-runbooks/config.tf b/terraform/46-runbooks/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/46-runbooks/config.tf +++ b/terraform/46-runbooks/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/49-variables/config.tf b/terraform/49-variables/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/49-variables/config.tf +++ b/terraform/49-variables/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/5-userpassaccount/config.tf b/terraform/5-userpassaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/5-userpassaccount/config.tf +++ b/terraform/5-userpassaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/50-applyterraformtemplateaction/config.tf b/terraform/50-applyterraformtemplateaction/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/50-applyterraformtemplateaction/config.tf +++ b/terraform/50-applyterraformtemplateaction/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/51-deploymentprocesswithgitdependency/config.tf b/terraform/51-deploymentprocesswithgitdependency/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/51-deploymentprocesswithgitdependency/config.tf +++ b/terraform/51-deploymentprocesswithgitdependency/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/52-packagefeedcreatereleasetrigger/config.tf b/terraform/52-packagefeedcreatereleasetrigger/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/52-packagefeedcreatereleasetrigger/config.tf +++ b/terraform/52-packagefeedcreatereleasetrigger/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/53-scheduledprojecttrigger/config.tf b/terraform/53-scheduledprojecttrigger/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/53-scheduledprojecttrigger/config.tf +++ b/terraform/53-scheduledprojecttrigger/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/54-usernamepasswordvariable/config.tf b/terraform/54-usernamepasswordvariable/config.tf new file mode 100644 index 000000000..2113da144 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/config.tf @@ -0,0 +1,5 @@ +terraform { + required_providers { + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } + } +} diff --git a/terraform/54-usernamepasswordvariable/project.tf b/terraform/54-usernamepasswordvariable/project.tf new file mode 100644 index 000000000..fd2587729 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/project.tf @@ -0,0 +1,39 @@ +data "octopusdeploy_lifecycles" "lifecycle_default_lifecycle" { + ids = null + partial_name = "Default Lifecycle" + skip = 0 + take = 1 +} + +resource "octopusdeploy_variable" "userpass_variable" { + owner_id = octopusdeploy_project.deploy_frontend_project.id + type = "UsernamePasswordAccount" + name = "UsernamePasswordVariable" + value = octopusdeploy_username_password_account.account_user_pass.id +} + +resource "octopusdeploy_project" "deploy_frontend_project" { + auto_create_release = false + default_guided_failure_mode = "EnvironmentDefault" + default_to_skip_if_already_installed = false + description = "Test project" + discrete_channel_release = false + is_disabled = false + is_discrete_channel_release = false + is_version_controlled = false + lifecycle_id = data.octopusdeploy_lifecycles.lifecycle_default_lifecycle.lifecycles[0].id + name = "Test" + project_group_id = octopusdeploy_project_group.project_group_test.id + tenanted_deployment_participation = "Untenanted" + space_id = var.octopus_space_id + included_library_variable_sets = [] + versioning_strategy { + template = "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.LastPatch}.#{Octopus.Version.NextRevision}" + } + + connectivity_policy { + allow_deployments_to_no_targets = false + exclude_unhealthy_targets = false + skip_machine_behavior = "SkipUnavailableMachines" + } +} diff --git a/terraform/54-usernamepasswordvariable/project_group_test.tf b/terraform/54-usernamepasswordvariable/project_group_test.tf new file mode 100644 index 000000000..438a4f9c7 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/project_group_test.tf @@ -0,0 +1,4 @@ +resource "octopusdeploy_project_group" "project_group_test" { + name = "Test" + description = "Test Description" +} diff --git a/terraform/54-usernamepasswordvariable/provider.tf b/terraform/54-usernamepasswordvariable/provider.tf new file mode 100644 index 000000000..a04197720 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/provider.tf @@ -0,0 +1,5 @@ +provider "octopusdeploy" { + address = "${var.octopus_server}" + api_key = "${var.octopus_apikey}" + space_id = "${var.octopus_space_id}" +} diff --git a/terraform/54-usernamepasswordvariable/provider_vars.tf b/terraform/54-usernamepasswordvariable/provider_vars.tf new file mode 100644 index 000000000..c7d93fe40 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/provider_vars.tf @@ -0,0 +1,18 @@ +variable "octopus_server" { + type = string + nullable = false + sensitive = false + description = "The URL of the Octopus server e.g. https://myinstance.octopus.app." +} +variable "octopus_apikey" { + type = string + nullable = false + sensitive = true + description = "The API key used to access the Octopus server. See https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key for details on creating an API key." +} +variable "octopus_space_id" { + type = string + nullable = false + sensitive = false + description = "The space ID to populate" +} diff --git a/terraform/54-usernamepasswordvariable/space.tf b/terraform/54-usernamepasswordvariable/space.tf new file mode 100644 index 000000000..ee59bdc80 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/space.tf @@ -0,0 +1,3 @@ +output "octopus_space_id" { + value = var.octopus_space_id +} diff --git a/terraform/54-usernamepasswordvariable/usernamepassword_account.tf b/terraform/54-usernamepasswordvariable/usernamepassword_account.tf new file mode 100644 index 000000000..808e9b5f6 --- /dev/null +++ b/terraform/54-usernamepasswordvariable/usernamepassword_account.tf @@ -0,0 +1,10 @@ +resource "octopusdeploy_username_password_account" "account_user_pass" { + description = "A test account" + name = "Username Password" + environments = null + tenant_tags = [] + tenants = null + tenanted_deployment_participation = "Untenanted" + username = "admin" + password = "secretgoeshere" +} \ No newline at end of file diff --git a/terraform/6-gcpaccount/config.tf b/terraform/6-gcpaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/6-gcpaccount/config.tf +++ b/terraform/6-gcpaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/7-sshaccount/config.tf b/terraform/7-sshaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/7-sshaccount/config.tf +++ b/terraform/7-sshaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/8-azuresubscriptionaccount/config.tf b/terraform/8-azuresubscriptionaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/8-azuresubscriptionaccount/config.tf +++ b/terraform/8-azuresubscriptionaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } } diff --git a/terraform/9-tokenaccount/config.tf b/terraform/9-tokenaccount/config.tf index 8a9eaf8a9..96443e7a1 100644 --- a/terraform/9-tokenaccount/config.tf +++ b/terraform/9-tokenaccount/config.tf @@ -1,6 +1,6 @@ terraform { required_providers { - octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.11.3" } + octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.18.1" } // Use the option below when debugging // octopusdeploy = { source = "octopus.com/com/octopusdeploy" } }