Skip to content

Commit 5ae7cc7

Browse files
lpattelpatte
committed
up to go1.20 and use context
1 parent 52a28a7 commit 5ae7cc7

File tree

560 files changed

+52930
-33805
lines changed

Some content is hidden

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

560 files changed

+52930
-33805
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Requirements
99
------------
1010

1111
- [Terraform](https://www.terraform.io/downloads.html) 0.12.x
12-
- [Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
12+
- [Go](https://golang.org/doc/install) 1.20 (to build the provider plugin)
1313

1414
Building The Provider
1515
---------------------

‎go.mod‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,77 @@
11
module github.com/ovh/terraform-provider-ovh
22

33
require (
4-
github.com/google/go-cmp v0.5.6 // indirect
5-
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
4+
github.com/google/go-cmp v0.5.8
65
github.com/hashicorp/go-cleanhttp v0.5.2
6+
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
77
github.com/hashicorp/go-version v1.6.0
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.9.0
99
github.com/mitchellh/go-homedir v1.1.0
1010
github.com/ovh/go-ovh v1.3.0
11-
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
1211
github.com/ybriffa/rfc3339 v0.0.0-20220203155318-1789e3fd6e70
13-
golang.org/x/tools v0.0.0-20201118030313-598b068a9102 // indirect
12+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
1413
gopkg.in/ini.v1 v1.57.0
1514
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
1615
)
1716

18-
go 1.16
17+
require (
18+
cloud.google.com/go v0.61.0 // indirect
19+
cloud.google.com/go/storage v1.10.0 // indirect
20+
github.com/agext/levenshtein v1.2.2 // indirect
21+
github.com/apparentlymart/go-cidr v1.0.1 // indirect
22+
github.com/apparentlymart/go-textseg v1.0.0 // indirect
23+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
24+
github.com/aws/aws-sdk-go v1.25.3 // indirect
25+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
26+
github.com/davecgh/go-spew v1.1.1 // indirect
27+
github.com/fatih/color v1.7.0 // indirect
28+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
29+
github.com/golang/protobuf v1.4.2 // indirect
30+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
31+
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
32+
github.com/hashicorp/errwrap v1.0.0 // indirect
33+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
34+
github.com/hashicorp/go-getter v1.5.3 // indirect
35+
github.com/hashicorp/go-hclog v0.15.0 // indirect
36+
github.com/hashicorp/go-multierror v1.0.0 // indirect
37+
github.com/hashicorp/go-plugin v1.4.1 // indirect
38+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
39+
github.com/hashicorp/go-uuid v1.0.1 // indirect
40+
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
41+
github.com/hashicorp/logutils v1.0.0 // indirect
42+
github.com/hashicorp/terraform-exec v0.15.0 // indirect
43+
github.com/hashicorp/terraform-json v0.13.0 // indirect
44+
github.com/hashicorp/terraform-plugin-go v0.4.0 // indirect
45+
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
46+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
47+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
48+
github.com/klauspost/compress v1.11.2 // indirect
49+
github.com/mattn/go-colorable v0.1.4 // indirect
50+
github.com/mattn/go-isatty v0.0.10 // indirect
51+
github.com/mitchellh/copystructure v1.2.0 // indirect
52+
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
53+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
54+
github.com/mitchellh/mapstructure v1.1.2 // indirect
55+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
56+
github.com/oklog/run v1.0.0 // indirect
57+
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
58+
github.com/ulikunitz/xz v0.5.8 // indirect
59+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
60+
github.com/zclconf/go-cty v1.9.1 // indirect
61+
go.opencensus.io v0.22.4 // indirect
62+
golang.org/x/crypto v0.1.0 // indirect
63+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
64+
golang.org/x/mod v0.6.0 // indirect
65+
golang.org/x/net v0.1.0 // indirect
66+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
67+
golang.org/x/sys v0.1.0 // indirect
68+
golang.org/x/text v0.4.0 // indirect
69+
golang.org/x/tools v0.2.0 // indirect
70+
google.golang.org/api v0.29.0 // indirect
71+
google.golang.org/appengine v1.6.6 // indirect
72+
google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
73+
google.golang.org/grpc v1.32.0 // indirect
74+
google.golang.org/protobuf v1.25.0 // indirect
75+
)
76+
77+
go 1.20

‎go.sum‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
136136
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
137137
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
138138
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
139-
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
140139
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
140+
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
141+
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
141142
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
142143
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
143144
github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs=
@@ -314,7 +315,6 @@ github.com/ybriffa/rfc3339 v0.0.0-20220203155318-1789e3fd6e70/go.mod h1:zm6iUC+T
314315
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
315316
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
316317
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
317-
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
318318
github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
319319
github.com/zclconf/go-cty v1.9.1 h1:viqrgQwFl5UpSxc046qblj78wZXVDFnSOufaOTER+cc=
320320
github.com/zclconf/go-cty v1.9.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
@@ -334,8 +334,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
334334
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
335335
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
336336
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
337-
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
338337
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
338+
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
339+
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
339340
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
340341
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
341342
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -346,6 +347,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
346347
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
347348
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
348349
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
350+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=
351+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
349352
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
350353
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
351354
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -366,8 +369,9 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
366369
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
367370
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
368371
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
369-
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
370372
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
373+
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
374+
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
371375
golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
372376
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
373377
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -395,10 +399,10 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/
395399
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
396400
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
397401
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
398-
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
399402
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
400-
golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs=
401403
golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
404+
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
405+
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
402406
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
403407
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
404408
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -413,7 +417,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
413417
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
414418
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
415419
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
416-
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
417420
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
418421
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
419422
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -443,21 +446,22 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
443446
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
444447
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
445448
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
446-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
447449
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
448450
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
449451
golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
450-
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 h1:RX8C8PRZc2hTIod4ds8ij+/4RQX3AqhYj3uOHmyaz4E=
451452
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
452-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
453+
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
454+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
453455
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
456+
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
454457
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
455458
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
456459
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
457460
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
458461
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
459-
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
460462
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
463+
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
464+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
461465
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
462466
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
463467
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -500,13 +504,11 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY
500504
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
501505
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
502506
golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
503-
golang.org/x/tools v0.0.0-20201118030313-598b068a9102 h1:kr6Ik/EJgxdTSLX+rSiDounHdHWMBu9Ks/ghr2hWNpo=
504-
golang.org/x/tools v0.0.0-20201118030313-598b068a9102/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
507+
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
508+
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
505509
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
506510
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
507511
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
508-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
509-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
510512
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
511513
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
512514
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=

‎ovh/data_cloud_project_database.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package ovh
22

33
import (
4+
"context"
45
"fmt"
56
"log"
67
"net/url"
78

9+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
810
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
911
)
1012

1113
func dataSourceCloudProjectDatabase() *schema.Resource {
1214
return &schema.Resource{
13-
Read: dataSourceCloudProjectDatabaseRead,
15+
ReadContext: dataSourceCloudProjectDatabaseRead,
1416
Schema: map[string]*schema.Schema{
1517
"service_name": {
1618
Type: schema.TypeString,
@@ -179,7 +181,7 @@ func dataSourceCloudProjectDatabase() *schema.Resource {
179181
}
180182
}
181183

182-
func dataSourceCloudProjectDatabaseRead(d *schema.ResourceData, meta interface{}) error {
184+
func dataSourceCloudProjectDatabaseRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
183185
config := meta.(*Config)
184186
serviceName := d.Get("service_name").(string)
185187
engine := d.Get("engine").(string)
@@ -194,22 +196,22 @@ func dataSourceCloudProjectDatabaseRead(d *schema.ResourceData, meta interface{}
194196

195197
log.Printf("[DEBUG] Will read database %s from project: %s", id, serviceName)
196198
if err := config.OVHClient.Get(serviceEndpoint, res); err != nil {
197-
return fmt.Errorf("Error calling GET %s:\n\t %q", serviceEndpoint, err)
199+
return diag.Errorf("Error calling GET %s:\n\t %q", serviceEndpoint, err)
198200
}
199201

200202
nodesEndpoint := fmt.Sprintf("%s/node", serviceEndpoint)
201203
nodeList := &[]string{}
202204
if err := config.OVHClient.Get(nodesEndpoint, nodeList); err != nil {
203-
return fmt.Errorf("unable to get database %s nodes: %v", res.Id, err)
205+
return diag.Errorf("unable to get database %s nodes: %v", res.Id, err)
204206
}
205207

206208
if len(*nodeList) == 0 {
207-
return fmt.Errorf("no node found for database %s", res.Id)
209+
return diag.Errorf("no node found for database %s", res.Id)
208210
}
209211
nodeEndpoint := fmt.Sprintf("%s/%s", nodesEndpoint, url.PathEscape((*nodeList)[0]))
210212
node := &CloudProjectDatabaseNodes{}
211213
if err := config.OVHClient.Get(nodeEndpoint, node); err != nil {
212-
return fmt.Errorf("unable to get database %s node %s: %v", res.Id, (*nodeList)[0], err)
214+
return diag.Errorf("unable to get database %s node %s: %v", res.Id, (*nodeList)[0], err)
213215
}
214216

215217
res.Region = node.Region
@@ -218,7 +220,7 @@ func dataSourceCloudProjectDatabaseRead(d *schema.ResourceData, meta interface{}
218220
advancedConfigEndpoint := fmt.Sprintf("%s/advancedConfiguration", serviceEndpoint)
219221
advancedConfigMap := &map[string]string{}
220222
if err := config.OVHClient.Get(advancedConfigEndpoint, advancedConfigMap); err != nil {
221-
return fmt.Errorf("unable to get database %s advanced configuration: %v", res.Id, err)
223+
return diag.Errorf("unable to get database %s advanced configuration: %v", res.Id, err)
222224
}
223225
res.AdvancedConfiguration = *advancedConfigMap
224226
}

‎ovh/data_cloud_project_database_capabilities.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package ovh
22

33
import (
4+
"context"
45
"fmt"
56
"log"
67
"net/url"
78

9+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
810
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
911
"github.com/ovh/terraform-provider-ovh/ovh/helpers"
1012
)
1113

1214
func dataSourceCloudProjectDatabaseCapabilities() *schema.Resource {
1315
return &schema.Resource{
14-
Read: dataSourceCloudProjectDatabaseCapabilitiesRead,
16+
ReadContext: dataSourceCloudProjectDatabaseCapabilitiesRead,
1517
Schema: map[string]*schema.Schema{
1618
"service_name": {
1719
Type: schema.TypeString,
@@ -132,7 +134,7 @@ func dataSourceCloudProjectDatabaseCapabilities() *schema.Resource {
132134
}
133135
}
134136

135-
func dataSourceCloudProjectDatabaseCapabilitiesRead(d *schema.ResourceData, meta interface{}) error {
137+
func dataSourceCloudProjectDatabaseCapabilitiesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
136138
config := meta.(*Config)
137139
serviceName := d.Get("service_name").(string)
138140

@@ -143,7 +145,7 @@ func dataSourceCloudProjectDatabaseCapabilitiesRead(d *schema.ResourceData, meta
143145

144146
log.Printf("[DEBUG] Will read capabilities from project %s", serviceName)
145147
if err := config.OVHClient.Get(capabilitiesEndpoint, capabilitiesRes); err != nil {
146-
return helpers.CheckDeleted(d, err, capabilitiesEndpoint)
148+
return diag.FromErr(helpers.CheckDeleted(d, err, capabilitiesEndpoint))
147149
}
148150

149151
d.SetId(serviceName)

0 commit comments

Comments
 (0)