From 0b5fa1934250307c4df7c6bcabf6a6b1b00e73d9 Mon Sep 17 00:00:00 2001
From: Justin SB <justinsb@google.com>
Date: Wed, 1 Mar 2023 09:05:59 -0500
Subject: [PATCH] cleanup: replace deprecated sets.String

Replace with generics, including using the more-accurate type
types.UID for visitedUids.
---
 staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go | 10 +++++-----
 staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go |  7 ++++---
 staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go  | 13 +++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
index 55be711b319..c0969dbbc65 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
@@ -121,8 +121,8 @@ type ApplyOptions struct {
 
 	// Stores visited objects/namespaces for later use
 	// calculating the set of objects to prune.
-	VisitedUids       sets.String
-	VisitedNamespaces sets.String
+	VisitedUids       sets.Set[types.UID]
+	VisitedNamespaces sets.Set[string]
 
 	// Function run after the objects are generated and
 	// stored in the "objects" field, but before the
@@ -352,8 +352,8 @@ func (flags *ApplyFlags) ToOptions(f cmdutil.Factory, cmd *cobra.Command, baseNa
 		objects:       []*resource.Info{},
 		objectsCached: false,
 
-		VisitedUids:       sets.NewString(),
-		VisitedNamespaces: sets.NewString(),
+		VisitedUids:       sets.New[types.UID](),
+		VisitedNamespaces: sets.New[string](),
 
 		ApplySet: applySet,
 	}
@@ -981,7 +981,7 @@ func (o *ApplyOptions) MarkObjectVisited(info *resource.Info) error {
 	if err != nil {
 		return err
 	}
-	o.VisitedUids.Insert(string(metadata.GetUID()))
+	o.VisitedUids.Insert(metadata.GetUID())
 	return nil
 }
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
index 8c07d32b82e..e34ddd52b3c 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
@@ -24,6 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/client-go/dynamic"
@@ -35,8 +36,8 @@ type pruner struct {
 	mapper        meta.RESTMapper
 	dynamicClient dynamic.Interface
 
-	visitedUids       sets.String
-	visitedNamespaces sets.String
+	visitedUids       sets.Set[types.UID]
+	visitedNamespaces sets.Set[string]
 	labelSelector     string
 	fieldSelector     string
 
@@ -119,7 +120,7 @@ func (p *pruner) prune(namespace string, mapping *meta.RESTMapping) error {
 			continue
 		}
 		uid := metadata.GetUID()
-		if p.visitedUids.Has(string(uid)) {
+		if p.visitedUids.Has(uid) {
 			continue
 		}
 		name := metadata.GetName()
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go
index ef77fac894a..e3ec06a70ce 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/dynamic"
@@ -34,16 +35,16 @@ type pruner struct {
 	mapper        meta.RESTMapper
 	dynamicClient dynamic.Interface
 
-	visitedUids       sets.String
-	visitedNamespaces sets.String
+	visitedUids       sets.Set[types.UID]
+	visitedNamespaces sets.Set[string]
 	labelSelector     string
 	resources         []prune.Resource
 }
 
 func newPruner(dc dynamic.Interface, m meta.RESTMapper, r []prune.Resource, selector string) *pruner {
 	return &pruner{
-		visitedUids:       sets.NewString(),
-		visitedNamespaces: sets.NewString(),
+		visitedUids:       sets.New[types.UID](),
+		visitedNamespaces: sets.New[string](),
 		dynamicClient:     dc,
 		mapper:            m,
 		resources:         r,
@@ -104,7 +105,7 @@ func (p *pruner) prune(namespace string, mapping *meta.RESTMapping) ([]runtime.O
 			continue
 		}
 		uid := metadata.GetUID()
-		if p.visitedUids.Has(string(uid)) {
+		if p.visitedUids.Has(uid) {
 			continue
 		}
 
@@ -123,5 +124,5 @@ func (p *pruner) MarkVisited(info *resource.Info) {
 	if err != nil {
 		return
 	}
-	p.visitedUids.Insert(string(metadata.GetUID()))
+	p.visitedUids.Insert(metadata.GetUID())
 }