Use k8s.io/apimachinery/pkg/util/sets for sets

Author: felix-kaestner

internal/controller/acl_controller_test.go

@@ -91,7 +91,7 @@ var _ = Describe("AccessControlList Controller", func() {
 
 			By("Ensuring the resource is deleted from the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.ACLs).NotTo(HaveKey(name), "Provider shouldn't have AccessControlList configured anymore")
+				g.Expect(testProvider.ACLs.Has(name)).To(BeFalse(), "Provider shouldn't have AccessControlList configured anymore")
 			}).Should(Succeed())
 		})
 
@@ -130,7 +130,7 @@ var _ = Describe("AccessControlList Controller", func() {
 
 			By("Ensuring the resource is created in the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.ACLs).To(HaveKey(name), "Provider should have AccessControlList configured")
+				g.Expect(testProvider.ACLs.Has(name)).To(BeTrue(), "Provider should have AccessControlList configured")
 			}).Should(Succeed())
 		})
 	})

internal/controller/certificate_controller_test.go

@@ -103,7 +103,7 @@ var _ = Describe("Certificate Controller", func() {
 
 			By("Ensuring the resource is deleted from the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.Certs).NotTo(HaveKey("cert1"), "Certificate should be deleted from the provider")
+				g.Expect(testProvider.Certs.Has("cert1")).To(BeFalse(), "Certificate should be deleted from the provider")
 			}).Should(Succeed())
 		})
 
@@ -142,7 +142,7 @@ var _ = Describe("Certificate Controller", func() {
 
 			By("Ensuring the resource is created in the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.Certs).To(HaveKey("cert1"), "Certificate should be present in the provider")
+				g.Expect(testProvider.Certs.Has("cert1")).To(BeTrue(), "Certificate should be present in the provider")
 			}).Should(Succeed())
 		})
 	})

internal/controller/interface_controller_test.go

@@ -75,8 +75,7 @@ var _ = Describe("Interface Controller", func() {
 
 			By("Ensuring the resource is deleted from the provider")
 			Eventually(func(g Gomega) {
-				_, ok := testProvider.Ports[name]
-				g.Expect(ok).To(BeFalse(), "Resource should not exist in the provider")
+				g.Expect(testProvider.Ports.Has(name)).To(BeFalse(), "Provider shouldn't have Interface configured anymore")
 			}).Should(Succeed())
 		})
 
@@ -119,11 +118,7 @@ var _ = Describe("Interface Controller", func() {
 
 			By("Ensuring the resource is created in the provider")
 			Eventually(func(g Gomega) {
-				item, ok := testProvider.Ports[name]
-				g.Expect(ok).To(BeTrue(), "Resource should exist in the provider")
-				resource, ok := item.(*v1alpha1.Interface)
-				g.Expect(ok).To(BeTrue(), "Resource should be of type Interface")
-				g.Expect(resource.Name).To(Equal(name))
+				g.Expect(testProvider.Ports.Has(name)).To(BeTrue(), "Provider should have Interface configured")
 			}).Should(Succeed())
 		})
 	})

internal/controller/isis_controller_test.go

@@ -77,7 +77,7 @@ var _ = Describe("ISIS Controller", func() {
 
 			By("Ensuring the resource is deleted from the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.ISIS).ToNot(HaveKey("UNDERLAY"), "Provider should not have ISIS instance configured")
+				g.Expect(testProvider.ISIS.Has("UNDERLAY")).To(BeFalse(), "Provider should not have ISIS instance configured")
 			}).Should(Succeed())
 		})
 
@@ -116,7 +116,7 @@ var _ = Describe("ISIS Controller", func() {
 
 			By("Ensuring the resource is created in the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.ISIS).To(HaveKey("UNDERLAY"), "Provider should have ISIS instance configured")
+				g.Expect(testProvider.ISIS.Has("UNDERLAY")).To(BeTrue(), "Provider should have ISIS instance configured")
 			}).Should(Succeed())
 		})
 	})

internal/controller/suite_test.go

@@ -17,6 +17,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -256,26 +257,26 @@ var (
 type Provider struct {
 	sync.Mutex
 
-	Ports  map[string]client.Object
-	User   map[string]struct{}
+	Ports  sets.Set[string]
+	User   sets.Set[string]
 	Banner *string
 	DNS    *v1alpha1.DNS
 	NTP    *v1alpha1.NTP
-	ACLs   map[string]struct{}
-	Certs  map[string]struct{}
+	ACLs   sets.Set[string]
+	Certs  sets.Set[string]
 	SNMP   *v1alpha1.SNMP
 	Syslog *v1alpha1.Syslog
 	Access *v1alpha1.ManagementAccess
-	ISIS   map[string]struct{}
+	ISIS   sets.Set[string]
 }
 
 func NewProvider() *Provider {
 	return &Provider{
-		Ports: make(map[string]client.Object),
-		User:  make(map[string]struct{}),
-		ACLs:  make(map[string]struct{}),
-		Certs: make(map[string]struct{}),
-		ISIS:  make(map[string]struct{}),
+		Ports: sets.New[string](),
+		User:  sets.New[string](),
+		ACLs:  sets.New[string](),
+		Certs: sets.New[string](),
+		ISIS:  sets.New[string](),
 	}
 }
 
@@ -306,14 +307,14 @@ func (p *Provider) GetDeviceInfo(context.Context) (*provider.DeviceInfo, error)
 func (p *Provider) EnsureInterface(ctx context.Context, req *provider.InterfaceRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	p.Ports[req.Interface.Name] = req.Interface
+	p.Ports.Insert(req.Interface.Spec.Name)
 	return nil
 }
 
 func (p *Provider) DeleteInterface(_ context.Context, req *provider.InterfaceRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.Ports, req.Interface.Name)
+	p.Ports.Delete(req.Interface.Spec.Name)
 	return nil
 }
 
@@ -340,14 +341,14 @@ func (p *Provider) DeleteBanner(context.Context) error {
 func (p *Provider) EnsureUser(_ context.Context, req *provider.EnsureUserRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	p.User[req.Username] = struct{}{}
+	p.User.Insert(req.Username)
 	return nil
 }
 
 func (p *Provider) DeleteUser(_ context.Context, req *provider.DeleteUserRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.User, req.Username)
+	p.User.Delete(req.Username)
 	return nil
 }
 
@@ -382,28 +383,28 @@ func (p *Provider) DeleteNTP(context.Context) error {
 func (p *Provider) EnsureACL(_ context.Context, req *provider.EnsureACLRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	p.ACLs[req.ACL.Spec.Name] = struct{}{}
+	p.ACLs.Insert(req.ACL.Spec.Name)
 	return nil
 }
 
 func (p *Provider) DeleteACL(_ context.Context, req *provider.DeleteACLRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.ACLs, req.Name)
+	p.ACLs.Delete(req.Name)
 	return nil
 }
 
 func (p *Provider) EnsureCertificate(_ context.Context, req *provider.EnsureCertificateRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	p.Certs[req.ID] = struct{}{}
+	p.Certs.Insert(req.ID)
 	return nil
 }
 
 func (p *Provider) DeleteCertificate(_ context.Context, req *provider.DeleteCertificateRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.Certs, req.ID)
+	p.Certs.Delete(req.ID)
 	return nil
 }
 
@@ -452,13 +453,13 @@ func (p *Provider) DeleteManagementAccess(context.Context) error {
 func (p *Provider) EnsureISIS(_ context.Context, req *provider.EnsureISISRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	p.ISIS[req.ISIS.Spec.Instance] = struct{}{}
+	p.ISIS.Insert(req.ISIS.Spec.Instance)
 	return nil
 }
 
 func (p *Provider) DeleteISIS(_ context.Context, req *provider.DeleteISISRequest) error {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.ISIS, req.ISIS.Spec.Instance)
+	p.ISIS.Delete(req.ISIS.Spec.Instance)
 	return nil
 }

internal/controller/user_controller_test.go

@@ -97,7 +97,7 @@ var _ = Describe("User Controller", func() {
 
 			By("Ensuring the resource is deleted from the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.User).ToNot(HaveKey(username), "User should not exist")
+				g.Expect(testProvider.User.Has(username)).To(BeFalse(), "User should not exist")
 			}).Should(Succeed())
 		})
 
@@ -136,7 +136,7 @@ var _ = Describe("User Controller", func() {
 
 			By("Ensuring the resource is created in the provider")
 			Eventually(func(g Gomega) {
-				g.Expect(testProvider.User).To(HaveKey(username), "User should exist")
+				g.Expect(testProvider.User.Has(username)).To(BeTrue(), "User should exist")
 			}).Should(Succeed())
 		})
 	})