Bump mvdan.cc/gofumpt from 0.8.0 to 0.9.0 in /tools (#4465)

dependabot[bot] · ademidoff · web-flow · commit c99927a2e871 · 2025-09-04T11:17:31.000+02:00
* Bump mvdan.cc/gofumpt from 0.8.0 to 0.9.0 in /tools Bumps [mvdan.cc/gofumpt](https://github.com/mvdan/gofumpt) from 0.8.0 to 0.9.0. - [Release notes](https://github.com/mvdan/gofumpt/releases) - [Changelog](https://github.com/mvdan/gofumpt/blob/master/CHANGELOG.md) - [Commits](mvdan/gofumpt@v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: mvdan.cc/gofumpt dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Apply gofumpt fixes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Demidoff <alex@demidoff.me>
diff --git a/agent/client/client.go b/agent/client/client.go
@@ -866,23 +866,23 @@ func getNetworkInformation(channel *channel.Channel) (latency, clockDrift time.D
 	var resp agentv1.ServerResponsePayload
 	resp, err = channel.SendAndWaitResponse(&agentv1.Ping{})
 	if err != nil {
-		return
+		return latency, clockDrift, err
 	}
 	if resp == nil {
 		err = channel.Wait()
-		return
+		return latency, clockDrift, err
 	}
 	roundtrip := time.Since(start)
 	currentTime := resp.(*agentv1.Pong).CurrentTime //nolint:forcetypeassert
 	serverTime := currentTime.AsTime()
 	err = currentTime.CheckValid()
 	if err != nil {
 		err = errors.Wrap(err, "Failed to decode Ping")
-		return
+		return latency, clockDrift, err
 	}
 	latency = roundtrip / 2
 	clockDrift = serverTime.Sub(start) - latency
-	return
+	return latency, clockDrift, err
 }
 
 // GetNetworkInformation sends ping request to the server and returns info about latency and clock drift.
@@ -892,11 +892,11 @@ func (c *Client) GetNetworkInformation() (latency, clockDrift time.Duration, err
 	c.rw.RUnlock()
 	if channel == nil {
 		err = errors.New("not connected")
-		return
+		return latency, clockDrift, err
 	}
 
 	latency, clockDrift, err = getNetworkInformation(channel)
-	return
+	return latency, clockDrift, err
 }
 
 // GetServerConnectMetadata returns current server's metadata, or nil.
diff --git a/agent/client/client_test.go b/agent/client/client_test.go
@@ -72,7 +72,7 @@ func setup(t *testing.T, connect func(server agentv1.AgentService_ConnectServer)
 		require.NoError(t, <-serveError)
 	}
 
-	return
+	return port, teardown
 }
 
 func TestClient(t *testing.T) {
diff --git a/api-tests/management/external_test.go b/api-tests/management/external_test.go
@@ -441,7 +441,7 @@ func TestRemoveExternal(t *testing.T) {
 		require.NotNil(t, addExternalOK)
 		require.NotNil(t, addExternalOK.Payload.External.Service)
 		serviceID = addExternalOK.Payload.External.Service.ServiceID
-		return
+		return nodeID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/api-tests/management/haproxy_test.go b/api-tests/management/haproxy_test.go
@@ -399,7 +399,7 @@ func TestRemoveHAProxy(t *testing.T) {
 		require.NotNil(t, addHAProxyOK)
 		require.NotNil(t, addHAProxyOK.Payload.Haproxy.Service)
 		serviceID = addHAProxyOK.Payload.Haproxy.Service.ServiceID
-		return
+		return nodeID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/api-tests/management/mongodb_test.go b/api-tests/management/mongodb_test.go
@@ -922,7 +922,7 @@ func TestRemoveMongoDB(t *testing.T) {
 		require.NotNil(t, addMongoDBOK)
 		require.NotNil(t, addMongoDBOK.Payload.Mongodb.Service)
 		serviceID = addMongoDBOK.Payload.Mongodb.Service.ServiceID
-		return
+		return nodeID, pmmAgentID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/api-tests/management/mysql_test.go b/api-tests/management/mysql_test.go
@@ -920,7 +920,7 @@ func TestRemoveMySQL(t *testing.T) {
 		require.NotNil(t, addMySQLOK)
 		require.NotNil(t, addMySQLOK.Payload.Mysql.Service)
 		serviceID = addMySQLOK.Payload.Mysql.Service.ServiceID
-		return //nolint:nakedret
+		return nodeID, pmmAgentID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/api-tests/management/postgresql_test.go b/api-tests/management/postgresql_test.go
@@ -887,7 +887,7 @@ func TestRemovePostgreSQL(t *testing.T) {
 		require.NotNil(t, addPostgreSQLOK)
 		require.NotNil(t, addPostgreSQLOK.Payload.Postgresql.Service)
 		serviceID = addPostgreSQLOK.Payload.Postgresql.Service.ServiceID
-		return
+		return nodeID, pmmAgentID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/api-tests/management/proxysql_test.go b/api-tests/management/proxysql_test.go
@@ -642,7 +642,7 @@ func TestRemoveProxySQL(t *testing.T) {
 		require.NotNil(t, addProxySQLOK)
 		require.NotNil(t, addProxySQLOK.Payload.Proxysql.Service)
 		serviceID = addProxySQLOK.Payload.Proxysql.Service.ServiceID
-		return
+		return nodeID, pmmAgentID, serviceID
 	}
 
 	t.Run("By name", func(t *testing.T) {
diff --git a/managed/models/action_helpers_test.go b/managed/models/action_helpers_test.go
@@ -59,7 +59,7 @@ func TestActionHelpers(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return
+		return q, teardown
 	}
 
 	t.Run("FindActionResultByID", func(t *testing.T) {
diff --git a/managed/services/checks/checks.go b/managed/services/checks/checks.go
@@ -1613,7 +1613,7 @@ func groupChecksByDB(l *logrus.Entry, checks map[string]check.Check) (mySQLCheck
 		}
 	}
 
-	return
+	return mySQLChecks, postgreSQLChecks, mongoDBChecks
 }
 
 // check interfaces.
diff --git a/managed/services/supervisord/pmm_config.go b/managed/services/supervisord/pmm_config.go
@@ -74,7 +74,7 @@ func saveConfig(path string, cfg []byte) (err error) {
 	if err = os.WriteFile(path, cfg, 0o664); err != nil { //nolint:gosec
 		err = errors.Wrap(err, "failed to write new config")
 	}
-	return
+	return err
 }
 
 var pmmTemplate = template.Must(template.New("").Option("missingkey=error").Parse(`[unix_http_server]
diff --git a/managed/utils/interceptors/interceptors.go b/managed/utils/interceptors/interceptors.go
@@ -75,7 +75,7 @@ func logRequest(l *logrus.Entry, prefix string, f func() error) (err error) {
 	}()
 
 	err = f()
-	return //nolint:nakedret
+	return err
 }
 
 // UnaryInterceptorType represents the type of a unary gRPC interceptor.
diff --git a/qan-api2/utils/interceptors/interceptors.go b/qan-api2/utils/interceptors/interceptors.go
@@ -76,7 +76,7 @@ func logRequest(l *logrus.Entry, prefix string, f func() error) (err error) {
 	}()
 
 	err = f()
-	return //nolint:nakedret
+	return err
 }
 
 // Unary adds context logger and Prometheus metrics to unary server RPC.
diff --git a/tools/go.mod b/tools/go.mod
@@ -26,7 +26,7 @@ require (
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
 	google.golang.org/protobuf v1.36.6
 	gopkg.in/reform.v1 v1.5.1
-	mvdan.cc/gofumpt v0.8.0
+	mvdan.cc/gofumpt v0.9.0
 )
 
 require (
diff --git a/tools/go.sum b/tools/go.sum
@@ -1038,8 +1038,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k=
-mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg=
+mvdan.cc/gofumpt v0.9.0 h1:W0wNHMSvDBDIyZsm3nnGbVfgp5AknzBrGJnfLCy501w=
+mvdan.cc/gofumpt v0.9.0/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw=
 pluginrpc.com/pluginrpc v0.5.0 h1:tOQj2D35hOmvHyPu8e7ohW2/QvAnEtKscy2IJYWQ2yo=
 pluginrpc.com/pluginrpc v0.5.0/go.mod h1:UNWZ941hcVAoOZUn8YZsMmOZBzbUjQa3XMns8RQLp9o=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func setup(t *testing.T, connect func(server agentv1.AgentService_ConnectServer)`
`72`	`72`	`require.NoError(t, <-serveError)`
`73`	`73`	`}`
`74`	`74`
`75`		`- return`
	`75`	`+ return port, teardown`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func TestClient(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ func TestRemoveExternal(t *testing.T) {`
`441`	`441`	`require.NotNil(t, addExternalOK)`
`442`	`442`	`require.NotNil(t, addExternalOK.Payload.External.Service)`
`443`	`443`	`serviceID = addExternalOK.Payload.External.Service.ServiceID`
`444`		`- return`
	`444`	`+ return nodeID, serviceID`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func TestRemoveHAProxy(t *testing.T) {`
`399`	`399`	`require.NotNil(t, addHAProxyOK)`
`400`	`400`	`require.NotNil(t, addHAProxyOK.Payload.Haproxy.Service)`
`401`	`401`	`serviceID = addHAProxyOK.Payload.Haproxy.Service.ServiceID`
`402`		`- return`
	`402`	`+ return nodeID, serviceID`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ func TestRemoveMongoDB(t *testing.T) {`
`922`	`922`	`require.NotNil(t, addMongoDBOK)`
`923`	`923`	`require.NotNil(t, addMongoDBOK.Payload.Mongodb.Service)`
`924`	`924`	`serviceID = addMongoDBOK.Payload.Mongodb.Service.ServiceID`
`925`		`- return`
	`925`	`+ return nodeID, pmmAgentID, serviceID`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ func TestRemoveMySQL(t *testing.T) {`
`920`	`920`	`require.NotNil(t, addMySQLOK)`
`921`	`921`	`require.NotNil(t, addMySQLOK.Payload.Mysql.Service)`
`922`	`922`	`serviceID = addMySQLOK.Payload.Mysql.Service.ServiceID`
`923`		`- return //nolint:nakedret`
	`923`	`+ return nodeID, pmmAgentID, serviceID`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ func TestRemovePostgreSQL(t *testing.T) {`
`887`	`887`	`require.NotNil(t, addPostgreSQLOK)`
`888`	`888`	`require.NotNil(t, addPostgreSQLOK.Payload.Postgresql.Service)`
`889`	`889`	`serviceID = addPostgreSQLOK.Payload.Postgresql.Service.ServiceID`
`890`		`- return`
	`890`	`+ return nodeID, pmmAgentID, serviceID`
`891`	`891`	`}`
`892`	`892`
`893`	`893`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ func TestRemoveProxySQL(t *testing.T) {`
`642`	`642`	`require.NotNil(t, addProxySQLOK)`
`643`	`643`	`require.NotNil(t, addProxySQLOK.Payload.Proxysql.Service)`
`644`	`644`	`serviceID = addProxySQLOK.Payload.Proxysql.Service.ServiceID`
`645`		`- return`
	`645`	`+ return nodeID, pmmAgentID, serviceID`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`t.Run("By name", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func TestActionHelpers(t *testing.T) {`
`59`	`59`	`t.Helper()`
`60`	`60`	`require.NoError(t, tx.Rollback())`
`61`	`61`	`}`
`62`		`- return`
	`62`	`+ return q, teardown`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`t.Run("FindActionResultByID", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -1613,7 +1613,7 @@ func groupChecksByDB(l *logrus.Entry, checks map[string]check.Check) (mySQLCheck`
`1613`	`1613`	`}`
`1614`	`1614`	`}`
`1615`	`1615`
`1616`		`- return`
	`1616`	`+ return mySQLChecks, postgreSQLChecks, mongoDBChecks`
`1617`	`1617`	`}`
`1618`	`1618`
`1619`	`1619`	`// check interfaces.`