update golangci-lint to v1.49.0

thaJeztah · thaJeztah · commit f198f7724d6d · 2023-03-08T00:20:57.000+01:00
Also remove "nolint" comments for deadcode, which is deprecated, and removed from the defaults. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 8b5df7d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/oci/utils_unix.go b/oci/utils_unix.go
@@ -127,7 +127,7 @@ func getDevices(path, containerPath string) ([]specs.LinuxDevice, error) {
 
 // TODO consider adding these consts to the OCI runtime-spec.
 const (
-	wildcardDevice = "a" //nolint:deadcode,nolintlint,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec.
+	wildcardDevice = "a" //nolint:nolintlint,unused,varcheck // currently unused, but should be included when upstreaming to OCI runtime-spec.
 	blockDevice    = "b"
 	charDevice     = "c" // or "u"
 	fifoDevice     = "p"
diff --git a/pkg/progress/escape.go b/pkg/progress/escape.go
@@ -19,6 +19,6 @@ package progress
 const (
 	escape = "\x1b"
 	reset  = escape + "[0m"
-	red    = escape + "[31m" //nolint:deadcode,nolintlint,unused,varcheck
+	red    = escape + "[31m" //nolint:nolintlint,unused,varcheck
 	green  = escape + "[32m"
 )

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ package progress`
`19`	`19`	`const (`
`20`	`20`	`escape = "\x1b"`
`21`	`21`	`reset = escape + "[0m"`
`22`		`- red = escape + "[31m" //nolint:deadcode,nolintlint,unused,varcheck`
	`22`	`+ red = escape + "[31m" //nolint:nolintlint,unused,varcheck`
`23`	`23`	`green = escape + "[32m"`
`24`	`24`	`)`