fix(deps): update module github.com/defenseunicorns/pkg/oci to v1 (#2511

)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/defenseunicorns/pkg/oci](https://togithub.com/defenseunicorns/pkg)
| `v0.0.1` -> `v1.0.1` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fdefenseunicorns%2fpkg%2foci/v1.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fdefenseunicorns%2fpkg%2foci/v1.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fdefenseunicorns%2fpkg%2foci/v0.0.1/v1.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fdefenseunicorns%2fpkg%2foci/v0.0.1/v1.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/defenseunicorns/zarf).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjMuNSIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lucas Rodriguez <[email protected]>

go.mod

@@ -12,8 +12,8 @@ require (
  github.com/anchore/clio v0.0.0-20240408173007-3c4abf89e72f
  github.com/anchore/stereoscope v0.0.1
  github.com/anchore/syft v0.100.0
- github.com/defenseunicorns/pkg/helpers v1.1.1
- github.com/defenseunicorns/pkg/oci v0.0.1
+ github.com/defenseunicorns/pkg/helpers/v2 v2.0.1
+ github.com/defenseunicorns/pkg/oci v1.0.1
  github.com/derailed/k9s v0.31.7
  github.com/distribution/reference v0.5.0
  github.com/fairwindsops/pluto/v5 v5.18.4
@@ -61,8 +61,6 @@ require (
  sigs.k8s.io/yaml v1.4.0
 )
 
-require cuelang.org/go v0.7.0 // indirect
-
 require (
  atomicgo.dev/cursor v0.2.0 // indirect
  atomicgo.dev/keyboard v0.2.9 // indirect
@@ -76,6 +74,7 @@ require (
  cloud.google.com/go/longrunning v0.5.7 // indirect
  cloud.google.com/go/storage v1.41.0 // indirect
  cuelabs.dev/go/oci/ociregistry v0.0.0-20231103182354-93e78c079a13 // indirect
+ cuelang.org/go v0.7.0 // indirect
  dario.cat/mergo v1.0.0 // indirect
  filippo.io/edwards25519 v1.1.0 // indirect
  github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect

go.sum

@@ -597,10 +597,10 @@ github.com/daviddengcn/go-colortext v1.0.0 h1:ANqDyC0ys6qCSvuEK7l3g5RaehL/Xck9EX
 github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c=
 github.com/defenseunicorns/gojsonschema v0.0.0-20231116163348-e00f069122d6 h1:gwevOZ0fxT2nzM9hrtdPbsiOHjFqDRIYMzJHba3/G6Q=
 github.com/defenseunicorns/gojsonschema v0.0.0-20231116163348-e00f069122d6/go.mod h1:StKLYMmPj1R5yIs6CK49EkcW1TvUYuw5Vri+LRk7Dy8=
-github.com/defenseunicorns/pkg/helpers v1.1.1 h1:p3pKeK5SeFaoZUJZIX9sEsJqX1CGGMS8OpQMPgJtSqM=
-github.com/defenseunicorns/pkg/helpers v1.1.1/go.mod h1:F4S5VZLDrlNWQKklzv4v9tFWjjZNhxJ1gT79j4XiLwk=
-github.com/defenseunicorns/pkg/oci v0.0.1 h1:EFRp3NeiwzhOWKpQ6mAxi0l9chnrAvDcIgjMr0o0fkM=
-github.com/defenseunicorns/pkg/oci v0.0.1/go.mod h1:zVBgRjckEAhfdvbnQrnfOP/3M/GYJkIgWtJtY7pjYdo=
+github.com/defenseunicorns/pkg/helpers/v2 v2.0.1 h1:j08rz9vhyD9Bs+yKiyQMY2tSSejXRMxTqEObZ5M1Wbk=
+github.com/defenseunicorns/pkg/helpers/v2 v2.0.1/go.mod h1:u1PAqOICZyiGIVA2v28g55bQH1GiAt0Bc4U9/rnWQvQ=
+github.com/defenseunicorns/pkg/oci v1.0.1 h1:WPrWRrae1L19X1vuhy6yYMR2zrTzgBbJHp3ImgUm4ZM=
+github.com/defenseunicorns/pkg/oci v1.0.1/go.mod h1:qZ3up/d0P81taW37fKR4lb19jJhQZJVtNOEJMu00dHQ=
 github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da h1:ZOjWpVsFZ06eIhnh4mkaceTiVoktdU67+M7KDHJ268M=
 github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da/go.mod h1:B3tI9iGHi4imdLi4Asdha1Sc6feLMTfPLXh9IUYmysk=
 github.com/depcheck-test/depcheck-test v0.0.0-20220607135614-199033aaa936 h1:foGzavPWwtoyBvjWyKJYDYsyzy+23iBV7NKTwdk+LRY=

src/cmd/destroy.go

@@ -9,7 +9,7 @@ import (
  "os"
  "regexp"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/cmd/common"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/config/lang"

src/cmd/dev.go

@@ -12,7 +12,7 @@ import (
  "strings"
 
  "github.com/AlecAivazis/survey/v2"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/cmd/common"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/config/lang"

src/cmd/initialize.go

@@ -13,7 +13,7 @@ import (
  "strings"
 
  "github.com/AlecAivazis/survey/v2"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/pkg/oci"
  "github.com/defenseunicorns/zarf/src/cmd/common"
  "github.com/defenseunicorns/zarf/src/config"

src/cmd/internal.go

@@ -11,7 +11,7 @@ import (
  "path/filepath"
  "strings"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/cmd/common"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/internal/agent"

src/cmd/package.go

@@ -19,7 +19,7 @@ import (
  "oras.land/oras-go/v2/registry"
 
  "github.com/AlecAivazis/survey/v2"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"
  "github.com/defenseunicorns/zarf/src/pkg/packager"

src/cmd/tools/helm/repo_add.go

@@ -30,7 +30,7 @@ import (
  "strings"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/gofrs/flock"

src/cmd/tools/helm/repo_index.go

@@ -26,7 +26,7 @@ import (
  "os"
  "path/filepath"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/pkg/errors"
  "github.com/spf13/cobra"

src/cmd/tools/helm/repo_remove.go

@@ -27,7 +27,7 @@ import (
  "os"
  "path/filepath"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/pkg/errors"
  "github.com/spf13/cobra"
 

src/cmd/tools/zarf.go

@@ -13,7 +13,7 @@ import (
  "github.com/sigstore/cosign/v2/pkg/cosign"
  "github.com/spf13/cobra"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/pkg/oci"
 
  "github.com/defenseunicorns/zarf/src/cmd/common"

src/extensions/bigbang/bigbang.go

@@ -13,7 +13,7 @@ import (
  "time"
 
  "github.com/Masterminds/semver/v3"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/internal/packager/helm"
  "github.com/defenseunicorns/zarf/src/pkg/layout"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/extensions/bigbang/flux.go

@@ -10,7 +10,7 @@ import (
  "path"
  "path/filepath"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/internal/packager/kustomize"
  "github.com/defenseunicorns/zarf/src/pkg/utils"
  "github.com/defenseunicorns/zarf/src/types"

src/internal/agent/hooks/argocd-application.go

@@ -9,7 +9,7 @@ import (
  "encoding/json"
  "fmt"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/internal/agent/operations"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"

src/internal/agent/hooks/argocd-repository.go

@@ -10,7 +10,7 @@ import (
  "encoding/json"
  "fmt"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/internal/agent/operations"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"

src/internal/agent/hooks/flux.go

@@ -9,7 +9,7 @@ import (
  "encoding/json"
  "fmt"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/internal/agent/operations"

src/internal/packager/helm/chart.go

@@ -22,7 +22,7 @@ import (
  "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
  "sigs.k8s.io/yaml"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
 
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/internal/packager/helm/images.go

@@ -4,7 +4,7 @@
 package helm
 
 import (
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/goccy/go-yaml"
  "helm.sh/helm/v3/pkg/chart/loader"

src/internal/packager/helm/post-render.go

@@ -13,7 +13,7 @@ import (
  "reflect"
  "slices"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/internal/packager/helm/repo.go

@@ -10,7 +10,7 @@ import (
  "path/filepath"
  "strings"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/internal/packager/git"

src/internal/packager/helm/utils.go

@@ -7,7 +7,7 @@ package helm
 import (
  "fmt"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "helm.sh/helm/v3/pkg/action"
  "helm.sh/helm/v3/pkg/chart"

src/internal/packager/images/common.go

@@ -8,7 +8,7 @@ import (
  "net/http"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/defenseunicorns/zarf/src/pkg/transform"

src/internal/packager/images/pull.go

@@ -18,7 +18,7 @@ import (
  "sync/atomic"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/layout"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/internal/packager/images/push.go

@@ -9,7 +9,7 @@ import (
  "fmt"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/cluster"
  "github.com/defenseunicorns/zarf/src/pkg/k8s"
  "github.com/defenseunicorns/zarf/src/pkg/message"
@@ -53,7 +53,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
  )
 
  progress := message.NewProgressBar(totalSize, fmt.Sprintf("Pushing %d images", len(toPush)))
- defer progress.Stop()
+ defer progress.Close()
 
  if err := helpers.Retry(func() error {
  c, _ := cluster.NewCluster()
@@ -86,7 +86,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
  }()
  for refInfo, img := range toPush {
  refTruncated := helpers.Truncate(refInfo.Reference, 55, true)
- progress.UpdateTitle(fmt.Sprintf("Pushing %s", refTruncated))
+ progress.Updatef(fmt.Sprintf("Pushing %s", refTruncated))
 
  size, err := calcImgSize(img)
  if err != nil {

src/internal/packager/kustomize/build.go

@@ -8,7 +8,7 @@ import (
  "fmt"
  "os"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "sigs.k8s.io/kustomize/api/krusty"
  krustytypes "sigs.k8s.io/kustomize/api/types"
  "sigs.k8s.io/kustomize/kyaml/filesys"

src/internal/packager/sbom/catalog.go

@@ -23,7 +23,7 @@ import (
  "github.com/anchore/syft/syft/pkg/cataloger"
  "github.com/anchore/syft/syft/sbom"
  "github.com/anchore/syft/syft/source"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/layout"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/internal/packager/template/template.go

@@ -12,7 +12,7 @@ import (
 
  "github.com/defenseunicorns/zarf/src/types"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/interactive"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/pkg/cluster/data.go

@@ -13,7 +13,7 @@ import (
  "strings"
  "sync"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/k8s"
  "github.com/defenseunicorns/zarf/src/pkg/layout"

src/pkg/cluster/injector.go

@@ -13,7 +13,7 @@ import (
  "regexp"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/k8s"
  "github.com/defenseunicorns/zarf/src/pkg/layout"

src/pkg/cluster/state.go

@@ -16,7 +16,7 @@ import (
  kerrors "k8s.io/apimachinery/pkg/api/errors"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/config/lang"
  "github.com/defenseunicorns/zarf/src/pkg/k8s"

src/pkg/cluster/state_test.go

@@ -15,7 +15,7 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/client-go/kubernetes/fake"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
 
  "github.com/defenseunicorns/zarf/src/pkg/k8s"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/pkg/cluster/tunnel.go

@@ -14,7 +14,7 @@ import (
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/defenseunicorns/zarf/src/pkg/k8s"
  "github.com/defenseunicorns/zarf/src/pkg/message"

src/pkg/k8s/tunnel.go

@@ -18,7 +18,7 @@ import (
  "k8s.io/client-go/tools/portforward"
  "k8s.io/client-go/transport/spdy"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
 )
 
 // Global lock to synchronize port selections.

src/pkg/layout/component.go

@@ -10,7 +10,7 @@ import (
  "os"
  "path/filepath"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/defenseunicorns/zarf/src/types"
  "github.com/mholt/archiver/v3"

src/pkg/layout/package.go

@@ -12,7 +12,7 @@ import (
  "strings"
 
  "github.com/Masterminds/semver/v3"
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/pkg/interactive"
  "github.com/defenseunicorns/zarf/src/pkg/message"
  "github.com/defenseunicorns/zarf/src/pkg/packager/deprecated"

src/pkg/layout/sbom.go

@@ -10,7 +10,7 @@ import (
  "os"
  "path/filepath"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/mholt/archiver/v3"
 )
 

src/pkg/message/message.go

@@ -14,7 +14,7 @@ import (
  "strings"
  "time"
 
- "github.com/defenseunicorns/pkg/helpers"
+ "github.com/defenseunicorns/pkg/helpers/v2"
  "github.com/defenseunicorns/zarf/src/config"
  "github.com/fatih/color"
  "github.com/pterm/pterm"