Merge pull request #2297 from zhanggbj/enable_containedctx

🌱 lint: enable containedctx lint
kubernetes-sigs · Aug 29, 2023 · 185251f · 185251f
2 parents dd39b0a + 08f2a6b
commit 185251f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -13,7 +13,7 @@ linters:
   - asciicheck
   - bidichk
   - bodyclose
-  # - containedctx
+  - containedctx
   - dogsled
   - dupword
   - durationcheck

diff --git a/pkg/context/controller_manager_context.go b/pkg/context/controller_manager_context.go
@@ -33,7 +33,7 @@ import (
 // ControllerManagerContext is the context of the controller that owns the
 // controllers.
 type ControllerManagerContext struct {
-	context.Context
+	context.Context //nolint:containedctx
 
 	// Namespace is the namespace in which the resource is located responsible
 	// for running the controller manager.

diff --git a/pkg/services/govmomi/cluster/cluster_suite_test.go b/pkg/services/govmomi/cluster/cluster_suite_test.go
@@ -33,8 +33,8 @@ func TestCluster(t *testing.T) {
 }
 
 type testComputeClusterCtx struct {
-	context.Context
-	finder *find.Finder
+	context.Context //nolint:containedctx
+	finder          *find.Finder
 }
 
 func (t testComputeClusterCtx) GetSession() *session.Session {

diff --git a/pkg/util/fetch_object.go b/pkg/util/fetch_object.go
@@ -28,7 +28,7 @@ import (
 )
 
 type FetchObjectInput struct {
-	context.Context
+	context.Context //nolint:containedctx
 	ctrlclient.Client
 	Object ctrlclient.Object
 }

diff --git a/test/helpers/vmware/intg_test_context.go b/test/helpers/vmware/intg_test_context.go
@@ -41,7 +41,7 @@ import (
 // IntegrationTestContext is used for integration testing
 // Supervisor controllers.
 type IntegrationTestContext struct {
-	context.Context
+	context.Context   //nolint:containedctx
 	Client            client.Client
 	GuestClient       client.Client
 	Namespace         string