Skip to content

Commit 6dd531e

Browse files
giornettagiornetta
authored
chore: upgrade Go version and dependencies (#382)
* upgrade go version and dependencies * upgrade Go version in Workflows
1 parent c27be59 commit 6dd531e

File tree

7 files changed

+126
-120
lines changed

7 files changed

+126
-120
lines changed

‎.github/workflows/acceptance-test-schedule.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install Go
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.18.x
19+
go-version: 1.24.x
2020

2121
- name: Checkout
2222
uses: actions/checkout@v2

‎.github/workflows/go.yml‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
name: Go
22
on: [push]
33
jobs:
4-
54
build:
65
strategy:
7-
matrix:
8-
go-version: [1.20.x]
9-
os: [ubuntu-latest]
6+
matrix:
7+
go-version: [1.24.x]
8+
os: [ubuntu-latest]
109
runs-on: ${{ matrix.os }}
1110
steps:
12-
- name: Install Go
13-
uses: actions/setup-go@v2
14-
with:
15-
go-version: ${{ matrix.go-version }}
16-
id: go
17-
- name: Check out code into the Go module directory
18-
uses: actions/checkout@v2
19-
- name: Build
20-
run: go build -v .
21-
- name: Vet
22-
run: go vet
23-
- name: Make test
24-
run: make test
25-
11+
- name: Install Go
12+
uses: actions/setup-go@v2
13+
with:
14+
go-version: ${{ matrix.go-version }}
15+
id: go
16+
- name: Check out code into the Go module directory
17+
uses: actions/checkout@v2
18+
- name: Build
19+
run: go build -v .
20+
- name: Vet
21+
run: go vet
22+
- name: Make test
23+
run: make test
24+
2625
# acceptance:
2726
# # Runs the acceptance test suite using the `Acceptance Tests` environment.
2827
# # The enviroment should be configured to require reviewers approve the
@@ -53,4 +52,4 @@ jobs:
5352
# run: make testacc
5453
# env:
5554
# CIVO_TOKEN: ${{ secrets.ACCEPTANCE_TESTS_TOKEN }}
56-
# CIVO_REGION: "LON1"
55+
# CIVO_REGION: "LON1"

‎.github/workflows/lint.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.20.x]
7+
go-version: [1.24.x]
88
os: [ubuntu-latest]
99
runs-on: ${{ matrix.os }}
1010
steps:
11-
- name: Install Go
12-
uses: actions/setup-go@v2
13-
with:
14-
go-version: ${{ matrix.go-version }}
15-
- name: Checkout code
16-
uses: actions/checkout@v2
17-
- name: setup env
18-
run: |
19-
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
20-
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
21-
shell: bash
22-
- name: lint
23-
uses: Jerome1337/golint-action@v1.0.2
11+
- name: Install Go
12+
uses: actions/setup-go@v2
13+
with:
14+
go-version: ${{ matrix.go-version }}
15+
- name: Checkout code
16+
uses: actions/checkout@v2
17+
- name: setup env
18+
run: |
19+
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
20+
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
21+
shell: bash
22+
- name: lint
23+
uses: Jerome1337/golint-action@v1.0.2

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
newVersionTag:
7-
description: 'New version tag (e.g. v0.10.11)'
7+
description: "New version tag (e.g. v0.10.11)"
88
required: true
99

1010
jobs:
@@ -25,17 +25,17 @@ jobs:
2525

2626
- name: Unshallow
2727
run: git fetch --prune --unshallow
28-
28+
2929
- name: Set up Go
3030
uses: actions/setup-go@v2
3131
with:
32-
go-version: 1.21.x
32+
go-version: 1.24.x
3333

3434
- name: Install and run auto-changelog CLI
3535
run: |
3636
npm i -g auto-changelog@2.3.0
3737
auto-changelog --config=.auto-changelog-config --latest-version=${{ github.event.inputs.newVersionTag }}
38-
38+
3939
- name: Setup Git config
4040
run: |
4141
git config user.name "GitHub Actions"
@@ -51,14 +51,14 @@ jobs:
5151
git pull -r origin master
5252
git tag -a ${{ github.event.inputs.newVersionTag }} -m ""
5353
git push origin master --follow-tags
54-
54+
5555
- name: Import GPG key
5656
id: import_gpg
5757
uses: crazy-max/ghaction-import-gpg@v5
5858
with:
5959
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
6060
passphrase: ${{ secrets.GPG_PASSPHRASE }}
61-
61+
6262
- name: Run GoReleaser
6363
uses: goreleaser/goreleaser-action@v2
6464
with:

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
terraform-provider-civo
2+
.env

‎go.mod‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
11
module github.com/civo/terraform-provider-civo
22

3-
go 1.21
3+
go 1.24.9
44

55
require (
6-
github.com/civo/civogo v0.6.3
7-
github.com/google/uuid v1.3.1
6+
github.com/civo/civogo v0.6.5
7+
github.com/google/uuid v1.6.0
88
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
99
github.com/hashicorp/terraform-plugin-sdk/v2 v2.31.0
10-
github.com/stretchr/testify v1.8.4
11-
golang.org/x/crypto v0.33.0
12-
k8s.io/api v0.29.1
10+
github.com/stretchr/testify v1.10.0
11+
golang.org/x/crypto v0.45.0
12+
k8s.io/api v0.34.2
13+
)
14+
15+
require (
16+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
17+
github.com/x448/float16 v0.8.4 // indirect
18+
go.yaml.in/yaml/v2 v2.4.3 // indirect
19+
sigs.k8s.io/randfill v1.0.0 // indirect
20+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
1321
)
1422

1523
require (
1624
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
1725
github.com/agext/levenshtein v1.2.3 // indirect
1826
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
19-
github.com/cloudflare/circl v1.3.7 // indirect
27+
github.com/cloudflare/circl v1.6.1 // indirect
2028
github.com/davecgh/go-spew v1.1.1 // indirect
2129
github.com/fatih/color v1.13.0 // indirect
22-
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/go-logr/logr v1.4.3 // indirect
2331
github.com/gogo/protobuf v1.3.2 // indirect
2432
github.com/golang/protobuf v1.5.3 // indirect
25-
github.com/google/go-cmp v0.6.0 // indirect
33+
github.com/google/go-cmp v0.7.0 // indirect
2634
github.com/google/go-querystring v1.1.0 // indirect
27-
github.com/google/gofuzz v1.2.0 // indirect
2835
github.com/hashicorp/errwrap v1.1.0 // indirect
2936
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
3037
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -53,29 +60,25 @@ require (
5360
github.com/mitchellh/mapstructure v1.5.0 // indirect
5461
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5562
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
56-
github.com/modern-go/reflect2 v1.0.2 // indirect
63+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5764
github.com/oklog/run v1.1.0 // indirect
5865
github.com/pmezard/go-difflib v1.0.0 // indirect
59-
github.com/rogpeppe/go-internal v1.11.0 // indirect
6066
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
6167
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
6268
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
6369
github.com/zclconf/go-cty v1.14.1 // indirect
64-
golang.org/x/mod v0.19.0 // indirect
65-
golang.org/x/net v0.35.0 // indirect
66-
golang.org/x/sys v0.30.0 // indirect
67-
golang.org/x/text v0.22.0 // indirect
68-
golang.org/x/tools v0.23.0 // indirect
70+
golang.org/x/mod v0.29.0 // indirect
71+
golang.org/x/net v0.47.0 // indirect
72+
golang.org/x/sys v0.38.0 // indirect
73+
golang.org/x/text v0.31.0 // indirect
6974
google.golang.org/appengine v1.6.8 // indirect
7075
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
7176
google.golang.org/grpc v1.60.0 // indirect
7277
google.golang.org/protobuf v1.36.5 // indirect
7378
gopkg.in/inf.v0 v0.9.1 // indirect
74-
gopkg.in/yaml.v2 v2.4.0 // indirect
7579
gopkg.in/yaml.v3 v3.0.1 // indirect
76-
k8s.io/apimachinery v0.29.1 // indirect
77-
k8s.io/klog/v2 v2.120.1 // indirect
78-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
79-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
80+
k8s.io/apimachinery v0.34.2 // indirect
81+
k8s.io/klog/v2 v2.130.1 // indirect
82+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
83+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
8184
)

0 commit comments

Comments
 (0)