1
0
Fork 0

Bump to go1.24

Co-authored-by: Romain <rtribotte@users.noreply.github.com>
This commit is contained in:
Kevin Pollet 2025-06-02 10:36:05 +02:00 committed by GitHub
parent 5f35c88805
commit cd16321dd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
88 changed files with 284 additions and 362 deletions

View file

@ -1,7 +1,6 @@
package acme
import (
"context"
"fmt"
"os"
"path/filepath"
@ -47,7 +46,7 @@ func TestLocalStore_GetAccount(t *testing.T) {
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
s := NewLocalStore(test.filename, safe.NewPool(context.Background()))
s := NewLocalStore(test.filename, safe.NewPool(t.Context()))
account, err := s.GetAccount("test")
require.NoError(t, err)
@ -60,7 +59,7 @@ func TestLocalStore_GetAccount(t *testing.T) {
func TestLocalStore_SaveAccount(t *testing.T) {
acmeFile := filepath.Join(t.TempDir(), "acme.json")
s := NewLocalStore(acmeFile, safe.NewPool(context.Background()))
s := NewLocalStore(acmeFile, safe.NewPool(t.Context()))
email := "some@email.com"

View file

@ -1,7 +1,6 @@
package acme
import (
"context"
"crypto/tls"
"testing"
"time"
@ -181,7 +180,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
resolvingDomains: test.resolvingDomains,
}
domains := acmeProvider.getUncheckedDomains(context.Background(), test.domains, "default")
domains := acmeProvider.getUncheckedDomains(t.Context(), test.domains, "default")
assert.Len(t, domains, len(test.expectedDomains), "Unexpected domains.")
})
}
@ -245,7 +244,7 @@ func TestProvider_sanitizeDomains(t *testing.T) {
acmeProvider := Provider{Configuration: &Configuration{DNSChallenge: test.dnsChallenge}}
domains, err := acmeProvider.sanitizeDomains(context.Background(), test.domains)
domains, err := acmeProvider.sanitizeDomains(t.Context(), test.domains)
if len(test.expectedErr) > 0 {
assert.EqualError(t, err, test.expectedErr, "Unexpected error.")
@ -424,7 +423,7 @@ func TestDeleteUnnecessaryDomains(t *testing.T) {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
domains := deleteUnnecessaryDomains(context.Background(), test.domains)
domains := deleteUnnecessaryDomains(t.Context(), test.domains)
assert.Equal(t, test.expectedDomains, domains, "unexpected domain")
})
}
@ -497,7 +496,7 @@ func TestIsAccountMatchingCaServer(t *testing.T) {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
result := isAccountMatchingCaServer(context.Background(), test.accountURI, test.serverURI)
result := isAccountMatchingCaServer(t.Context(), test.accountURI, test.serverURI)
assert.Equal(t, test.expected, result)
})
@ -574,7 +573,7 @@ func TestInitAccount(t *testing.T) {
acmeProvider := Provider{account: test.account, Configuration: &Configuration{Email: test.email, KeyType: test.keyType}}
actualAccount, err := acmeProvider.initAccount(context.Background())
actualAccount, err := acmeProvider.initAccount(t.Context())
assert.NoError(t, err, "Init account in error")
assert.Equal(t, test.expectedAccount.Email, actualAccount.Email, "unexpected email account")
assert.Equal(t, test.expectedAccount.KeyType, actualAccount.KeyType, "unexpected keyType account")

View file

@ -1,7 +1,6 @@
package aggregator
import (
"context"
"testing"
"time"
@ -24,7 +23,7 @@ func TestProviderAggregator_Provide(t *testing.T) {
cfgCh := make(chan dynamic.Message)
errCh := make(chan error)
pool := safe.NewPool(context.Background())
pool := safe.NewPool(t.Context())
t.Cleanup(pool.Stop)

View file

@ -1,7 +1,6 @@
package consulcatalog
import (
"context"
"fmt"
"testing"
@ -294,7 +293,7 @@ func TestDefaultRule(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.items, nil)
configuration := p.buildConfiguration(t.Context(), test.items, nil)
assert.Equal(t, test.expected, configuration)
})
@ -3186,7 +3185,7 @@ func Test_buildConfiguration(t *testing.T) {
test.items[i].Tags = tags
}
configuration := p.buildConfiguration(context.Background(), test.items, &connectCert{
configuration := p.buildConfiguration(t.Context(), test.items, &connectCert{
root: []string{"root"},
leaf: keyPair{
cert: "cert",

View file

@ -1,7 +1,6 @@
package docker
import (
"context"
"strconv"
"testing"
@ -387,7 +386,7 @@ func TestDefaultRule(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})
@ -3504,7 +3503,7 @@ func Test_buildConfiguration(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})
@ -3676,7 +3675,7 @@ func TestDockerGetIPPort(t *testing.T) {
UseBindPortIP: true,
}
actualIP, actualPort, actualError := provider.getIPPort(context.Background(), dData, test.serverPort)
actualIP, actualPort, actualError := provider.getIPPort(t.Context(), dData, test.serverPort)
if test.expected.error {
require.Error(t, actualError)
} else {
@ -3857,7 +3856,7 @@ func TestDockerGetIPAddress(t *testing.T) {
dData.ExtraConf.Docker.Network = test.network
}
actual := provider.getIPAddress(context.Background(), dData)
actual := provider.getIPAddress(t.Context(), dData)
assert.Equal(t, test.expected, actual)
})
}
@ -3917,10 +3916,10 @@ func TestSwarmGetIPAddress(t *testing.T) {
SwarmMode: true,
}
dData, err := provider.parseService(context.Background(), test.service, test.networks)
dData, err := provider.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
actual := provider.getIPAddress(context.Background(), dData)
actual := provider.getIPAddress(t.Context(), dData)
assert.Equal(t, test.expected, actual)
})
}
@ -3949,7 +3948,7 @@ func TestSwarmGetPort(t *testing.T) {
p := Provider{}
dData, err := p.parseService(context.Background(), test.service, test.networks)
dData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
actual := getPort(dData, test.serverPort)

View file

@ -83,11 +83,11 @@ func TestListTasks(t *testing.T) {
t.Parallel()
p := Provider{}
dockerData, err := p.parseService(context.Background(), test.service, test.networks)
dockerData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
dockerClient := &fakeTasksClient{tasks: test.tasks}
taskDockerData, _ := listTasks(context.Background(), dockerClient, test.service.ID, dockerData, test.networks, test.isGlobalSVC)
taskDockerData, _ := listTasks(t.Context(), dockerClient, test.service.ID, dockerData, test.networks, test.isGlobalSVC)
if len(test.expectedTasks) != len(taskDockerData) {
t.Errorf("expected tasks %v, got %v", test.expectedTasks, taskDockerData)
@ -277,7 +277,7 @@ func TestListServices(t *testing.T) {
p := Provider{}
serviceDockerData, err := p.listServices(context.Background(), dockerClient)
serviceDockerData, err := p.listServices(t.Context(), dockerClient)
assert.NoError(t, err)
assert.Len(t, serviceDockerData, len(test.expectedServices))
@ -395,11 +395,11 @@ func TestSwarmTaskParsing(t *testing.T) {
p := Provider{}
dData, err := p.parseService(context.Background(), test.service, test.networks)
dData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err)
for _, task := range test.tasks {
taskDockerData := parseTasks(context.Background(), task, dData, test.networks, test.isGlobalSVC)
taskDockerData := parseTasks(t.Context(), task, dData, test.networks, test.isGlobalSVC)
expected := test.expected[task.ID]
assert.Equal(t, expected.Name, taskDockerData.Name)
}

View file

@ -1,7 +1,6 @@
package ecs
import (
"context"
"testing"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
@ -358,7 +357,7 @@ func TestDefaultRule(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.instances)
configuration := p.buildConfiguration(t.Context(), test.instances)
assert.Equal(t, test.expected, configuration)
})
@ -3088,7 +3087,7 @@ func Test_buildConfiguration(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})

View file

@ -1,7 +1,6 @@
package file
import (
"context"
"io"
"os"
"path/filepath"
@ -60,7 +59,7 @@ func TestTLSCertificateContent(t *testing.T) {
require.NoError(t, err)
provider := &Provider{}
configuration, err := provider.loadFileConfig(context.Background(), fileConfig.Name(), true)
configuration, err := provider.loadFileConfig(t.Context(), fileConfig.Name(), true)
require.NoError(t, err)
require.Equal(t, "CONTENT", configuration.TLS.Certificates[0].Certificate.CertFile.String())
@ -81,7 +80,7 @@ func TestErrorWhenEmptyConfig(t *testing.T) {
configChan := make(chan dynamic.Message)
errorChan := make(chan struct{})
go func() {
err := provider.Provide(configChan, safe.NewPool(context.Background()))
err := provider.Provide(configChan, safe.NewPool(t.Context()))
assert.Error(t, err)
close(errorChan)
}()
@ -105,7 +104,7 @@ func TestProvideWithoutWatch(t *testing.T) {
provider.DebugLogGeneratedTemplate = true
go func() {
err := provider.Provide(configChan, safe.NewPool(context.Background()))
err := provider.Provide(configChan, safe.NewPool(t.Context()))
assert.NoError(t, err)
}()
@ -135,7 +134,7 @@ func TestProvideWithWatch(t *testing.T) {
configChan := make(chan dynamic.Message)
go func() {
err := provider.Provide(configChan, safe.NewPool(context.Background()))
err := provider.Provide(configChan, safe.NewPool(t.Context()))
assert.NoError(t, err)
}()

View file

@ -1,7 +1,6 @@
package http
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@ -212,7 +211,7 @@ func TestProvider_Provide(t *testing.T) {
},
}
err = provider.Provide(configurationChan, safe.NewPool(context.Background()))
err = provider.Provide(configurationChan, safe.NewPool(t.Context()))
require.NoError(t, err)
timeout := time.After(time.Second)
@ -246,7 +245,7 @@ func TestProvider_ProvideConfigurationOnlyOnceIfUnchanged(t *testing.T) {
configurationChan := make(chan dynamic.Message, 10)
err = provider.Provide(configurationChan, safe.NewPool(context.Background()))
err = provider.Provide(configurationChan, safe.NewPool(t.Context()))
require.NoError(t, err)
time.Sleep(time.Second)

View file

@ -1,7 +1,6 @@
package crd
import (
"context"
"os"
"path/filepath"
"strings"
@ -1466,7 +1465,7 @@ func TestLoadIngressRouteTCPs(t *testing.T) {
}
clientMock := newClientMock(test.paths...)
conf := p.loadConfigurationFromCRD(context.Background(), clientMock)
conf := p.loadConfigurationFromCRD(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
}
@ -4241,7 +4240,7 @@ func TestLoadIngressRoutes(t *testing.T) {
}
clientMock := newClientMock(test.paths...)
conf := p.loadConfigurationFromCRD(context.Background(), clientMock)
conf := p.loadConfigurationFromCRD(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
}
@ -4721,7 +4720,7 @@ func TestLoadIngressRouteUDPs(t *testing.T) {
}
clientMock := newClientMock(test.paths...)
conf := p.loadConfigurationFromCRD(context.Background(), clientMock)
conf := p.loadConfigurationFromCRD(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
}
@ -6098,7 +6097,7 @@ func TestCrossNamespace(t *testing.T) {
p := Provider{AllowCrossNamespace: test.allowCrossNamespace}
conf := p.loadConfigurationFromCRD(context.Background(), client)
conf := p.loadConfigurationFromCRD(t.Context(), client)
assert.Equal(t, test.expected, conf)
})
}
@ -6387,7 +6386,7 @@ func TestExternalNameService(t *testing.T) {
p := Provider{AllowExternalNameServices: test.allowExternalNameService}
conf := p.loadConfigurationFromCRD(context.Background(), client)
conf := p.loadConfigurationFromCRD(t.Context(), client)
assert.Equal(t, test.expected, conf)
})
}
@ -6593,7 +6592,7 @@ func TestNativeLB(t *testing.T) {
p := Provider{}
conf := p.loadConfigurationFromCRD(context.Background(), client)
conf := p.loadConfigurationFromCRD(t.Context(), client)
assert.Equal(t, test.expected, conf)
})
}

View file

@ -1,7 +1,6 @@
package gateway
import (
"context"
"testing"
"github.com/stretchr/testify/assert"
@ -1481,7 +1480,7 @@ func TestLoadHTTPRoutes(t *testing.T) {
}
p := Provider{EntryPoints: test.entryPoints}
conf := p.loadConfigurationFromGateway(context.Background(), newClientMock(test.paths...))
conf := p.loadConfigurationFromGateway(t.Context(), newClientMock(test.paths...))
assert.Equal(t, test.expected, conf)
})
}
@ -2215,7 +2214,7 @@ func TestLoadTCPRoutes(t *testing.T) {
}
p := Provider{EntryPoints: test.entryPoints}
conf := p.loadConfigurationFromGateway(context.Background(), newClientMock(test.paths...))
conf := p.loadConfigurationFromGateway(t.Context(), newClientMock(test.paths...))
assert.Equal(t, test.expected, conf)
})
}
@ -3307,7 +3306,7 @@ func TestLoadTLSRoutes(t *testing.T) {
}
p := Provider{EntryPoints: test.entryPoints}
conf := p.loadConfigurationFromGateway(context.Background(), newClientMock(test.paths...))
conf := p.loadConfigurationFromGateway(t.Context(), newClientMock(test.paths...))
assert.Equal(t, test.expected, conf)
})
}
@ -4258,7 +4257,7 @@ func TestLoadMixedRoutes(t *testing.T) {
}
p := Provider{EntryPoints: test.entryPoints}
conf := p.loadConfigurationFromGateway(context.Background(), newClientMock(test.paths...))
conf := p.loadConfigurationFromGateway(t.Context(), newClientMock(test.paths...))
assert.Equal(t, test.expected, conf)
})
}

View file

@ -1,7 +1,6 @@
package ingress
import (
"context"
"errors"
"testing"
"time"
@ -243,7 +242,7 @@ func TestClientIgnoresEmptyEndpointUpdates(t *testing.T) {
assert.Fail(t, "expected to receive event for endpoints")
}
emptyEndpoint, err = kubeClient.CoreV1().Endpoints("test").Get(context.TODO(), "empty-endpoint", metav1.GetOptions{})
emptyEndpoint, err = kubeClient.CoreV1().Endpoints("test").Get(t.Context(), "empty-endpoint", metav1.GetOptions{})
assert.NoError(t, err)
// Update endpoint annotation and resource version (apparently not done by fake client itself)
@ -251,7 +250,7 @@ func TestClientIgnoresEmptyEndpointUpdates(t *testing.T) {
// This reflects the behavior of kubernetes controllers which use endpoint annotations for leader election.
emptyEndpoint.Annotations["test-annotation"] = "___"
emptyEndpoint.ResourceVersion = "1245"
_, err = kubeClient.CoreV1().Endpoints("test").Update(context.TODO(), emptyEndpoint, metav1.UpdateOptions{})
_, err = kubeClient.CoreV1().Endpoints("test").Update(t.Context(), emptyEndpoint, metav1.UpdateOptions{})
require.NoError(t, err)
select {
@ -263,12 +262,12 @@ func TestClientIgnoresEmptyEndpointUpdates(t *testing.T) {
case <-time.After(50 * time.Millisecond):
}
filledEndpoint, err = kubeClient.CoreV1().Endpoints("test").Get(context.TODO(), "filled-endpoint", metav1.GetOptions{})
filledEndpoint, err = kubeClient.CoreV1().Endpoints("test").Get(t.Context(), "filled-endpoint", metav1.GetOptions{})
assert.NoError(t, err)
filledEndpoint.Subsets[0].Addresses[0].IP = "10.13.37.2"
filledEndpoint.ResourceVersion = "1235"
_, err = kubeClient.CoreV1().Endpoints("test").Update(context.TODO(), filledEndpoint, metav1.UpdateOptions{})
_, err = kubeClient.CoreV1().Endpoints("test").Update(t.Context(), filledEndpoint, metav1.UpdateOptions{})
require.NoError(t, err)
select {

View file

@ -1,7 +1,6 @@
package ingress
import (
"context"
"errors"
"math"
"os"
@ -1658,7 +1657,7 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
clientMock := newClientMock(serverVersion, paths...)
p := Provider{IngressClass: test.ingressClass, AllowEmptyServices: test.allowEmptyServices}
conf := p.loadConfigurationFromIngresses(context.Background(), clientMock)
conf := p.loadConfigurationFromIngresses(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
@ -1804,7 +1803,7 @@ func TestLoadConfigurationFromIngressesWithExternalNameServices(t *testing.T) {
p := Provider{IngressClass: test.ingressClass}
p.AllowExternalNameServices = test.allowExternalNameServices
conf := p.loadConfigurationFromIngresses(context.Background(), clientMock)
conf := p.loadConfigurationFromIngresses(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
@ -1881,7 +1880,7 @@ func TestLoadConfigurationFromIngressesWithNativeLB(t *testing.T) {
clientMock := newClientMock(serverVersion, paths...)
p := Provider{IngressClass: test.ingressClass}
conf := p.loadConfigurationFromIngresses(context.Background(), clientMock)
conf := p.loadConfigurationFromIngresses(t.Context(), clientMock)
assert.Equal(t, test.expected, conf)
})
@ -2053,7 +2052,7 @@ func TestGetCertificates(t *testing.T) {
t.Parallel()
tlsConfigs := map[string]*tls.CertAndStores{}
err := getCertificates(context.Background(), test.ingress, test.client, tlsConfigs)
err := getCertificates(t.Context(), test.ingress, test.client, tlsConfigs)
if test.errResult != "" {
assert.EqualError(t, err, test.errResult)

View file

@ -1,7 +1,6 @@
package kv
import (
"context"
"errors"
"testing"
"time"
@ -285,7 +284,7 @@ func Test_buildConfiguration(t *testing.T) {
"traefik/tls/certificates/1/stores/1": "foobar",
}))
cfg, err := provider.buildConfiguration(context.Background())
cfg, err := provider.buildConfiguration(t.Context())
require.NoError(t, err)
expected := &dynamic.Configuration{
@ -931,7 +930,7 @@ func Test_buildConfiguration_KV_error(t *testing.T) {
},
}
cfg, err := provider.buildConfiguration(context.Background())
cfg, err := provider.buildConfiguration(t.Context())
require.Error(t, err)
assert.Nil(t, cfg)
}
@ -950,7 +949,7 @@ func TestKvWatchTree(t *testing.T) {
configChan := make(chan dynamic.Message)
go func() {
err := provider.watchKv(context.Background(), configChan)
err := provider.watchKv(t.Context(), configChan)
require.NoError(t, err)
}()

View file

@ -1,7 +1,6 @@
package marathon
import (
"context"
"math"
"testing"
@ -22,7 +21,7 @@ func TestGetConfigurationAPIErrors(t *testing.T) {
marathonClient: fakeClient,
}
actualConfig := p.getConfigurations(context.Background())
actualConfig := p.getConfigurations(t.Context())
fakeClient.AssertExpectations(t)
if actualConfig != nil {
@ -2051,7 +2050,7 @@ func TestBuildConfiguration(t *testing.T) {
err := p.Init()
require.NoError(t, err)
actualConfig := p.buildConfiguration(context.Background(), test.applications)
actualConfig := p.buildConfiguration(t.Context(), test.applications)
assert.NotNil(t, actualConfig)
assert.Equal(t, test.expected, actualConfig)
@ -2097,7 +2096,7 @@ func TestApplicationFilterEnabled(t *testing.T) {
extraConf, err := provider.getConfiguration(app)
require.NoError(t, err)
if provider.keepApplication(context.Background(), extraConf, stringValueMap(app.Labels)) != test.expected {
if provider.keepApplication(t.Context(), extraConf, stringValueMap(app.Labels)) != test.expected {
t.Errorf("got unexpected filtering = %t", !test.expected)
}
})

View file

@ -1,7 +1,6 @@
package nomad
import (
"context"
"testing"
"github.com/stretchr/testify/assert"
@ -229,8 +228,7 @@ func Test_defaultRule(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
config := p.buildConfig(ctx, test.items)
config := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, config)
})
}
@ -2680,8 +2678,7 @@ func Test_buildConfig(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
c := p.buildConfig(ctx, test.items)
c := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, c)
})
}
@ -2729,8 +2726,8 @@ func Test_keepItem(t *testing.T) {
p := new(Provider)
p.SetDefaults()
p.Constraints = test.constraints
ctx := context.TODO()
result := p.keepItem(ctx, test.i)
result := p.keepItem(t.Context(), test.i)
require.Equal(t, test.exp, result)
})
}

View file

@ -1,7 +1,6 @@
package nomad
import (
"context"
"net/http"
"net/http/httptest"
"strings"
@ -155,7 +154,7 @@ func Test_getNomadServiceData(t *testing.T) {
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceData(context.TODO())
items, err := p.getNomadServiceData(t.Context())
require.NoError(t, err)
require.Len(t, items, 2)
}

View file

@ -1,7 +1,6 @@
package rancher
import (
"context"
"testing"
"github.com/stretchr/testify/assert"
@ -1281,7 +1280,7 @@ func Test_buildConfiguration(t *testing.T) {
require.NoError(t, err)
}
configuration := p.buildConfiguration(context.Background(), test.containers)
configuration := p.buildConfiguration(t.Context(), test.containers)
assert.Equal(t, test.expected, configuration)
})

View file

@ -1,7 +1,6 @@
package traefik
import (
"context"
"encoding/json"
"flag"
"os"
@ -262,7 +261,7 @@ func Test_createConfiguration(t *testing.T) {
provider := Provider{staticCfg: test.staticCfg}
cfg := provider.createConfiguration(context.Background())
cfg := provider.createConfiguration(t.Context())
filename := filepath.Join("fixtures", test.desc)