From ac20a2cdb4f1ed66f96949bebb8cbc85a4c32377 Mon Sep 17 00:00:00 2001
From: Nicholas Flynt <nicholas.flynt@suse.com>
Date: Mon, 31 Jul 2023 09:58:54 -0400
Subject: [PATCH] Switch to using the scaledContext for everything

Since it can do all the lookups we need, it seems silly to setup
and use two different interfaces to the same underlying datastore.
The UnstructuredClient is the only way we can read AD configuration
right now, and we need that info, so let's stick to that method.
---
 pkg/agent/clean/active_directory.go | 34 +----------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/pkg/agent/clean/active_directory.go b/pkg/agent/clean/active_directory.go
index f370682fa65..0d09d45aac7 100644
--- a/pkg/agent/clean/active_directory.go
+++ b/pkg/agent/clean/active_directory.go
@@ -10,7 +10,6 @@ package clean
 
 import (
 	"bytes"
-	"context"
 	"crypto/x509"
 	"fmt"
 	ldapv3 "github.com/go-ldap/ldap/v3"
@@ -21,15 +20,10 @@ import (
 	"github.com/rancher/rancher/pkg/auth/providers/common"
 	"github.com/rancher/rancher/pkg/auth/providers/common/ldap"
 	v3client "github.com/rancher/rancher/pkg/client/generated/management/v3"
-	mgmt "github.com/rancher/rancher/pkg/generated/controllers/management.cattle.io"
 	"github.com/rancher/rancher/pkg/types/config"
-	"github.com/rancher/wrangler/pkg/generated/controllers/core"
-	"github.com/rancher/wrangler/pkg/generated/controllers/rbac"
 	"github.com/rancher/wrangler/pkg/ratelimit"
-	"github.com/rancher/wrangler/pkg/start"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -190,8 +184,6 @@ func findDistinguishedName(guid string, adConfig *v3.ActiveDirectoryConfig) (str
 
 // ListAdUsers is purely for debugging. If this is still here, fail the PR. :P
 func ListAdUsers(clientConfig *restclient.Config) error {
-	logrus.Infof("[%v] Hello World!", listAdUsersOperation)
-
 	if os.Getenv("DRY_RUN") == "true" {
 		logrus.Infof("[%v] DRY_RUN is true, no objects will be deleted/modified", listAdUsersOperation)
 		dryRun = true
@@ -210,27 +202,6 @@ func ListAdUsers(clientConfig *restclient.Config) error {
 	}
 	restConfig.RateLimiter = ratelimit.None
 
-	k8srbac, err := rbac.NewFactoryFromConfig(restConfig)
-	if err != nil {
-		return err
-	}
-
-	rancherManagement, err := mgmt.NewFactoryFromConfig(restConfig)
-	if err != nil {
-		return err
-	}
-
-	k8score, err := core.NewFactoryFromConfig(restConfig)
-	if err != nil {
-		return err
-	}
-
-	ctx := context.Background()
-	starters := []start.Starter{rancherManagement, k8srbac, k8score}
-	if err := start.All(ctx, 5, starters...); err != nil {
-		return err
-	}
-
 	sc, err := scaledContext(restConfig)
 	if err != nil {
 		return err
@@ -240,10 +211,7 @@ func ListAdUsers(clientConfig *restclient.Config) error {
 		return err
 	}
 
-	users, err := rancherManagement.Management().V3().User().List(v1.ListOptions{})
-	if err != nil {
-		return err
-	}
+	users, err := sc.Management.Users("").List(metav1.ListOptions{})
 
 	for _, user := range users.Items {
 		logrus.Infof("[%v] Found user with name: %v", listAdUsersOperation, user.Name)