lint: silence "SA1019: tar.TypeRegA has been deprecated... (staticheck)"

AkihiroSuda · thaJeztah · commit fec784a06ad4 · 2023-08-28T16:16:20.000+02:00
"SA1019: tar.TypeRegA has been deprecated since Go 1.11 and an alternative has been available since Go 1.1: Use TypeReg instead. (staticcheck)" Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 9b510e9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/archive/tar.go b/archive/tar.go
@@ -332,6 +332,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header
 			}
 		}
 
+	//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
 	case tar.TypeReg, tar.TypeRegA:
 		file, err := openFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, hdrInfo.Mode())
 		if err != nil {
diff --git a/images/archive/importer.go b/images/archive/importer.go
@@ -94,6 +94,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt
 			symlinks[hdr.Name] = path.Join(path.Dir(hdr.Name), hdr.Linkname)
 		}
 
+		//nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA
 		if hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA {
 			if hdr.Typeflag != tar.TypeDir {
 				log.G(ctx).WithField("file", hdr.Name).Debug("file type ignored")

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
	`335`	`+ //nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA`
`335`	`336`	`case tar.TypeReg, tar.TypeRegA:`
`336`	`337`	`file, err := openFile(path, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, hdrInfo.Mode())`
`337`	`338`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt`
`94`	`94`	`symlinks[hdr.Name] = path.Join(path.Dir(hdr.Name), hdr.Linkname)`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ //nolint:staticcheck // TypeRegA is deprecated but we may still receive an external tar with TypeRegA`
`97`	`98`	`if hdr.Typeflag != tar.TypeReg && hdr.Typeflag != tar.TypeRegA {`
`98`	`99`	`if hdr.Typeflag != tar.TypeDir {`
`99`	`100`	`log.G(ctx).WithField("file", hdr.Name).Debug("file type ignored")`