Skip to content

Commit 4c99993

Browse files
committed
Merge branch 'development' of github.com:threefoldtech/terraform-provider-grid into development
2 parents a5fb79a + 46ee58c commit 4c99993

4 files changed

Lines changed: 147 additions & 132 deletions

File tree

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
go-version: 1.21
1919

2020
- name: Run golangci-lint
21-
uses: golangci/golangci-lint-action@v6
21+
uses: golangci/golangci-lint-action@v8
2222
with:
2323
args: --config=.golangci.yml

.golangci.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
1+
version: "2"
12
linters:
23
enable:
3-
- errcheck
44
- goconst
5-
- gofmt
6-
- govet
7-
- ineffassign
8-
- gosimple
9-
- staticcheck
10-
- unused
115
- misspell
126
- unconvert
13-
enable-all: false
14-
run:
15-
timeout: 20m
16-
issues:
17-
exclude-dirs:
18-
- integrationtests
7+
exclusions:
8+
generated: lax
9+
presets:
10+
- comments
11+
- common-false-positives
12+
- legacy
13+
- std-error-handling
14+
paths:
15+
- third_party$
16+
- builtin$
17+
- examples$
18+
formatters:
19+
enable:
20+
- gofmt
21+
exclusions:
22+
generated: lax
23+
paths:
24+
- third_party$
25+
- builtin$
26+
- examples$

go.mod

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/threefoldtech/terraform-provider-grid
22

3-
go 1.21
3+
go 1.23.0
4+
5+
toolchain go1.24.2
46

57
require (
68
github.com/go-redis/redis v6.15.9+incompatible
@@ -10,24 +12,23 @@ require (
1012
github.com/hashicorp/terraform-plugin-docs v0.19.4
1113
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
1214
github.com/pkg/errors v0.9.1
13-
github.com/stretchr/testify v1.10.0
14-
github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.16.8
15-
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.16.8
16-
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.8
15+
github.com/stretchr/testify v1.11.1
16+
github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.17.1
17+
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.17.1
18+
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.1
1719
github.com/threefoldtech/zos v0.5.6-0.20240902110349-172a0a29a6ee
18-
github.com/threefoldtech/zosbase v0.1.4
19-
golang.org/x/crypto v0.31.0
20-
golang.org/x/sync v0.10.0
20+
github.com/threefoldtech/zosbase v1.0.0
21+
golang.org/x/crypto v0.37.0
22+
golang.org/x/sync v0.13.0
2123
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c
2224
)
2325

2426
require (
2527
cloud.google.com/go v0.112.0 // indirect
26-
cloud.google.com/go/compute v1.24.0 // indirect
27-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
28+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
2829
cloud.google.com/go/iam v1.1.6 // indirect
2930
cloud.google.com/go/storage v1.36.0 // indirect
30-
github.com/BurntSushi/toml v1.3.2 // indirect
31+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
3132
github.com/ChainSafe/go-schnorrkel v1.1.0 // indirect
3233
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
3334
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -53,17 +54,17 @@ require (
5354
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
5455
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
5556
github.com/ethereum/go-ethereum v1.11.6 // indirect
56-
github.com/fatih/color v1.16.0 // indirect
57+
github.com/fatih/color v1.18.0 // indirect
5758
github.com/felixge/httpsnoop v1.0.4 // indirect
5859
github.com/getsentry/sentry-go v0.29.1 // indirect
59-
github.com/go-logr/logr v1.4.1 // indirect
60+
github.com/go-logr/logr v1.4.2 // indirect
6061
github.com/go-logr/stdr v1.2.2 // indirect
6162
github.com/go-stack/stack v1.8.1 // indirect
6263
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
6364
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6465
github.com/golang/protobuf v1.5.4 // indirect
6566
github.com/gomodule/redigo v2.0.0+incompatible // indirect
66-
github.com/google/go-cmp v0.6.0 // indirect
67+
github.com/google/go-cmp v0.7.0 // indirect
6768
github.com/google/s2a-go v0.1.7 // indirect
6869
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
6970
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
@@ -99,9 +100,9 @@ require (
99100
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
100101
github.com/jmespath/go-jmespath v0.4.0 // indirect
101102
github.com/klauspost/compress v1.17.7 // indirect
102-
github.com/mattn/go-colorable v0.1.13 // indirect
103+
github.com/mattn/go-colorable v0.1.14 // indirect
103104
github.com/mattn/go-isatty v0.0.20 // indirect
104-
github.com/mattn/go-runewidth v0.0.15 // indirect
105+
github.com/mattn/go-runewidth v0.0.16 // indirect
105106
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
106107
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
107108
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -112,16 +113,15 @@ require (
112113
github.com/mitchellh/reflectwalk v1.0.2 // indirect
113114
github.com/oklog/run v1.0.0 // indirect
114115
github.com/onsi/ginkgo v1.16.5 // indirect
115-
github.com/onsi/gomega v1.25.0 // indirect
116116
github.com/pierrec/xxHash v0.1.5 // indirect
117117
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
118118
github.com/posener/complete v1.2.3 // indirect
119-
github.com/rivo/uniseg v0.2.0 // indirect
119+
github.com/rivo/uniseg v0.4.7 // indirect
120120
github.com/rs/cors v1.10.1 // indirect
121-
github.com/rs/zerolog v1.33.0 // indirect
121+
github.com/rs/zerolog v1.34.0 // indirect
122122
github.com/shopspring/decimal v1.3.1 // indirect
123123
github.com/spf13/cast v1.5.0 // indirect
124-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2 // indirect
124+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20250929084418-b950278ead30 // indirect
125125
github.com/tmccombs/hcl2json v0.3.3 // indirect
126126
github.com/ulikunitz/xz v0.5.10 // indirect
127127
github.com/vedhavyas/go-subkey v1.0.3 // indirect
@@ -133,27 +133,28 @@ require (
133133
github.com/zclconf/go-cty v1.14.4 // indirect
134134
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
135135
go.opencensus.io v0.24.0 // indirect
136+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
136137
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
137138
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
138-
go.opentelemetry.io/otel v1.22.0 // indirect
139-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
140-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
141-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
142-
golang.org/x/mod v0.17.0 // indirect
143-
golang.org/x/net v0.25.0 // indirect
144-
golang.org/x/oauth2 v0.17.0 // indirect
145-
golang.org/x/sys v0.28.0 // indirect
146-
golang.org/x/text v0.21.0 // indirect
139+
go.opentelemetry.io/otel v1.34.0 // indirect
140+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
142+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
143+
golang.org/x/mod v0.23.0 // indirect
144+
golang.org/x/net v0.39.0 // indirect
145+
golang.org/x/oauth2 v0.24.0 // indirect
146+
golang.org/x/sys v0.32.0 // indirect
147+
golang.org/x/text v0.24.0 // indirect
147148
golang.org/x/time v0.5.0 // indirect
148-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
149-
gonum.org/v1/gonum v0.15.0 // indirect
149+
golang.org/x/tools v0.30.0 // indirect
150+
gonum.org/v1/gonum v0.16.0 // indirect
150151
google.golang.org/api v0.162.0 // indirect
151152
google.golang.org/appengine v1.6.8 // indirect
152153
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
153-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
154-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
155-
google.golang.org/grpc v1.63.2 // indirect
156-
google.golang.org/protobuf v1.34.1 // indirect
154+
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
155+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
156+
google.golang.org/grpc v1.70.0 // indirect
157+
google.golang.org/protobuf v1.36.6 // indirect
157158
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
158159
gopkg.in/yaml.v2 v2.4.0 // indirect
159160
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)