Merge pull request #505 from carvel-dev/fix-resume-on-0-33

Fix resume on 0.33.x

.github/workflows/gh-test-external-registry.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v1
       with:
-        go-version: "1.19.5"
+        go-version: "1.19.6"
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:
@@ -63,7 +63,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v1
         with:
-          go-version: "1.19.5"
+          go-version: "1.19.6"
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:

.github/workflows/gh-test.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v1
       with:
-        go-version: "1.19.5"
+        go-version: "1.19.6"
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v1
       with:
-        go-version: "1.19.5"
+        go-version: "1.19.6"
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:

.github/workflows/golangci-lint.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
         with:
-          go-version: "1.19.5"
-      - uses: actions/checkout@v2
+          go-version: "1.19.6"
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45.2
+          version: v1.50.1
           args: -v

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.5
+          go-version: 1.19.6
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@5e15885530fb01d81d1f24e8a6f54ebbd0fed7eb
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/trivy-scan.yml

@@ -10,7 +10,7 @@ jobs:
     with:
       repo: carvel-dev/imgpkg
       tool: imgpkg
-      goVersion: 1.19.5
+      goVersion: 1.19.6
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}

.golangci.yml

@@ -2,11 +2,9 @@ linters:
   enable:
     - goheader
     - revive
-    - deadcode
     - unused
     - staticcheck
     - typecheck
-    - structcheck
     - govet
   disable-all: true
 # all available settings of specific linters

.wokeignore

@@ -0,0 +1,2 @@
+# out of our control
+vendor/

pkg/imgpkg/imagedesc/described_compressed_layer.go

@@ -1,6 +1,7 @@
 // Copyright 2020 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package imagedesc defines the description of image, indexes and layers used by go-containerregistry
 package imagedesc
 
 import (

pkg/imgpkg/imagedigest/imagedigest.go

@@ -1,6 +1,7 @@
 // Copyright 2020 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package imagedigest utility packages to abstract the retrieval of Digests
 package imagedigest
 
 import (

pkg/imgpkg/imagetar/tar_reader.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"io/ioutil"
 
+	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc"
 	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify"
@@ -49,7 +50,7 @@ func (r TarReader) PresentLayers() ([]v1.Layer, error) {
 			result = append(result, layers...)
 		} else if image.Index != nil {
 			idx := *image.Index
-			layers, err := r.presentLayersForIndex(idx)
+			layers, err := r.presentLayersForIndex(image.Ref(), idx)
 			if err != nil {
 				return nil, fmt.Errorf("Processing Index %s: %s", image.OrigRef, err)
 			}
@@ -96,11 +97,11 @@ func (r TarReader) presentLayersForImage(img v1.Image) ([]v1.Layer, error) {
 	return result, nil
 }
 
-func (r TarReader) presentLayersForIndex(idx v1.ImageIndex) ([]v1.Layer, error) {
+func (r TarReader) presentLayersForIndex(indexRef string, idx v1.ImageIndex) ([]v1.Layer, error) {
 	var result []v1.Layer
-	dIdx, correct := idx.(*imagedesc.DescribedImageIndex)
+	dIdx, correct := idx.(imagedesc.DescribedImageIndex)
 	if !correct {
-		panic("Internal inconsistency: unexpected index type")
+		panic(fmt.Sprintf("Internal inconsistency: unexpected index type with ref: %s", indexRef))
 	}
 	for _, image := range dIdx.Images() {
 		layersPresent, err := r.presentLayersForImage(image)
@@ -109,8 +110,19 @@ func (r TarReader) presentLayersForIndex(idx v1.ImageIndex) ([]v1.Layer, error)
 		}
 		result = append(result, layersPresent...)
 	}
+
+	idxRef, err := name.ParseReference(indexRef)
+	if err != nil {
+		return nil, err
+	}
+
 	for _, idx := range dIdx.Indexes() {
-		layersPresent, err := r.presentLayersForIndex(idx)
+		digest, err := idx.Digest()
+		if err != nil {
+			return nil, err
+		}
+		idxDigest := idxRef.Context().Digest(digest.String())
+		layersPresent, err := r.presentLayersForIndex(idxDigest.String(), idx)
 		if err != nil {
 			return nil, err
 		}

pkg/imgpkg/internal/util/level_logger.go

@@ -1,6 +1,7 @@
 // Copyright 2020 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package util contains internal utility tools used in imgpkg
 package util
 
 // LogLevel specifies logging level (i.e. DEBUG, WARN)

pkg/imgpkg/registry/auth/credentialprovider/keyring.go

@@ -1,6 +1,7 @@
 // Copyright 2022 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package credentialprovider contains helper functions used in auth package
 package credentialprovider
 
 import (

pkg/imgpkg/registry/auth/custom_keychain.go

@@ -1,6 +1,7 @@
 // Copyright 2020 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package auth provides different keychains used in imgpkg
 package auth
 
 import (

pkg/imgpkg/v1/describe.go

@@ -1,6 +1,7 @@
 // Copyright 2022 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package v1 contains the public API version 1 used by other tools to interact with imgpkg
 package v1
 
 import (