all: use Go 1.26 things, run most gofix modernizers
I omitted a lot of the min/max modernizers because they didn't result in more clear code. Some of it's older "for x := range 123". Also: errors.AsType, any, fmt.Appendf, etc. Updates #18682 Change-Id: I83a451577f33877f962766a5b65ce86f7696471c Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
4453cc5f53
commit
bd2a2d53d3
@@ -12,6 +12,7 @@ import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/netip"
|
||||
"slices"
|
||||
"sync"
|
||||
|
||||
"go4.org/netipx"
|
||||
@@ -329,13 +330,7 @@ func configFromNodeView(n tailcfg.NodeView) (config, error) {
|
||||
selfRoutedDomains: set.Set[dnsname.FQDN]{},
|
||||
}
|
||||
for _, app := range apps {
|
||||
selfMatchesTags := false
|
||||
for _, tag := range app.Connectors {
|
||||
if selfTags.Contains(tag) {
|
||||
selfMatchesTags = true
|
||||
break
|
||||
}
|
||||
}
|
||||
selfMatchesTags := slices.ContainsFunc(app.Connectors, selfTags.Contains)
|
||||
for _, d := range app.Domains {
|
||||
fqdn, err := dnsname.ToFQDN(d)
|
||||
if err != nil {
|
||||
|
||||
@@ -115,7 +115,7 @@ func TestHandleConnectorTransitIPRequestMultipleTIP(t *testing.T) {
|
||||
t.Fatalf("n TransitIPs in response: %d, want 3", len(resp.TransitIPs))
|
||||
}
|
||||
|
||||
for i := 0; i < 3; i++ {
|
||||
for i := range 3 {
|
||||
got := resp.TransitIPs[i].Code
|
||||
if got != TransitIPResponseCode(0) {
|
||||
t.Fatalf("i=%d TransitIP Code: %d, want 0", i, got)
|
||||
|
||||
@@ -128,8 +128,7 @@ func exchangeJWTForToken(ctx context.Context, baseURL, clientID, idToken string)
|
||||
}).Exchange(ctx, "", oauth2.SetAuthURLParam("client_id", clientID), oauth2.SetAuthURLParam("jwt", idToken))
|
||||
if err != nil {
|
||||
// Try to extract more detailed error message
|
||||
var retrieveErr *oauth2.RetrieveError
|
||||
if errors.As(err, &retrieveErr) {
|
||||
if retrieveErr, ok := errors.AsType[*oauth2.RetrieveError](err); ok {
|
||||
return "", fmt.Errorf("token exchange failed with status %d: %s", retrieveErr.Response.StatusCode, string(retrieveErr.Body))
|
||||
}
|
||||
return "", fmt.Errorf("unexpected token exchange request error: %w", err)
|
||||
|
||||
@@ -42,7 +42,7 @@ func TestWatchFile(t *testing.T) {
|
||||
// Keep writing until we get a callback.
|
||||
func() {
|
||||
for i := range 10000 {
|
||||
if err := os.WriteFile(filepath, []byte(fmt.Sprintf("write%d", i)), 0644); err != nil {
|
||||
if err := os.WriteFile(filepath, fmt.Appendf(nil, "write%d", i), 0644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
select {
|
||||
|
||||
@@ -101,7 +101,7 @@ func (f fsFileOps) Rename(oldPath, newName string) (newPath string, err error) {
|
||||
wantSize := st.Size()
|
||||
|
||||
const maxRetries = 10
|
||||
for i := 0; i < maxRetries; i++ {
|
||||
for range maxRetries {
|
||||
renameMu.Lock()
|
||||
fi, statErr := os.Stat(dst)
|
||||
// Atomically rename the partial file as the destination file if it doesn't exist.
|
||||
|
||||
Reference in New Issue
Block a user