Merge pull request #768 from CodesbyUnnati/golang-bump-1.25

Bump Golang 1.25.6 + golangci-lint to 2.4

Author: devanshuVmware

.github/workflows/golangci-lint.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           go-version-file: go.mod
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64
+          version: v2.4
           args: -v

.golangci.yml

@@ -1,21 +1,19 @@
+version: "2"
 linters:
+  default: none
   enable:
     - goheader
     - revive
     - unused
     - staticcheck
-    - typecheck
     - govet
-  disable-all: true
-# all available settings of specific linters
-linters-settings:
-  goheader:
-    values:
-      regexp:
-        copyright-year: 20[0-9][0-9]
-    template-path: code-header-template.txt
+  settings:
+    goheader:
+      values:
+        regexp:
+          copyright-year: 20[0-9][0-9]
+      template-path: code-header-template.txt
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-use-default: false
-  new-from-rev: 01ef727b5a403cf1df143adbf699aa0de2c765d9
+  new-from-rev: 04e4b4c2c70952cd00b89ec3ed781f4cd01c9803

go.mod

@@ -1,6 +1,6 @@
 module carvel.dev/imgpkg
 
-go 1.24.9
+go 1.25.6
 
 require (
 	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.9.1

pkg/imgpkg/v1/copy_test.go

@@ -325,7 +325,18 @@ func TestToTarImage(t *testing.T) {
 
 		_, err := v1.CopyToTar(origin, imageTarPath, opts, reg)
 		require.ErrorContains(t, err, "error verifying sha256 checksum")
-		reader := imagetar.NewTarReader(imageTarPath, 1)
+		// Creating a temp copy of the tarball to verify it without locking the original file.
+		// This ensures 'imageTarPath' is free for the Resume operation to move/rename it.
+		verifyPath := imageTarPath + ".verify"
+		bs, err := os.ReadFile(imageTarPath)
+		require.NoError(t, err)
+		err = os.WriteFile(verifyPath, bs, 0600)
+		require.NoError(t, err)
+		// Cleanup the copy when done
+		defer os.Remove(verifyPath)
+
+		// Point the reader to the COPY (verifyPath), not the original
+		reader := imagetar.NewTarReader(verifyPath, 1)
 		layersInTar, err = reader.PresentLayers()
 		require.NoError(t, err)
 		require.Greater(t, len(layersInTar), 1)