Skip to content

Commit

Permalink
changes for failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ashpect committed May 22, 2024
1 parent 698e08d commit 8909900
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 13 deletions.
10 changes: 1 addition & 9 deletions pkg/imgpkg/cmd/copy_repo_src.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"os"

ctlbundle "carvel.dev/imgpkg/pkg/imgpkg/bundle"
"carvel.dev/imgpkg/pkg/imgpkg/image"
"carvel.dev/imgpkg/pkg/imgpkg/imageset"
ctlimgset "carvel.dev/imgpkg/pkg/imgpkg/imageset"
"carvel.dev/imgpkg/pkg/imgpkg/imagetar"
Expand All @@ -17,15 +18,6 @@ import (
"carvel.dev/imgpkg/pkg/imgpkg/plainimage"
"carvel.dev/imgpkg/pkg/imgpkg/registry"
regname "github.com/google/go-containerregistry/pkg/name"
ctlbundle "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset"
ctlimgset "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry"
)

type SignatureRetriever interface {
Expand Down
1 change: 1 addition & 0 deletions pkg/imgpkg/imagedesc/image_intermediate.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/google/go-containerregistry/pkg/v1/types"
)

// intermediate struct for Image and ImageIndex to convert to imagwithref type for oci image

Check failure on line 11 in pkg/imgpkg/imagedesc/image_intermediate.go

View workflow job for this annotation

GitHub Actions / lint

exported: comment on exported type ImageIndexIntermediate should be of the form "ImageIndexIntermediate ..." (with optional leading article) (revive)
type ImageIndexIntermediate struct {
Index regv1.ImageIndex
ref string
Expand Down
1 change: 1 addition & 0 deletions pkg/imgpkg/imagedesc/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type ImageOrIndex struct {

OrigRef string
}

type ImageWithRef interface {
regv1.Image
Ref() string
Expand Down
2 changes: 0 additions & 2 deletions pkg/imgpkg/imagetar/tar_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import (
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/layout"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc"
"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify"
)

type TarReader struct {
Expand Down
2 changes: 0 additions & 2 deletions pkg/imgpkg/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,6 @@ func (r *SimpleRegistry) MultiWrite(imageOrIndexesToUpload map[regname.Reference
if updatesCh != nil {
rOpts = append(rOpts, regremote.WithProgress(updatesCh))
}

//THIS HERE FINAL PUSHES
return regremote.MultiWrite(overriddenImageOrIndexesToUploadRef, rOpts...)
}

Expand Down

0 comments on commit 8909900

Please sign in to comment.