Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita845370

Browse files
authored
chore: upgrade terraform-provider-coder to v2 (#16586)
1 parent1ce4dfe commita845370

File tree

5 files changed

+36
-27
lines changed

5 files changed

+36
-27
lines changed

‎codersdk/richparameters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"golang.org/x/xerrors"
77

8-
"github.com/coder/terraform-provider-coder/provider"
8+
"github.com/coder/terraform-provider-coder/v2/provider"
99
)
1010

1111
funcValidateNewWorkspaceParameters(richParameters []TemplateVersionParameter,buildParameters []WorkspaceBuildParameter)error {

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
modulegithub.com/coder/coder/v2
22

3-
go1.22.8
3+
go1.22.9
44

55
// Required until a v3 of chroma is created to lazily initialize all XML files.
66
// None of our dependencies seem to use the registries anyways, so this
@@ -94,7 +94,7 @@ require (
9494
github.com/coder/quartzv0.1.2
9595
github.com/coder/retryv1.5.1
9696
github.com/coder/serpentv0.10.0
97-
github.com/coder/terraform-provider-coderv1.0.4
97+
github.com/coder/terraform-provider-coder/v2v2.1.3
9898
github.com/coder/websocketv1.8.12
9999
github.com/coder/wgtunnelv0.1.13-0.20240522110300-ade90dfb2da0
100100
github.com/coreos/go-oidc/v3v3.12.0
@@ -132,7 +132,7 @@ require (
132132
github.com/hashicorp/go-multierrorv1.1.1
133133
github.com/hashicorp/go-reapv0.0.0-20170704170343-bf58d8a43e7b
134134
github.com/hashicorp/go-versionv1.7.0
135-
github.com/hashicorp/hc-installv0.9.0
135+
github.com/hashicorp/hc-installv0.9.1
136136
github.com/hashicorp/terraform-config-inspectv0.0.0-20211115214459-90acf1ca460f
137137
github.com/hashicorp/terraform-jsonv0.24.0
138138
github.com/hashicorp/yamuxv0.1.2
@@ -238,7 +238,7 @@ require (
238238
github.com/Microsoft/go-winiov0.6.2// indirect
239239
github.com/Nvveen/Gottyv0.0.0-20120604004816-cd527374f1e5// indirect
240240
github.com/OneOfOne/xxhashv1.2.8// indirect
241-
github.com/ProtonMail/go-cryptov1.1.0-alpha.2// indirect
241+
github.com/ProtonMail/go-cryptov1.1.3// indirect
242242
github.com/agext/levenshteinv1.2.3// indirect
243243
github.com/agnivade/levenshteinv1.2.0// indirect
244244
github.com/akutz/memconnv0.1.0// indirect
@@ -338,9 +338,9 @@ require (
338338
github.com/hashicorp/hclv1.0.1-vault-5// indirect
339339
github.com/hashicorp/hcl/v2v2.23.0
340340
github.com/hashicorp/logutilsv1.0.0// indirect
341-
github.com/hashicorp/terraform-plugin-gov0.25.0// indirect
341+
github.com/hashicorp/terraform-plugin-gov0.26.0// indirect
342342
github.com/hashicorp/terraform-plugin-logv0.9.0// indirect
343-
github.com/hashicorp/terraform-plugin-sdk/v2v2.35.0// indirect
343+
github.com/hashicorp/terraform-plugin-sdk/v2v2.36.0// indirect
344344
github.com/hdevalence/ed25519consensusv0.1.0// indirect
345345
github.com/illarion/gonotifyv1.0.1// indirect
346346
github.com/insomniacslk/dhcpv0.0.0-20231206064809-8c70d406f6d2// indirect
@@ -438,7 +438,7 @@ require (
438438
github.com/yuin/goldmarkv1.7.8// indirect
439439
github.com/yuin/goldmark-emojiv1.0.4// indirect
440440
github.com/yusufpapurcu/wmiv1.2.4// indirect
441-
github.com/zclconf/go-ctyv1.16.0
441+
github.com/zclconf/go-ctyv1.16.2
442442
github.com/zeebo/errsv1.3.0// indirect
443443
go.opentelemetry.io/auto/sdkv1.1.0// indirect
444444
go.opentelemetry.io/collector/componentv0.104.0// indirect

‎go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV
6464
github.com/Nvveen/Gottyv0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
6565
github.com/OneOfOne/xxhashv1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
6666
github.com/OneOfOne/xxhashv1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
67-
github.com/ProtonMail/go-cryptov1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
68-
github.com/ProtonMail/go-cryptov1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
67+
github.com/ProtonMail/go-cryptov1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
68+
github.com/ProtonMail/go-cryptov1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
6969
github.com/acarl005/stripansiv0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
7070
github.com/acarl005/stripansiv0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
7171
github.com/adrg/xdgv0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
@@ -240,8 +240,8 @@ github.com/coder/tailscale v1.1.1-0.20250129014916-8086c871eae6 h1:prDIwUcsSEKbs
240240
github.com/coder/tailscalev1.1.1-0.20250129014916-8086c871eae6/go.mod h1:1ggFFdHTRjPRu9Yc1yA7nVHBYB50w9Ce7VIXNqcW6Ko=
241241
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e h1:JNLPDi2P73laR1oAclY6jWzAbucf70ASAvf5mh2cME0=
242242
github.com/coder/terraform-config-inspectv0.0.0-20250107175719-6d06d90c630e/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
243-
github.com/coder/terraform-provider-coderv1.0.4 h1:MJldCvykIQzzqBVUDjCJpPyqvKelAAHrtJKfIIx4Qxo=
244-
github.com/coder/terraform-provider-coderv1.0.4/go.mod h1:dQ1e/IccUxnmh/1bXTA3PopSoBkHMyWT6EkdBw8Lx6Y=
243+
github.com/coder/terraform-provider-coder/v2v2.1.3 h1:zB7ObGsiOGBHcJUUMmcSauEPlTWRIYmMYieF05LxHSc=
244+
github.com/coder/terraform-provider-coder/v2v2.1.3/go.mod h1:RHGyb+ghiy8UpDAMJM8duRFuzd+1VqA3AtkRLh2P3Ug=
245245
github.com/coder/websocketv1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
246246
github.com/coder/websocketv1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
247247
github.com/coder/wgtunnelv0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
@@ -535,26 +535,26 @@ github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
535535
github.com/hashicorp/golang-lruv1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
536536
github.com/hashicorp/golang-lru/v2v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
537537
github.com/hashicorp/golang-lru/v2v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
538-
github.com/hashicorp/hc-installv0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE=
539-
github.com/hashicorp/hc-installv0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg=
538+
github.com/hashicorp/hc-installv0.9.1 h1:gkqTfE3vVbafGQo6VZXcy2v5yoz2bE0+nhZXruCuODQ=
539+
github.com/hashicorp/hc-installv0.9.1/go.mod h1:pWWvN/IrfeBK4XPeXXYkL6EjMufHkCK5DvwxeLKuBf0=
540540
github.com/hashicorp/hclv1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM=
541541
github.com/hashicorp/hclv1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
542542
github.com/hashicorp/hcl/v2v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
543543
github.com/hashicorp/hcl/v2v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
544544
github.com/hashicorp/logutilsv1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
545545
github.com/hashicorp/logutilsv1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
546-
github.com/hashicorp/terraform-execv0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ=
547-
github.com/hashicorp/terraform-execv0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg=
546+
github.com/hashicorp/terraform-execv0.22.0 h1:G5+4Sz6jYZfRYUCg6eQgDsqTzkNXV+fP8l+uRmZHj64=
547+
github.com/hashicorp/terraform-execv0.22.0/go.mod h1:bjVbsncaeh8jVdhttWYZuBGj21FcYw6Ia/XfHcNO7lQ=
548548
github.com/hashicorp/terraform-jsonv0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=
549549
github.com/hashicorp/terraform-jsonv0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=
550-
github.com/hashicorp/terraform-plugin-gov0.25.0 h1:oi13cx7xXA6QciMcpcFi/rwA974rdTxjqEhXJjbAyks=
551-
github.com/hashicorp/terraform-plugin-gov0.25.0/go.mod h1:+SYagMYadJP86Kvn+TGeV+ofr/R3g4/If0O5sO96MVw=
550+
github.com/hashicorp/terraform-plugin-gov0.26.0 h1:cuIzCv4qwigug3OS7iKhpGAbZTiypAfFQmw8aE65O2M=
551+
github.com/hashicorp/terraform-plugin-gov0.26.0/go.mod h1:+CXjuLDiFgqR+GcrM5a2E2Kal5t5q2jb0E3D57tTdNY=
552552
github.com/hashicorp/terraform-plugin-logv0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
553553
github.com/hashicorp/terraform-plugin-logv0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
554-
github.com/hashicorp/terraform-plugin-sdk/v2v2.35.0 h1:wyKCCtn6pBBL46c1uIIBNUOWlNfYXfXpVo16iDyLp8Y=
555-
github.com/hashicorp/terraform-plugin-sdk/v2v2.35.0/go.mod h1:B0Al8NyYVr8Mp/KLwssKXG1RqnTk7FySqSn4fRuLNgw=
556-
github.com/hashicorp/terraform-registry-addressv0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
557-
github.com/hashicorp/terraform-registry-addressv0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
554+
github.com/hashicorp/terraform-plugin-sdk/v2v2.36.0 h1:7/iejAPyCRBhqAg3jOx+4UcAhY0A+Sg8B+0+d/GxSfM=
555+
github.com/hashicorp/terraform-plugin-sdk/v2v2.36.0/go.mod h1:TiQwXAjFrgBf5tg5rvBRz8/ubPULpU0HjSaVi5UoJf8=
556+
github.com/hashicorp/terraform-registry-addressv0.2.4 h1:JXu/zHB2Ymg/TGVCRu10XqNa4Sh2bWcqCNyKWjnCPJA=
557+
github.com/hashicorp/terraform-registry-addressv0.2.4/go.mod h1:tUNYTVyCtU4OIGXXMDp7WNcJ+0W1B4nmstVDgHMjfAU=
558558
github.com/hashicorp/terraform-svchostv0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
559559
github.com/hashicorp/terraform-svchostv0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc=
560560
github.com/hashicorp/yamuxv0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
@@ -969,8 +969,8 @@ github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxA
969969
github.com/yuin/goldmark-emojiv1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
970970
github.com/yusufpapurcu/wmiv1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
971971
github.com/yusufpapurcu/wmiv1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
972-
github.com/zclconf/go-ctyv1.16.0 h1:xPKEhst+BW5D0wxebMZkxgapvOE/dw7bFTlgSc9nD6w=
973-
github.com/zclconf/go-ctyv1.16.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
972+
github.com/zclconf/go-ctyv1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
973+
github.com/zclconf/go-ctyv1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
974974
github.com/zclconf/go-cty-debugv0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
975975
github.com/zclconf/go-cty-debugv0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
976976
github.com/zclconf/go-cty-yamlv1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0=

‎provisioner/terraform/provision.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"golang.org/x/xerrors"
1717

1818
"cdr.dev/slog"
19-
"github.com/coder/terraform-provider-coder/provider"
19+
"github.com/coder/terraform-provider-coder/v2/provider"
2020

2121
"github.com/coder/coder/v2/coderd/database"
2222
"github.com/coder/coder/v2/coderd/tracing"
@@ -269,7 +269,7 @@ func provisionEnv(
269269
env=append(env,provider.ParameterEnvironmentVariable(param.Name)+"="+param.Value)
270270
}
271271
for_,extAuth:=rangeexternalAuth {
272-
env=append(env,provider.GitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
272+
env=append(env,gitAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
273273
env=append(env,provider.ExternalAuthAccessTokenEnvironmentVariable(extAuth.Id)+"="+extAuth.AccessToken)
274274
}
275275

@@ -350,3 +350,12 @@ func tryGettingCoderProviderStacktrace(sess *provisionersdk.Session) string {
350350
}
351351
returnstring(stacktraces)
352352
}
353+
354+
// gitAuthAccessTokenEnvironmentVariable is copied from
355+
// github.com/coder/terraform-provider-coder/provider.GitAuthAccessTokenEnvironmentVariable@v1.0.4.
356+
// While removed in v2 of the provider, we keep this to support customers using older templates that
357+
// depend on this environment variable. Once we are certain that no customers are still using v1 of
358+
// the provider, we can remove this function.
359+
funcgitAuthAccessTokenEnvironmentVariable(idstring)string {
360+
returnfmt.Sprintf("CODER_GIT_AUTH_ACCESS_TOKEN_%s",id)
361+
}

‎provisioner/terraform/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"cdr.dev/slog"
1414

15-
"github.com/coder/terraform-provider-coder/provider"
15+
"github.com/coder/terraform-provider-coder/v2/provider"
1616

1717
tfaddr"github.com/hashicorp/go-terraform-address"
1818

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp