Merge pull request cri-o#9118 from kolyshkin/lint-v2-followups

openshift-merge-bot[bot] · web-flow · commit 2f2b3abcd49a · 2025-04-23T19:48:04.000Z
Lint v2 followups
diff --git a/.golangci.yml b/.golangci.yml
@@ -69,9 +69,7 @@ linters:
     - recvcheck
     - revive
     - rowserrcheck
-    - sloglint
     - spancheck
-    - sqlclosecheck
     - staticcheck
     - tagalign
     - testableexamples
@@ -83,9 +81,7 @@ linters:
     - usestdlibvars
     - usetesting
     - wastedassign
-    - whitespace
     - wsl
-    - zerologlint
     # - containedctx
     # - contextcheck
     # - cyclop
@@ -139,20 +135,13 @@ linters:
             - 22
           disabled: false
   exclusions:
-    generated: lax
+    generated: strict
     presets:
       - comments
-      - common-false-positives
-      - legacy
       - std-error-handling
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
 formatters:
   enable:
     - gci
-    - gofmt
     - gofumpt
     - goimports
   settings:
@@ -162,8 +151,4 @@ formatters:
         - default
         - localmodule
   exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    generated: strict
diff --git a/internal/ociartifact/impl.go b/internal/ociartifact/impl.go
@@ -30,7 +30,7 @@ type Impl interface {
 	GetBlob(context.Context, types.ImageSource, types.BlobInfo, types.BlobInfoCache) (io.ReadCloser, int64, error)
 	ReadAll(io.Reader) ([]byte, error)
 	OCI1FromManifest([]byte) (*manifest.OCI1, error)
-	MarshalJSON(any) ([]byte, error)
+	ToJSON(any) ([]byte, error)
 	ManifestFromBlob([]byte, string) (manifest.Manifest, error)
 	ManifestConfigMediaType(manifest.Manifest) string
 	NewCopier(*libimage.CopyOptions, *types.SystemContext, *types.ImageReference) (*libimage.Copier, error)
@@ -89,7 +89,7 @@ func (*defaultImpl) OCI1FromManifest(manifestBlob []byte) (*manifest.OCI1, error
 	return manifest.OCI1FromManifest(manifestBlob)
 }
 
-func (*defaultImpl) MarshalJSON(v any) ([]byte, error) {
+func (*defaultImpl) ToJSON(v any) ([]byte, error) {
 	return json.Marshal(v)
 }
 
diff --git a/internal/ociartifact/store.go b/internal/ociartifact/store.go
@@ -289,7 +289,7 @@ func (s *Store) buildArtifact(ctx context.Context, item *layout.ListResult) (*Ar
 		return nil, fmt.Errorf("convert manifest: %w", err)
 	}
 
-	manifestBytes, err := s.impl.MarshalJSON(mani)
+	manifestBytes, err := s.impl.ToJSON(mani)
 	if err != nil {
 		return nil, fmt.Errorf("marshal manifest: %w", err)
 	}
diff --git a/internal/ociartifact/store_test.go b/internal/ociartifact/store_test.go
@@ -64,7 +64,7 @@ var _ = t.Describe("OCIArtifact", func() {
 			getBlobErr             error
 			newImageSourceErrs     [3]error
 			layoutNewReferenceErrs [2]error
-			marshalJSONErr         error
+			toJSONErr              error
 			oci1FromManifestErr    error
 			getManifestErrs        [2]error
 			listErr                error
@@ -81,7 +81,7 @@ var _ = t.Describe("OCIArtifact", func() {
 				getBlobErr:             nil,
 				newImageSourceErrs:     [3]error{nil, nil, nil},
 				layoutNewReferenceErrs: [2]error{nil, nil},
-				marshalJSONErr:         nil,
+				toJSONErr:              nil,
 				oci1FromManifestErr:    nil,
 				getManifestErrs:        [2]error{nil, nil},
 				listErr:                nil,
@@ -159,11 +159,11 @@ var _ = t.Describe("OCIArtifact", func() {
 			}
 
 			res = append(res,
-				implMock.EXPECT().MarshalJSON(gomock.Any()).Return(nil, opts.marshalJSONErr),
+				implMock.EXPECT().ToJSON(gomock.Any()).Return(nil, opts.toJSONErr),
 				implMock.EXPECT().CloseImageSource(gomock.Any()).Return(nil),
 			)
 
-			if opts.marshalJSONErr != nil {
+			if opts.toJSONErr != nil {
 				return res
 			}
 
@@ -296,9 +296,9 @@ var _ = t.Describe("OCIArtifact", func() {
 			Expect(data).To(BeNil())
 		})
 
-		It("should fail if MarshalJSON fails", func() {
+		It("should fail if JSON fails", func() {
 			mockOptions := defaultMockOptions()
-			mockOptions.marshalJSONErr = errTest
+			mockOptions.toJSONErr = errTest
 			gomock.InOrder(mockCalls(mockOptions)...)
 
 			data, err := sut.PullData(context.Background(), "", nil)
diff --git a/test/mocks/ociartifact/ociartifact.go b/test/mocks/ociartifact/ociartifact.go

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func (s Store) buildArtifact(ctx context.Context, item layout.ListResult) (*Ar`
`289`	`289`	`return nil, fmt.Errorf("convert manifest: %w", err)`
`290`	`290`	`}`
`291`	`291`
`292`		`- manifestBytes, err := s.impl.MarshalJSON(mani)`
	`292`	`+ manifestBytes, err := s.impl.ToJSON(mani)`
`293`	`293`	`if err != nil {`
`294`	`294`	`return nil, fmt.Errorf("marshal manifest: %w", err)`
`295`	`295`	`}`