Skip to content

CI: fix golangci-lint v2.12.2 update #22976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

CI: fix golangci-lint v2.12.2 update #22976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ebbf1d
Initial plan
Copilot May 11, 2026
04a86b7
fix golangci-lint v2.12.2 update
Copilot May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,24 @@ gocyclo: ## Run gocyclo (calculates cyclomatic complexities)

out/linters/golangci-lint-$(GOLINT_VERSION):
mkdir -p out/linters
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b out/linters $(GOLINT_VERSION)
mv out/linters/golangci-lint out/linters/golangci-lint-$(GOLINT_VERSION)
version="$(GOLINT_VERSION)"; \
version=$${version#v}; \
os=$$(go env GOOS); \
arch=$$(go env GOARCH); \
name="golangci-lint-$${version}-$${os}-$${arch}"; \
archive="out/linters/$${name}.tar.gz"; \
checksums="out/linters/golangci-lint-$${version}-checksums.txt"; \
curl -sfL -o "$${archive}" "https://github.com/golangci/golangci-lint/releases/download/$(GOLINT_VERSION)/$${name}.tar.gz"; \
curl -sfL -o "$${checksums}" "https://github.com/golangci/golangci-lint/releases/download/$(GOLINT_VERSION)/golangci-lint-$${version}-checksums.txt"; \
want=$$(awk -v file="$${name}.tar.gz" '$$2 == file { print $$1; exit }' "$${checksums}"); \
test -n "$${want}"; \
got=$$(openssl sha256 "$${archive}" | awk '{print $$2}'); \
test "$${want}" = "$${got}"; \
tmpdir=$$(mktemp -d); \
tar -xzf "$${archive}" -C "$${tmpdir}"; \
mv "$${tmpdir}/$${name}/golangci-lint" "$@"; \
chmod +x "$@"; \
rm -rf "$${tmpdir}" "$${archive}" "$${checksums}"

# this one is meant for local use
.PHONY: lint
Expand Down
9 changes: 4 additions & 5 deletions pkg/libmachine/cert/cert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"io/ioutil"
"math/big"
"net"
"os"
Expand Down Expand Up @@ -271,19 +270,19 @@ func (xcg *X509CertGenerator) ReadTLSConfig(addr string, authOptions *auth.Optio
clientKeyPath := authOptions.ClientKeyPath

log.Debugf("Reading CA certificate from %s", caCertPath)
caCert, err := ioutil.ReadFile(caCertPath)
caCert, err := os.ReadFile(caCertPath)
if err != nil {
return nil, err
}

log.Debugf("Reading client certificate from %s", clientCertPath)
clientCert, err := ioutil.ReadFile(clientCertPath)
clientCert, err := os.ReadFile(clientCertPath)
if err != nil {
return nil, err
}

log.Debugf("Reading client key from %s", clientKeyPath)
clientKey, err := ioutil.ReadFile(clientKeyPath)
clientKey, err := os.ReadFile(clientKeyPath)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -312,7 +311,7 @@ func (xcg *X509CertGenerator) ValidateCertificate(addr string, authOptions *auth

func CheckCertificateDate(certPath string) (bool, error) {
log.Debugf("Reading certificate data from %s", certPath)
certBytes, err := ioutil.ReadFile(certPath)
certBytes, err := os.ReadFile(certPath)
if err != nil {
return false, err
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/libmachine/mcnutils/b2d.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"net/url"
Expand Down Expand Up @@ -242,7 +241,7 @@ func (*b2dReleaseGetter) download(dir, file, isoURL string) error {
defer src.Close()

// Download to a temp file first then rename it to avoid partial download.
f, err := ioutil.TempFile(dir, file+".tmp")
f, err := os.CreateTemp(dir, file+".tmp")
if err != nil {
return err
}
Expand Down Expand Up @@ -537,7 +536,7 @@ func MakeDiskImage(publicSSHKeyPath string) (*bytes.Buffer, error) {

log.Debug("Writing SSH key tar header")

pubKey, err := ioutil.ReadFile(publicSSHKeyPath)
pubKey, err := os.ReadFile(publicSSHKeyPath)
if err != nil {
return nil, err
}
Expand Down
11 changes: 5 additions & 6 deletions pkg/libmachine/persist/filestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package persist
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -48,16 +47,16 @@ func (s Filestore) GetMachinesDir() string {

func (s Filestore) saveToFile(data []byte, file string) error {
if _, err := os.Stat(file); os.IsNotExist(err) {
return ioutil.WriteFile(file, data, 0600)
return os.WriteFile(file, data, 0600)
}

tmpfi, err := ioutil.TempFile(filepath.Dir(file), "config.json.tmp")
tmpfi, err := os.CreateTemp(filepath.Dir(file), "config.json.tmp")
if err != nil {
return err
}
defer os.Remove(tmpfi.Name())

if err = ioutil.WriteFile(tmpfi.Name(), data, 0600); err != nil {
if err = os.WriteFile(tmpfi.Name(), data, 0600); err != nil {
return err
}

Expand Down Expand Up @@ -95,7 +94,7 @@ func (s Filestore) Remove(name string) error {
}

func (s Filestore) List() ([]string, error) {
dir, err := ioutil.ReadDir(s.GetMachinesDir())
dir, err := os.ReadDir(s.GetMachinesDir())
if err != nil && !os.IsNotExist(err) {
return nil, err
}
Expand Down Expand Up @@ -124,7 +123,7 @@ func (s Filestore) Exists(name string) (bool, error) {
}

func (s Filestore) loadConfig(h *host.Host) error {
data, err := ioutil.ReadFile(filepath.Join(s.GetMachinesDir(), h.Name, "config.json"))
data, err := os.ReadFile(filepath.Join(s.GetMachinesDir(), h.Name, "config.json"))
if err != nil {
return err
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/libmachine/provision/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package provision

import (
"fmt"
"io/ioutil"
"net/url"
"os"
"path"
"path/filepath"
"regexp"
Expand Down Expand Up @@ -140,16 +140,16 @@ func ConfigureAuth(p Provisioner) error {
}

// upload certs and configure TLS auth
caCert, err := ioutil.ReadFile(authOptions.CaCertPath)
caCert, err := os.ReadFile(authOptions.CaCertPath)
if err != nil {
return err
}

serverCert, err := ioutil.ReadFile(authOptions.ServerCertPath)
serverCert, err := os.ReadFile(authOptions.ServerCertPath)
if err != nil {
return err
}
serverKey, err := ioutil.ReadFile(authOptions.ServerKeyPath)
serverKey, err := os.ReadFile(authOptions.ServerKeyPath)
if err != nil {
return err
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/libmachine/ssh/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package ssh
import (
"fmt"
"io"
"io/ioutil"
"net"
"os"
"os/exec"
Expand Down Expand Up @@ -146,7 +145,7 @@ func NewNativeConfig(user string, auth *Auth) (ssh.ClientConfig, error) {
)

for _, k := range auth.Keys {
key, err := ioutil.ReadFile(k)
key, err := os.ReadFile(k)
if err != nil {
return ssh.ClientConfig{}, err
}
Expand Down Expand Up @@ -259,7 +258,7 @@ func (client *NativeClient) Start(command string) (io.ReadCloser, io.ReadCloser,

client.openClient = conn
client.openSession = session
return ioutil.NopCloser(stdout), ioutil.NopCloser(stderr), nil
return io.NopCloser(stdout), io.NopCloser(stderr), nil
}

func (client *NativeClient) Wait() error {
Expand Down