use set from utils package in v18

Author: nklaassen

lib/service/connect.go

@@ -64,7 +64,6 @@ import (
 	"github.com/gravitational/teleport/lib/utils"
 	"github.com/gravitational/teleport/lib/utils/interval"
 	logutils "github.com/gravitational/teleport/lib/utils/log"
-	"github.com/gravitational/teleport/lib/utils/set"
 )
 
 const updateClientsJoinWarning = "This agent joined the cluster during the update_clients phase of a host CA rotation, so its services might not be usable by clients that haven't logged in recently."
@@ -324,8 +323,8 @@ func (process *TeleportProcess) connect(role types.SystemRole, opts ...certOptio
 }
 
 func (process *TeleportProcess) healInstanceIdentity(currentIdentity *state.Identity) (*state.Identity, error) {
-	currentSystemRoles := set.New(currentIdentity.SystemRoles...)
-	wantSystemRoles := set.NewWithCapacity[string](len(process.instanceRoles))
+	currentSystemRoles := utils.NewSet(currentIdentity.SystemRoles...)
+	wantSystemRoles := utils.NewSetWithCapacity[string](len(process.instanceRoles))
 	for role := range process.instanceRoles {
 		wantSystemRoles.Add(string(role))
 	}
@@ -385,7 +384,7 @@ func (process *TeleportProcess) healInstanceIdentity(currentIdentity *state.Iden
 		}
 	}
 
-	newSystemRoles := set.New(newIdentity.SystemRoles...)
+	newSystemRoles := utils.NewSet(newIdentity.SystemRoles...)
 
 	// Sanity check we didn't lose any system roles.
 	if lostRoles := currentSystemRoles.Clone().Subtract(newSystemRoles); len(lostRoles) > 0 {