Enable containedctx

kzys · kzys · commit 5bdea3de373d · 2022-02-14T10:18:03.000-08:00
Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -40,7 +40,6 @@ linters:
     - paralleltest
     - cyclop # because we have gocyclo already
     # TODO: review the linters below. We disabled them to make the CI pass first.
-    - containedctx
     - ireturn
     - varnamelen
     - forcetypeassert
diff --git a/context_test.go b/context_test.go
@@ -11,7 +11,7 @@ import (
 func TestContext_ExtractOperationType(t *testing.T) {
 
 	var testCases = []struct {
-		Ctx            context.Context
+		Ctx            context.Context //nolint: containedctx
 		ExpectedOpType operationType
 	}{
 		{

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`func TestContext_ExtractOperationType(t *testing.T) {`
`12`	`12`
`13`	`13`	`var testCases = []struct {`
`14`		`- Ctx context.Context`
	`14`	`+ Ctx context.Context //nolint: containedctx`
`15`	`15`	`ExpectedOpType operationType`
`16`	`16`	`}{`
`17`	`17`	`{`