From 3a7c5f6cfbc0e6e8e52fdc208ab734ee017dbe81 Mon Sep 17 00:00:00 2001 From: Jon Johnson Date: Tue, 10 Dec 2024 14:46:15 -0800 Subject: [PATCH] Use stdlib maps instead of knative (#422) Signed-off-by: Jon Johnson --- go.mod | 1 - go.sum | 2 -- internal/provider/config_data_source.go | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a1ff9fc..aa9c189 100644 --- a/go.mod +++ b/go.mod @@ -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 ( diff --git a/go.sum b/go.sum index a05b9c4..ad27958 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/provider/config_data_source.go b/internal/provider/config_data_source.go index ad9e386..a2f3066 100644 --- a/internal/provider/config_data_source.go +++ b/internal/provider/config_data_source.go @@ -6,6 +6,7 @@ import ( "encoding/hex" "encoding/json" "fmt" + "maps" "os" "path/filepath" "reflect" @@ -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. @@ -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:] {