Use testing.Context (a Go 1.24 feature)

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj-cyberark

cmd/agent_test.go

@@ -39,7 +39,7 @@ func TestAgentRunOneShot(t *testing.T) {
 		return
 	}
 	t.Log("Running child process")
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
+	ctx, cancel := context.WithTimeout(t.Context(), time.Second*3)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, os.Args[0], "-test.run=^TestAgentRunOneShot$")
 	var (

pkg/agent/config_test.go

@@ -659,7 +659,7 @@ func Test_ValidateAndCombineConfig_VenafiCloudKeyPair(t *testing.T) {
 	t.Run("server, uploader_id, and cluster name are correctly passed", func(t *testing.T) {
 		t.Setenv("POD_NAMESPACE", "venafi")
 
-		ctx, cancel := context.WithCancel(context.Background())
+		ctx, cancel := context.WithCancel(t.Context())
 		defer cancel()
 		log := ktesting.NewLogger(t, ktesting.NewConfig(ktesting.Verbosity(10)))
 		ctx = klog.NewContext(ctx, log)
@@ -752,7 +752,7 @@ func Test_ValidateAndCombineConfig_VenafiConnection(t *testing.T) {
 			  name: venafi-connection
 			  namespace: venafi
 		`))) {
-		require.NoError(t, kcl.Create(context.Background(), obj))
+		require.NoError(t, kcl.Create(t.Context(), obj))
 	}
 
 	t.Run("err when cluster_id field is empty", func(t *testing.T) {
@@ -768,7 +768,7 @@ func Test_ValidateAndCombineConfig_VenafiConnection(t *testing.T) {
 	})
 
 	t.Run("the server field is ignored when VenafiConnection is used", func(t *testing.T) {
-		ctx, cancel := context.WithCancel(context.Background())
+		ctx, cancel := context.WithCancel(t.Context())
 		defer cancel()
 		log := ktesting.NewLogger(t, ktesting.NewConfig(ktesting.Verbosity(10)))
 		ctx = klog.NewContext(ctx, log)

pkg/client/client_venconn_test.go

@@ -36,7 +36,7 @@ import (
 //
 // [1] https://github.com/kubernetes-sigs/controller-runtime/issues/2341
 func TestVenConnClient_PostDataReadingsWithOptions(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(t.Context())
 	defer cancel()
 	log := ktesting.NewLogger(t, ktesting.NewConfig(ktesting.Verbosity(10)))
 	ctx = klog.NewContext(ctx, log)

pkg/datagatherer/k8s/dynamic_test.go

@@ -1,7 +1,6 @@
 package k8s
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -117,7 +116,7 @@ func sortGatheredResources(list []*api.GatheredResource) {
 }
 
 func TestNewDataGathererWithClientAndDynamicInformer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	config := ConfigDynamic{
 		ExcludeNamespaces:    []string{"kube-system"},
 		GroupVersionResource: schema.GroupVersionResource{Group: "foobar", Version: "v1", Resource: "foos"},
@@ -164,7 +163,7 @@ func TestNewDataGathererWithClientAndDynamicInformer(t *testing.T) {
 }
 
 func TestNewDataGathererWithClientAndSharedIndexInformer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	config := ConfigDynamic{
 		IncludeNamespaces:    []string{"a"},
 		GroupVersionResource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"},
@@ -638,7 +637,7 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			var wg sync.WaitGroup
-			ctx := context.Background()
+			ctx := t.Context()
 			gvrToListKind := map[schema.GroupVersionResource]string{
 				{Group: "foobar", Version: "v1", Resource: "foos"}:      "UnstructuredList",
 				{Group: "apps", Version: "v1", Resource: "deployments"}: "UnstructuredList",
@@ -958,7 +957,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			var wg sync.WaitGroup
-			ctx := context.Background()
+			ctx := t.Context()
 
 			clientset := fakeclientset.NewSimpleClientset(tc.addObjects...)
 

pkg/echo/echo_test.go

@@ -2,7 +2,6 @@ package echo
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -61,7 +60,7 @@ func TestEchoServerRequestResponse(t *testing.T) {
 		}
 
 		// generate a request to test the handler containing the JSON data as a body
-		req, err := http.NewRequestWithContext(context.TODO(), sampleUpload.method, "http://example.com/api/v1/datareadings", bytes.NewBuffer(requestBodyJSON))
+		req, err := http.NewRequestWithContext(t.Context(), sampleUpload.method, "http://example.com/api/v1/datareadings", bytes.NewBuffer(requestBodyJSON))
 		if err != nil {
 			t.Fatalf("[%s]\nfailed to generate request to test echo server: %s", sampleUpload.description, err)
 		}

pkg/internal/cyberark/dataupload/dataupload_test.go

@@ -1,7 +1,6 @@
 package dataupload_test
 
 import (
-	"context"
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
@@ -113,7 +112,7 @@ func TestCyberArkClient_PostDataReadingsWithOptions(t *testing.T) {
 			cyberArkClient, err := dataupload.NewCyberArkClient(certPool, server.Server.URL, tc.authenticate)
 			require.NoError(t, err)
 
-			err = cyberArkClient.PostDataReadingsWithOptions(context.TODO(), tc.payload, tc.opts)
+			err = cyberArkClient.PostDataReadingsWithOptions(t.Context(), tc.payload, tc.opts)
 			tc.requireFn(t, err)
 		})
 	}

pkg/internal/cyberark/identity/advance_authentication_test.go

@@ -1,7 +1,6 @@
 package identity
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
@@ -98,7 +97,7 @@ func Test_IdentityAdvanceAuthentication(t *testing.T) {
 
 	for name, testSpec := range tests {
 		t.Run(name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 
 			identityServer := MockIdentityServer()
 			defer identityServer.Close()

pkg/internal/cyberark/identity/start_authentication_test.go

@@ -1,7 +1,6 @@
 package identity
 
 import (
-	"context"
 	"fmt"
 	"testing"
 
@@ -39,7 +38,7 @@ func Test_IdentityStartAuthentication(t *testing.T) {
 
 	for name, testSpec := range tests {
 		t.Run(name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 
 			identityServer := MockIdentityServer()
 			defer identityServer.Close()

pkg/internal/cyberark/servicediscovery/discovery_test.go

@@ -1,7 +1,6 @@
 package servicediscovery
 
 import (
-	"context"
 	"fmt"
 	"testing"
 )
@@ -46,7 +45,7 @@ func Test_DiscoverIdentityAPIURL(t *testing.T) {
 
 	for name, testSpec := range tests {
 		t.Run(name, func(t *testing.T) {
-			ctx := context.Background()
+			ctx := t.Context()
 
 			ts := MockDiscoveryServer()
 			defer ts.Close()

pkg/logs/logs_test.go

@@ -2,7 +2,6 @@ package logs_test
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -65,7 +64,7 @@ func TestLogs(t *testing.T) {
 		klog.Warning("klog Warning")
 		klog.ErrorS(errors.New("fake-error"), "klog Error")
 		klog.InfoS("klog InfoS", "key", "value")
-		logger := klog.FromContext(context.Background()).WithName("foo")
+		logger := klog.FromContext(t.Context()).WithName("foo")
 		logger.V(3).Info("Contextual Info Level 3", "key", "value")
 		logger.Error(errors.New("fake-error"), "Contextual error", "key", "value")