Skip to content

Commit 6238463

Browse files
Update ACR and GCR feed types that have been created as docker feeds
1 parent e58605b commit 6238463

11 files changed

+871
-317
lines changed

examples/resources/octopusdeploy_azure_container_registry/resource.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource "octopusdeploy_azure_container_registry" "example" {
88
resource "octopusdeploy_azure_container_register" "example_with_oidc" {
99
name = "Test Azure Container Registry (OK to Delete)"
1010
feed_uri = "https://test-azure.azurecr.io"
11-
oidc_authentication {
11+
oidc_authentication = {
1212
client_id = "client_id"
1313
tenant_id = "tenant_id"
1414
audience = "audience"

examples/resources/octopusdeploy_google_container_registry/resource.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "octopusdeploy_google_container_registry" "example_with_oidc" {
99
name = "Test Google Container Registry (OK to Delete)"
1010
feed_uri = "https://google.docker.test"
1111
registry_path = "testing/test-image"
12-
oidc_authentication {
12+
oidc_authentication = {
1313
audience = "audience"
1414
subject_keys = ["feed", "space"]
1515
}

go.mod

Lines changed: 77 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,163 @@
11
module github.com/OctopusDeploy/terraform-provider-octopusdeploy
22

3-
go 1.22.0
3+
go 1.23.7
44

5-
toolchain go1.22.5
5+
toolchain go1.24.5
66

77
require (
88
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.76.0
9-
github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20250307001652-0d83fd2b1e49
9+
github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v1.0.1
1010
github.com/google/uuid v1.6.0
11-
github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
12-
github.com/hashicorp/terraform-plugin-docs v0.13.0
13-
github.com/hashicorp/terraform-plugin-framework v1.11.0
11+
github.com/hashicorp/go-cty v1.5.0
12+
github.com/hashicorp/terraform-plugin-docs v0.22.0
13+
github.com/hashicorp/terraform-plugin-framework v1.15.0
1414
github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0
15-
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
16-
github.com/hashicorp/terraform-plugin-go v0.23.0
15+
github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
16+
github.com/hashicorp/terraform-plugin-go v0.28.0
1717
github.com/hashicorp/terraform-plugin-log v0.9.0
18-
github.com/hashicorp/terraform-plugin-mux v0.16.0
19-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
20-
github.com/hashicorp/terraform-plugin-testing v1.8.0
18+
github.com/hashicorp/terraform-plugin-mux v0.20.0
19+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
20+
github.com/hashicorp/terraform-plugin-testing v1.13.2
2121
github.com/stretchr/testify v1.10.0
22-
github.com/testcontainers/testcontainers-go v0.35.0
23-
golang.org/x/text v0.21.0
24-
software.sslmate.com/src/go-pkcs12 v0.4.0
22+
github.com/testcontainers/testcontainers-go v0.37.0
23+
golang.org/x/text v0.27.0
24+
software.sslmate.com/src/go-pkcs12 v0.5.0
2525
)
2626

27+
// replace github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework => ../OctopusTerraformTestFramework
28+
29+
// replace github.com/OctopusDeploy/go-octopusdeploy/v2 => ../go-octopusdeploy
30+
2731
require (
28-
dario.cat/mergo v1.0.1 // indirect
32+
dario.cat/mergo v1.0.2 // indirect
2933
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
34+
github.com/BurntSushi/toml v1.2.1 // indirect
35+
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
3036
github.com/Masterminds/goutils v1.1.1 // indirect
3137
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3238
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3339
github.com/Microsoft/go-winio v0.6.2 // indirect
3440
github.com/OctopusDeploy/go-octodiff v1.0.0 // indirect
35-
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
41+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
3642
github.com/agext/levenshtein v1.2.3 // indirect
3743
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3844
github.com/armon/go-radix v1.0.0 // indirect
39-
github.com/avast/retry-go/v4 v4.6.0 // indirect
45+
github.com/avast/retry-go/v4 v4.6.1 // indirect
4046
github.com/bahlo/generic-list-go v0.2.0 // indirect
4147
github.com/bgentry/speakeasy v0.1.0 // indirect
48+
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
4249
github.com/buger/jsonparser v1.1.1 // indirect
4350
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
44-
github.com/cloudflare/circl v1.3.7 // indirect
51+
github.com/cloudflare/circl v1.6.1 // indirect
52+
github.com/containerd/errdefs v1.0.0 // indirect
53+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4554
github.com/containerd/log v0.1.0 // indirect
4655
github.com/containerd/platforms v0.2.1 // indirect
4756
github.com/cpuguy83/dockercfg v0.3.2 // indirect
4857
github.com/davecgh/go-spew v1.1.1 // indirect
49-
github.com/dghubble/sling v1.4.1 // indirect
58+
github.com/dghubble/sling v1.4.2 // indirect
5059
github.com/distribution/reference v0.6.0 // indirect
51-
github.com/docker/docker v27.5.1+incompatible // indirect
60+
github.com/docker/docker v28.3.2+incompatible // indirect
5261
github.com/docker/go-connections v0.5.0 // indirect
5362
github.com/docker/go-units v0.5.0 // indirect
63+
github.com/ebitengine/purego v0.8.4 // indirect
5464
github.com/fatih/color v1.16.0 // indirect
5565
github.com/felixge/httpsnoop v1.0.4 // indirect
56-
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
57-
github.com/go-logr/logr v1.4.2 // indirect
66+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
67+
github.com/go-logr/logr v1.4.3 // indirect
5868
github.com/go-logr/stdr v1.2.2 // indirect
5969
github.com/go-ole/go-ole v1.3.0 // indirect
6070
github.com/go-playground/locales v0.14.1 // indirect
6171
github.com/go-playground/universal-translator v0.18.1 // indirect
62-
github.com/go-playground/validator/v10 v10.25.0 // indirect
72+
github.com/go-playground/validator/v10 v10.27.0 // indirect
6373
github.com/go-test/deep v1.0.7 // indirect
6474
github.com/gogo/protobuf v1.3.2 // indirect
6575
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/go-cmp v0.6.0 // indirect
76+
github.com/google/go-cmp v0.7.0 // indirect
6777
github.com/google/go-querystring v1.1.0 // indirect
78+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
79+
github.com/hashicorp/cli v1.1.7 // indirect
6880
github.com/hashicorp/errwrap v1.1.0 // indirect
6981
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
7082
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7183
github.com/hashicorp/go-hclog v1.6.3 // indirect
7284
github.com/hashicorp/go-multierror v1.1.1 // indirect
73-
github.com/hashicorp/go-plugin v1.6.0 // indirect
85+
github.com/hashicorp/go-plugin v1.6.3 // indirect
86+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7487
github.com/hashicorp/go-uuid v1.0.3 // indirect
75-
github.com/hashicorp/go-version v1.6.0 // indirect
76-
github.com/hashicorp/hc-install v0.6.4 // indirect
77-
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
88+
github.com/hashicorp/go-version v1.7.0 // indirect
89+
github.com/hashicorp/hc-install v0.9.2 // indirect
90+
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
7891
github.com/hashicorp/logutils v1.0.0 // indirect
79-
github.com/hashicorp/terraform-exec v0.21.0 // indirect
80-
github.com/hashicorp/terraform-json v0.22.1 // indirect
81-
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
92+
github.com/hashicorp/terraform-exec v0.23.0 // indirect
93+
github.com/hashicorp/terraform-json v0.25.0 // indirect
94+
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
8295
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
8396
github.com/hashicorp/yamux v0.1.1 // indirect
8497
github.com/huandu/xstrings v1.4.0 // indirect
8598
github.com/imdario/mergo v0.3.15 // indirect
86-
github.com/klauspost/compress v1.17.11 // indirect
99+
github.com/klauspost/compress v1.18.0 // indirect
87100
github.com/leodido/go-urn v1.4.0 // indirect
88-
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
89-
github.com/magiconair/properties v1.8.9 // indirect
90-
github.com/mailru/easyjson v0.7.7 // indirect
91-
github.com/mattn/go-colorable v0.1.13 // indirect
101+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
102+
github.com/magiconair/properties v1.8.10 // indirect
103+
github.com/mailru/easyjson v0.9.0 // indirect
104+
github.com/mattn/go-colorable v0.1.14 // indirect
92105
github.com/mattn/go-isatty v0.0.20 // indirect
93-
github.com/mitchellh/cli v1.1.5 // indirect
106+
github.com/mattn/go-runewidth v0.0.9 // indirect
94107
github.com/mitchellh/copystructure v1.2.0 // indirect
95108
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
96109
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
97110
github.com/mitchellh/mapstructure v1.5.0 // indirect
98111
github.com/mitchellh/reflectwalk v1.0.2 // indirect
99112
github.com/moby/docker-image-spec v1.3.1 // indirect
113+
github.com/moby/go-archive v0.1.0 // indirect
100114
github.com/moby/patternmatcher v0.6.0 // indirect
101115
github.com/moby/sys/sequential v0.6.0 // indirect
102-
github.com/moby/sys/user v0.3.0 // indirect
116+
github.com/moby/sys/user v0.4.0 // indirect
103117
github.com/moby/sys/userns v0.1.0 // indirect
104118
github.com/moby/term v0.5.2 // indirect
105119
github.com/morikuni/aec v1.0.0 // indirect
106120
github.com/oklog/run v1.1.0 // indirect
107121
github.com/opencontainers/go-digest v1.0.0 // indirect
108-
github.com/opencontainers/image-spec v1.1.0 // indirect
109-
github.com/otiai10/copy v1.14.0 // indirect
122+
github.com/opencontainers/image-spec v1.1.1 // indirect
123+
github.com/otiai10/copy v1.14.1 // indirect
124+
github.com/otiai10/mint v1.6.3 // indirect
110125
github.com/pkg/errors v0.9.1 // indirect
111126
github.com/pmezard/go-difflib v1.0.0 // indirect
112127
github.com/posener/complete v1.2.3 // indirect
113128
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
114-
github.com/russross/blackfriday v1.6.0 // indirect
115-
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
116-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
129+
github.com/shirou/gopsutil/v4 v4.25.6 // indirect
117130
github.com/shopspring/decimal v1.3.1 // indirect
118131
github.com/sirupsen/logrus v1.9.3 // indirect
119132
github.com/spf13/cast v1.5.0 // indirect
120-
github.com/tklauser/go-sysconf v0.3.14 // indirect
121-
github.com/tklauser/numcpus v0.9.0 // indirect
133+
github.com/tklauser/go-sysconf v0.3.15 // indirect
134+
github.com/tklauser/numcpus v0.10.0 // indirect
122135
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
123136
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
124137
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
125138
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
139+
github.com/yuin/goldmark v1.7.7 // indirect
140+
github.com/yuin/goldmark-meta v1.1.0 // indirect
126141
github.com/yusufpapurcu/wmi v1.2.4 // indirect
127-
github.com/zclconf/go-cty v1.14.4 // indirect
142+
github.com/zclconf/go-cty v1.16.3 // indirect
143+
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
128144
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
129-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
130-
go.opentelemetry.io/otel v1.34.0 // indirect
131-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
132-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
133-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
134-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
135-
golang.org/x/crypto v0.32.0 // indirect
136-
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
137-
golang.org/x/mod v0.19.0 // indirect
138-
golang.org/x/net v0.34.0 // indirect
139-
golang.org/x/sync v0.10.0 // indirect
140-
golang.org/x/sys v0.29.0 // indirect
145+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
146+
go.opentelemetry.io/otel v1.37.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
149+
golang.org/x/crypto v0.40.0 // indirect
150+
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect
151+
golang.org/x/mod v0.26.0 // indirect
152+
golang.org/x/net v0.42.0 // indirect
153+
golang.org/x/sync v0.16.0 // indirect
154+
golang.org/x/sys v0.34.0 // indirect
141155
golang.org/x/time v0.5.0 // indirect
142-
golang.org/x/tools v0.23.0 // indirect
156+
golang.org/x/tools v0.35.0 // indirect
143157
google.golang.org/appengine v1.6.8 // indirect
144-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
145-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
146-
google.golang.org/grpc v1.64.1 // indirect
147-
google.golang.org/protobuf v1.34.0 // indirect
158+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
159+
google.golang.org/grpc v1.72.1 // indirect
160+
google.golang.org/protobuf v1.36.6 // indirect
161+
gopkg.in/yaml.v2 v2.3.0 // indirect
148162
gopkg.in/yaml.v3 v3.0.1 // indirect
149163
)

0 commit comments

Comments
 (0)