Merge branch 'master' into fix-k8s-init-log

go-vela · Apr 16, 2022 · 063ae55 · 063ae55
2 parents 40e1b36 + db09611
commit 063ae55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/executor/context_test.go b/executor/context_test.go
@@ -55,7 +55,7 @@ func TestExecutor_FromContext(t *testing.T) {
 		want    Engine
 	}{
 		{
-			// nolint: staticcheck // ignore using string with context value
+			// nolint: staticcheck,revive // ignore using string with context value
 			context: context.WithValue(context.Background(), key, _engine),
 			want:    _engine,
 		},
@@ -64,7 +64,7 @@ func TestExecutor_FromContext(t *testing.T) {
 			want:    nil,
 		},
 		{
-			// nolint: staticcheck // ignore using string with context value
+			// nolint: staticcheck,revive // ignore using string with context value
 			context: context.WithValue(context.Background(), key, "foo"),
 			want:    nil,
 		},
@@ -173,7 +173,7 @@ func TestExecutor_WithContext(t *testing.T) {
 		t.Errorf("unable to create linux engine: %v", err)
 	}
 
-	// nolint: staticcheck // ignore using string with context value
+	// nolint: staticcheck,revive // ignore using string with context value
 	want := context.WithValue(context.Background(), key, _engine)
 
 	// run test

diff --git a/mock/docker/docker.go b/mock/docker/docker.go
@@ -23,6 +23,7 @@ const Version = "v1.40"
 
 // New returns a client that is capable of handling
 // Docker client calls and returning stub responses.
+// nolint:revive // ignore unexported type as it is intentional
 func New() (*mock, error) {
 	return &mock{
 		ConfigService:       ConfigService{},

diff --git a/runtime/context_test.go b/runtime/context_test.go
@@ -29,7 +29,7 @@ func TestRuntime_FromContext(t *testing.T) {
 		want    Engine
 	}{
 		{
-			// nolint: staticcheck // ignore using string with context value
+			// nolint: staticcheck,revive // ignore using string with context value
 			context: context.WithValue(context.Background(), key, _engine),
 			want:    _engine,
 		},
@@ -38,7 +38,7 @@ func TestRuntime_FromContext(t *testing.T) {
 			want:    nil,
 		},
 		{
-			// nolint: staticcheck // ignore using string with context value
+			// nolint: staticcheck,revive // ignore using string with context value
 			context: context.WithValue(context.Background(), key, "foo"),
 			want:    nil,
 		},
@@ -109,7 +109,7 @@ func TestRuntime_WithContext(t *testing.T) {
 		t.Errorf("unable to create runtime engine: %v", err)
 	}
 
-	// nolint: staticcheck // ignore using string with context value
+	// nolint: staticcheck,revive // ignore using string with context value
 	want := context.WithValue(context.Background(), key, _engine)
 
 	// run test