Skip to content

Commit

Permalink
Use stdlib maps instead of knative (#422)
Browse files Browse the repository at this point in the history
Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>
  • Loading branch information
jonjohnsonjr authored Dec 10, 2024
1 parent 521bf98 commit 3a7c5f6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ require (
golang.org/x/sync v0.9.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/apimachinery v0.31.3
knative.dev/pkg v0.0.0-20240912132815-3002873b449c
)

require (
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,5 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA=
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/pkg v0.0.0-20240912132815-3002873b449c h1:zKQ6HpKn6m20GgQ/NThGDFPwP9VSxv1j20aZDlRl3J8=
knative.dev/pkg v0.0.0-20240912132815-3002873b449c/go.mod h1:RHUKdAip7yEmlA6dc66hGANdLId04PMd2XJpFhP0EvI=
sigs.k8s.io/release-utils v0.8.5 h1:FUtFqEAN621gSXv0L7kHyWruBeS7TUU9aWf76olX7uQ=
sigs.k8s.io/release-utils v0.8.5/go.mod h1:qsm5bdxdgoHkD8HsXpgme2/c3mdsNaiV53Sz2HmKeJA=
4 changes: 2 additions & 2 deletions internal/provider/config_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"maps"
"os"
"path/filepath"
"reflect"
Expand All @@ -25,7 +26,6 @@ import (
"golang.org/x/sync/errgroup"
"gopkg.in/yaml.v2"
"k8s.io/apimachinery/pkg/util/sets"
"knative.dev/pkg/kmap"
)

// Ensure provider defined types fully satisfy framework interfaces.
Expand Down Expand Up @@ -394,7 +394,7 @@ func unify(originals []string, inputs []resolved) (map[string][]string, diag.Dia
// architectures.
acc := resolved{
packages: inputs[0].packages.Clone(),
versions: kmap.Copy(inputs[0].versions),
versions: maps.Clone(inputs[0].versions),
provided: inputs[0].provided,
}
for _, next := range inputs[1:] {
Expand Down

0 comments on commit 3a7c5f6

Please sign in to comment.