Merge pull request #1000 from thockin/master

Bump golang.org/x/sys to latest

Author: kubernetes-prow[bot]

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
-          go-version: '1.24.1'
+          go-version: '1.25.12'
 
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -36,7 +36,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
-          go-version: '1.24.1'
+          go-version: '1.25.12'
 
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -61,7 +61,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
-          go-version: '1.24.1'
+          go-version: '1.25.12'
 
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -75,7 +75,7 @@ jobs:
         uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
         with:
           working-directory: git-sync
-          version: v2.1.0
+          version: v2.12.2
 
       - name: make lint
         working-directory: git-sync

.golangci.yaml

@@ -24,6 +24,7 @@ linters:
     - cyclop
     - depguard
     - dupl
+    - embeddedstructfieldcheck
     - err113
     - exhaustruct
     - funcorder
@@ -40,6 +41,8 @@ linters:
     - musttag
     - nestif
     - nlreturn
+    - noctx
+    - noinlineerr
     - paralleltest
     - perfsprint
     - promlinter
@@ -50,6 +53,7 @@ linters:
     - varnamelen
     - wrapcheck
     - wsl
+    - wsl_v5
 
   settings: # please keep this alphabetized
     staticcheck:

Makefile

@@ -295,14 +295,20 @@ bin-clean:
 	rm -rf .go bin
 
 lint-golangci-lint:
-	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.0 run -v
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2 run -v
 
 lint-shellcheck:
+	@img="docker.io/koalaman/shellcheck-alpine:v0.9.0"; \
+	for i in `seq 1 5`; do \
+	  docker pull "$$img" && break; \
+	  echo "shellcheck image pull failed (attempt $$i), retrying..."; \
+	  sleep $$((i * 2)); \
+	done; \
 	docker run \
 	    --rm \
 	    -v `pwd`:`pwd` \
 	    -w `pwd` \
-	    docker.io/koalaman/shellcheck-alpine:v0.9.0 \
+	    "$$img" \
 	        shellcheck \
 	        $$(git ls-files ':!:vendor' '*.sh')
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/prometheus/client_golang v1.14.0
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/goleak v1.2.1
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
+	golang.org/x/sys v0.47.0
 )
 
 require (
@@ -20,4 +20,4 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 )
 
-go 1.23
+go 1.25.0

go.sum

@@ -335,6 +335,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

main.go

@@ -1300,7 +1300,7 @@ func sleepForever() {
 // exits the process with the exit code.
 //
 //nolint:unparam
-func fatalConfigErrorf(log *logging.Logger, printUsage bool, format string, a ...interface{}) {
+func fatalConfigErrorf(log *logging.Logger, printUsage bool, format string, a ...any) {
 	s := fmt.Sprintf(format, a...)
 	fmt.Fprintln(os.Stderr, s)
 	if printUsage {
@@ -2164,7 +2164,7 @@ func (git *repoSync) CallAskPassURL(ctx context.Context) error {
 
 	username := ""
 	password := ""
-	for _, line := range strings.Split(string(authData), "\n") {
+	for line := range strings.SplitSeq(string(authData), "\n") {
 		keyValues := strings.SplitN(line, "=", 2)
 		if len(keyValues) != 2 {
 			continue

pkg/cmd/cmd.go

@@ -36,8 +36,8 @@ type Runner struct {
 
 // Just the logr methods we need in this package.
 type logintf interface {
-	Info(msg string, keysAndValues ...interface{})
-	Error(err error, msg string, keysAndValues ...interface{})
+	Info(msg string, keysAndValues ...any)
+	Error(err error, msg string, keysAndValues ...any)
 	V(level int) logr.Logger
 	WithCallDepth(depth int) logr.Logger
 }

pkg/hook/hook.go

@@ -114,8 +114,8 @@ type HookRunner struct {
 
 // Just the logr methods we need in this package.
 type logintf interface {
-	Info(msg string, keysAndValues ...interface{})
-	Error(err error, msg string, keysAndValues ...interface{})
+	Info(msg string, keysAndValues ...any)
+	Error(err error, msg string, keysAndValues ...any)
 	V(level int) logr.Logger
 }
 

pkg/logging/logging.go

@@ -46,18 +46,18 @@ func New(root string, errorFile string, verbosity int) *Logger {
 }
 
 // Error implements logr.Logger.Error.
-func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
+func (l *Logger) Error(err error, msg string, kvList ...any) {
 	l.Logger.WithCallDepth(1).Error(err, msg, kvList...)
 	if l.errorFile == "" {
 		return
 	}
 	payload := struct {
 		Msg  string
 		Err  string
-		Args map[string]interface{}
+		Args map[string]any
 	}{
 		Msg:  msg,
-		Args: map[string]interface{}{},
+		Args: map[string]any{},
 	}
 	if err != nil {
 		payload.Err = err.Error()

test_e2e.sh

@@ -4021,7 +4021,6 @@ for arg; do
         print_tests
         exit 1
     fi
-    tests_to_run+=("${matches[@]}")
 done
 set -- "${tests_to_run[@]}"