diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d9b2ea3..e352c2c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Import GPG key id: import_gpg run: | diff --git a/.golangci.yml b/.golangci.yml index 48c13cfe..0c140069 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,7 +5,7 @@ issues: - go/pkg/mod linters: enable: - - vet + - govet - staticcheck - errcheck - gofmt diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 0812fe27..14b3a545 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/golang:1.22 +FROM registry.suse.com/bci/golang:1.23 ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH @@ -10,7 +10,7 @@ RUN zypper -n rm container-suseconnect && \ RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.1.11 ## install golangci-lint -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.57.1 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4 # The docker version in dapper is too old to have buildx. Install it manually. RUN wget --quiet https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} && \ diff --git a/go.mod b/go.mod index 4b2d4a61..4f29b4fc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/harvester/terraform-provider-harvester -go 1.22.5 +go 1.23.4 replace ( // From this commit, it starts to support Darwin. @@ -29,6 +29,7 @@ replace ( ) require ( + github.com/google/uuid v1.6.0 github.com/harvester/harvester v1.3.2 github.com/harvester/harvester-network-controller v0.5.4 github.com/hashicorp/terraform-plugin-docs v0.4.0 @@ -101,7 +102,6 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/handlers v1.5.2 // indirect diff --git a/internal/provider/virtualmachine/resource_virtualmachine_constructor.go b/internal/provider/virtualmachine/resource_virtualmachine_constructor.go index b0e6d343..17a7095a 100644 --- a/internal/provider/virtualmachine/resource_virtualmachine_constructor.go +++ b/internal/provider/virtualmachine/resource_virtualmachine_constructor.go @@ -200,7 +200,7 @@ func (c *Constructor) Setup() util.Processors { } } - vmBuilder.Disk(diskName, diskBus, isCDRom, uint(bootOrder)) + vmBuilder.Disk(diskName, diskBus, isCDRom, uint(bootOrder)) // nolint: gosec if existingVolumeName != "" { vmBuilder.ExistingPVCVolume(diskName, existingVolumeName, hotPlug) } else if containerImageName != "" {