Skip to content

Commit 2afc8d1

Browse files
lgarber-akamailgarber-akamai
authored
Merge pull request #1923 from linode/dev
Release v3.0.0
2 parents b56bc87 + 86ac2bb commit 2afc8d1

File tree

124 files changed

+586
-534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+586
-534
lines changed

‎.github/dependabot.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
version: 2
22
updates:
3+
# NOTE: We redefine these entries for each branch because of the following dependabot issues:
4+
# * target-branch cannot be an array: https://github.com/dependabot/dependabot-core/issues/2511
5+
# * target-branch cannot be a wildcard: https://github.com/dependabot/dependabot-core/issues/6890
6+
# * YAML aliases are unsupported: https://github.com/dependabot/dependabot-core/issues/1582
7+
8+
# dev
39
- package-ecosystem: "gomod"
410
directory: "/"
511
schedule:
@@ -16,3 +22,24 @@ updates:
1622
directory: "/"
1723
schedule:
1824
interval: "weekly"
25+
26+
# extended-support/v2
27+
- package-ecosystem: "gomod"
28+
target-branch: extended-support/v2
29+
directory: "/"
30+
schedule:
31+
interval: "weekly"
32+
open-pull-requests-limit: 10
33+
ignore:
34+
- dependency-name: "github.com/linode/terraform-provider-linode/linode"
35+
- package-ecosystem: "gomod"
36+
target-branch: extended-support/v2
37+
directory: "/tools"
38+
schedule:
39+
interval: "weekly"
40+
open-pull-requests-limit: 10
41+
- package-ecosystem: "github-actions"
42+
target-branch: extended-support/v2
43+
directory: "/"
44+
schedule:
45+
interval: "weekly"

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL Advanced"
22

33
on:
44
push:
5-
branches: [ "dev", "main", "proj/*" ]
5+
branches: [ "dev", "main", "proj/*", "extended-support/*" ]
66
pull_request:
7-
branches: [ "dev", "main", "proj/*" ]
7+
branches: [ "dev", "main", "proj/*", "extended-support/*" ]
88
schedule:
99
- cron: '39 0 * * 6'
1010

‎.github/workflows/integration_tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
branches:
2020
- main
2121
- dev
22+
- extended-support/*
2223

2324
jobs:
2425
integration_tests:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ This provider plugin is maintained by Linode.
1818

1919
## Requirements
2020

21-
- [Terraform](https://www.terraform.io/downloads.html) 0.12.0+
22-
- [Go](https://golang.org/doc/install) 1.20.0 or higher (to build the provider plugin)
21+
- [Terraform](https://www.terraform.io/downloads.html) 1.0.0+
22+
- [Go](https://golang.org/doc/install) 1.23.0 or higher (to build the provider plugin)
2323

2424
## Using the provider
2525

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ toolchain go1.24.1
66

77
require (
88
github.com/aws/aws-sdk-go-v2 v1.36.3
9-
github.com/aws/aws-sdk-go-v2/config v1.29.14
10-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
9+
github.com/aws/aws-sdk-go-v2/config v1.29.15
10+
github.com/aws/aws-sdk-go-v2/credentials v1.17.68
1111
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4
12-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3
12+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1
1313
github.com/aws/smithy-go v1.22.3
1414
github.com/go-resty/resty/v2 v2.16.5
1515
github.com/google/go-cmp v0.7.0
@@ -26,12 +26,12 @@ require (
2626
github.com/hashicorp/terraform-plugin-mux v0.20.0
2727
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
2828
github.com/hashicorp/terraform-plugin-testing v1.13.1
29-
github.com/linode/linodego v1.52.0
29+
github.com/linode/linodego v1.52.1
3030
github.com/linode/linodego/k8s v1.25.2
3131
github.com/stretchr/testify v1.10.0
32-
golang.org/x/crypto v0.38.0
33-
golang.org/x/net v0.40.0
34-
golang.org/x/sync v0.14.0
32+
golang.org/x/crypto v0.39.0
33+
golang.org/x/net v0.41.0
34+
golang.org/x/sync v0.15.0
3535
)
3636

3737
require (
@@ -45,12 +45,12 @@ require (
4545
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
4646
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
4747
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 // indirect
4949
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
5050
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
5151
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
5252
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.20 // indirect
5454
github.com/cloudflare/circl v1.6.0 // indirect
5555
github.com/davecgh/go-spew v1.1.1 // indirect
5656
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -101,13 +101,13 @@ require (
101101
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
102102
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
103103
github.com/zclconf/go-cty v1.16.2 // indirect
104-
golang.org/x/mod v0.24.0 // indirect
104+
golang.org/x/mod v0.25.0 // indirect
105105
golang.org/x/oauth2 v0.30.0 // indirect
106106
golang.org/x/sys v0.33.0 // indirect
107107
golang.org/x/term v0.32.0 // indirect
108-
golang.org/x/text v0.25.0 // indirect
108+
golang.org/x/text v0.26.0 // indirect
109109
golang.org/x/time v0.6.0 // indirect
110-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
110+
golang.org/x/tools v0.33.0 // indirect
111111
google.golang.org/appengine v1.6.8 // indirect
112112
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
113113
google.golang.org/grpc v1.72.1 // indirect

‎go.sum‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38y
1313
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
1414
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs=
1515
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14=
16-
github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM=
17-
github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g=
18-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM=
19-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ=
16+
github.com/aws/aws-sdk-go-v2/config v1.29.15 h1:I5XjesVMpDZXZEZonVfjI12VNMrYa38LtLnw4NtY5Ss=
17+
github.com/aws/aws-sdk-go-v2/config v1.29.15/go.mod h1:tNIp4JIPonlsgaO5hxO372a6gjhN63aSWl2GVl5QoBQ=
18+
github.com/aws/aws-sdk-go-v2/credentials v1.17.68 h1:cFb9yjI02/sWHBSYXAtkamjzCuRymvmeFmt0TC0MbYY=
19+
github.com/aws/aws-sdk-go-v2/credentials v1.17.68/go.mod h1:H6E+jBzyqUu8u0vGaU6POkK3P0NylYEeRZ6ynBpMqIk=
2020
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
2121
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
2222
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 h1:6eKRM6fgeXG4krRO9XKz755vuRhT5UyB9M1W6vjA3JU=
@@ -31,20 +31,20 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcu
3131
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs=
3232
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
3333
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
34-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 h1:4nm2G6A4pV9rdlWzGMPv4BNtQp22v1hg3yrtkYpeLl8=
35-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
34+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 h1:BCG7DCXEXpNCcpwCxg1oi9pkJWH2+eZzTn9MY56MbVw=
35+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
3636
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
3737
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
3838
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
3939
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
40-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 h1:BRXS0U76Z8wfF+bnkilA2QwpIch6URlm++yPUt9QPmQ=
41-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3/go.mod h1:bNXKFFyaiVvWuR6O16h/I1724+aXe/tAkA9/QS01t5k=
40+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1 h1:xYEAf/6QHiTZDccKnPMbsMwlau13GsDsTgdue3wmHGw=
41+
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE=
4242
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
4343
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
4444
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
4545
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
46-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY=
47-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
46+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.20 h1:oIaQ1e17CSKaWmUTu62MtraRWVIosn/iONMuZt0gbqc=
47+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.20/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
4848
github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k=
4949
github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
5050
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
@@ -194,8 +194,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
194194
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
195195
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
196196
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
197-
github.com/linode/linodego v1.52.0 h1:SN1PSekrZBcHtRt1pADTz0JO7NX9pQv/Gf8Jc9s9l8w=
198-
github.com/linode/linodego v1.52.0/go.mod h1:zEN2sX+cSdp67EuRY1HJiyuLujoa7HqvVwNEcJv3iXw=
197+
github.com/linode/linodego v1.52.1 h1:HJ1cz1n9n3chRP9UrtqmP91+xTi0Q5l+H/4z4tpkwgQ=
198+
github.com/linode/linodego v1.52.1/go.mod h1:zEN2sX+cSdp67EuRY1HJiyuLujoa7HqvVwNEcJv3iXw=
199199
github.com/linode/linodego/k8s v1.25.2 h1:PY6S0sAD3xANVvM9WY38bz9GqMTjIbytC8IJJ9Cv23o=
200200
github.com/linode/linodego/k8s v1.25.2/go.mod h1:DC1XCSRZRGsmaa/ggpDPSDUmOM6aK1bhSIP6+f9Cwhc=
201201
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -286,30 +286,30 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
286286
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
287287
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
288288
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
289-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
290-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
289+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
290+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
291291
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
292292
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
293293
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
294-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
295-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
294+
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
295+
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
296296
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
297297
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
298298
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
299299
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
300300
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
301301
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
302-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
303-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
302+
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
303+
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
304304
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
305305
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
306306
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
307307
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
308308
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
309309
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
310310
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
311-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
312-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
311+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
312+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
313313
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
314314
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
315315
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -334,17 +334,17 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
334334
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
335335
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
336336
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
337-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
338-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
337+
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
338+
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
339339
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
340340
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
341341
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
342342
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
343343
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
344344
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
345345
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
346-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
347-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
346+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
347+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
348348
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
349349
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
350350
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎linode/acceptance/database.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
func CheckMySQLDatabaseExists(name string, db *linodego.MySQLDatabase) resource.TestCheckFunc {
1515
return func(s *terraform.State) error {
16-
client := TestAccProvider.Meta().(*helper.ProviderMeta).Client
16+
client := TestAccSDKv2Provider.Meta().(*helper.ProviderMeta).Client
1717

1818
rs, ok := s.RootModule().Resources[name]
1919
if !ok {
@@ -44,7 +44,7 @@ func CheckMySQLDatabaseExists(name string, db *linodego.MySQLDatabase) resource.
4444

4545
func CheckPostgresDatabaseExists(name string, db *linodego.PostgresDatabase) resource.TestCheckFunc {
4646
return func(s *terraform.State) error {
47-
client := TestAccProvider.Meta().(*helper.ProviderMeta).Client
47+
client := TestAccSDKv2Provider.Meta().(*helper.ProviderMeta).Client
4848

4949
rs, ok := s.RootModule().Resources[name]
5050
if !ok {

‎linode/acceptance/instance.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
func CheckInstanceExists(name string, instance *linodego.Instance) resource.TestCheckFunc {
1616
return func(s *terraform.State) error {
17-
client := TestAccProvider.Meta().(*helper.ProviderMeta).Client
17+
client := TestAccSDKv2Provider.Meta().(*helper.ProviderMeta).Client
1818

1919
rs, ok := s.RootModule().Resources[name]
2020
if !ok {
@@ -42,7 +42,7 @@ func CheckInstanceExists(name string, instance *linodego.Instance) resource.Test
4242
}
4343

4444
func CheckInstanceDestroy(s *terraform.State) error {
45-
client := TestAccProvider.Meta().(*helper.ProviderMeta).Client
45+
client := TestAccSDKv2Provider.Meta().(*helper.ProviderMeta).Client
4646
for _, rs := range s.RootModule().Resources {
4747
if rs.Type != "linode_instance" {
4848
continue
@@ -75,7 +75,7 @@ func AssertInstanceReboot(t testing.TB, shouldRestart bool, instance *linodego.I
7575
t.Helper()
7676

7777
return func() {
78-
client := TestAccProvider.Meta().(*helper.ProviderMeta).Client
78+
client := TestAccSDKv2Provider.Meta().(*helper.ProviderMeta).Client
7979
eventFilter := fmt.Sprintf(
8080
`{"entity.type": "linode", "entity.id": %d, "action": "linode_reboot", "created": { "+gte": "%s" }}`,
8181
instance.ID, instance.Created.Format("2006-01-02T15:04:05"))

‎linode/acceptance/provider_factories.go‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,37 @@ package acceptance
22

33
import (
44
"context"
5+
"fmt"
56

67
"github.com/hashicorp/terraform-plugin-framework/providerserver"
7-
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
8-
"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
8+
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
9+
"github.com/hashicorp/terraform-plugin-mux/tf5to6server"
10+
"github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
911
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1012
)
1113

12-
var ProtoV5ProviderFactories = map[string]func() (tfprotov5.ProviderServer, error){
13-
"linode": func() (tfprotov5.ProviderServer, error) {
14+
var ProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServer, error){
15+
"linode": func() (tfprotov6.ProviderServer, error) {
1416
ctx := context.Background()
15-
providers := []func() tfprotov5.ProviderServer{
16-
TestAccProviders["linode"].GRPCProvider,
17-
providerserver.NewProtocol5(
17+
18+
upgradedSDKProvider, err := tf5to6server.UpgradeServer(
19+
context.Background(),
20+
TestAccSDKv2Providers["linode"].GRPCProvider,
21+
)
22+
if err != nil {
23+
return nil, fmt.Errorf("failed to upgrade SDKv2 GRPC provider: %w", err)
24+
}
25+
26+
providers := []func() tfprotov6.ProviderServer{
27+
providerserver.NewProtocol6(
1828
TestAccFrameworkProvider,
1929
),
30+
func() tfprotov6.ProviderServer {
31+
return upgradedSDKProvider
32+
},
2033
}
2134

22-
muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...)
35+
muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
2336
if err != nil {
2437
return nil, err
2538
}

0 commit comments

Comments
 (0)