Fixing names to make ci happy

cmd/agent/main.go

@@ -24,17 +24,18 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/hashicorp/go-multierror"
 	"github.com/mattn/go-colorable"
+	"github.com/rancher/remotedialer"
+	"github.com/rancher/wrangler/pkg/signals"
+	"github.com/sirupsen/logrus"
+
 	"github.com/rancher/rancher/pkg/agent/clean"
-	"github.com/rancher/rancher/pkg/agent/clean/ad_unmigration"
+	"github.com/rancher/rancher/pkg/agent/clean/adunmigration"
 	"github.com/rancher/rancher/pkg/agent/cluster"
 	"github.com/rancher/rancher/pkg/agent/node"
 	"github.com/rancher/rancher/pkg/agent/rancher"
 	"github.com/rancher/rancher/pkg/features"
 	"github.com/rancher/rancher/pkg/logserver"
 	"github.com/rancher/rancher/pkg/rkenodeconfigclient"
-	"github.com/rancher/remotedialer"
-	"github.com/rancher/wrangler/pkg/signals"
-	"github.com/sirupsen/logrus"
 )
 
 var (
@@ -84,7 +85,7 @@ func main() {
 		} else if os.Getenv("AD_GUID_CLEANUP") == "true" {
 			dryrun := os.Getenv("DRY_RUN") == "true"
 			deleteMissingUsers := os.Getenv("AD_DELETE_MISSING_GUID_USERS") == "true"
-			err = ad_unmigration.UnmigrateAdGUIDUsers(nil, dryrun, deleteMissingUsers)
+			err = adunmigration.UnmigrateAdGUIDUsers(nil, dryrun, deleteMissingUsers)
 		} else {
 			err = run(ctx)
 		}

pkg/agent/clean/ad_unmigration/ldap.go → pkg/agent/clean/adunmigration/ldap.go

@@ -1,4 +1,4 @@
-package ad_unmigration
+package adunmigration
 
 import (
 	"bytes"
@@ -295,7 +295,6 @@ func migrateAllowedUserPrincipals(workunits *[]migrateUserWorkUnit, sc *config.S
 	}
 
 	// Create an empty unstructured object to hold the decoded JSON
-	storedADConfig := &unstructured.Unstructured{}
 	storedADConfig, ok := authConfigObj.(*unstructured.Unstructured)
 	if !ok {
 		return fmt.Errorf("[%v] expected unstructured authconfig, got %T", migrateAdUserOperation, authConfigObj)
@@ -313,17 +312,17 @@ func migrateAllowedUserPrincipals(workunits *[]migrateUserWorkUnit, sc *config.S
 	}
 
 	for i, item := range listOfMaybeStrings {
-		principalId, ok := item.(string)
+		principalID, ok := item.(string)
 		if !ok {
 			return fmt.Errorf("[%v] expected string for allowed principal id, found instead %T", migrateAdUserOperation, item)
 		}
-		if j, exists := adWorkUnitsByPrincipal[principalId]; exists {
-			newPrincipalId := activeDirectoryPrefix + (*workunits)[j].distinguishedName
+		if j, exists := adWorkUnitsByPrincipal[principalID]; exists {
+			newPrincipalID := activeDirectoryPrefix + (*workunits)[j].distinguishedName
 			if dryRun {
 				logrus.Infof("[%v] DRY RUN: would migrate allowed user %v to %v", migrateAdUserOperation,
-					principalId, newPrincipalId)
+					principalID, newPrincipalID)
 			} else {
-				listOfMaybeStrings[i] = newPrincipalId
+				listOfMaybeStrings[i] = newPrincipalID
 			}
 		}
 	}

pkg/agent/clean/ad_unmigration/migrate.go → pkg/agent/clean/adunmigration/migrate.go

@@ -3,7 +3,7 @@ Look for any active directory users with a GUID type principal.
 Convert these users to a distinguished name instead.
 */
 
-package ad_unmigration
+package adunmigration
 
 import (
 	"context"

pkg/agent/clean/ad_unmigration/rtbs.go → pkg/agent/clean/adunmigration/rtbs.go

@@ -1,12 +1,13 @@
-package ad_unmigration
+package adunmigration
 
 import (
 	"fmt"
 
-	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
-	"github.com/rancher/rancher/pkg/types/config"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
+	"github.com/rancher/rancher/pkg/types/config"
 )
 
 // principalsToMigrate collects workunits whose resources we wish to migrate into two groups:
@@ -341,4 +342,4 @@ func migrateGRBs(workunit *migrateUserWorkUnit, sc *config.ScaledContext, dryRun
 		}
 	}
 	return nil
-}
+}

pkg/agent/clean/ad_unmigration/tokens.go → pkg/agent/clean/adunmigration/tokens.go

@@ -1,12 +1,13 @@
-package ad_unmigration
+package adunmigration
 
 import (
 	"fmt"
 
-	"github.com/rancher/rancher/pkg/auth/tokens"
-	"github.com/rancher/rancher/pkg/types/config"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/rancher/rancher/pkg/auth/tokens"
+	"github.com/rancher/rancher/pkg/types/config"
 )
 
 func collectTokens(workunits *[]migrateUserWorkUnit, sc *config.ScaledContext) error {

pkg/agent/clean/ad_unmigration/users.go → pkg/agent/clean/adunmigration/users.go

@@ -1,14 +1,15 @@
-package ad_unmigration
+package adunmigration
 
 import (
 	"fmt"
 	"strings"
 
 	"github.com/pkg/errors"
-	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
-	"github.com/rancher/rancher/pkg/types/config"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
+	"github.com/rancher/rancher/pkg/types/config"
 )
 
 func describePlannedChanges(workunit migrateUserWorkUnit) {

pkg/multiclustermanager/app.go

@@ -7,10 +7,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rancher/rancher/pkg/agent/clean/ad_unmigration"
+	"github.com/rancher/rancher/pkg/agent/clean/adunmigration"
 
 	"github.com/pkg/errors"
 	"github.com/rancher/norman/types"
+	"github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/rancher/rancher/pkg/auth/providerrefresh"
 	"github.com/rancher/rancher/pkg/auth/providers/common"
 	"github.com/rancher/rancher/pkg/auth/tokens"
@@ -30,8 +33,6 @@ import (
 	"github.com/rancher/rancher/pkg/tunnelserver/mcmauthorizer"
 	"github.com/rancher/rancher/pkg/types/config"
 	"github.com/rancher/rancher/pkg/wrangler"
-	"github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type Options struct {
@@ -215,7 +216,7 @@ func (m *mcm) Start(ctx context.Context) error {
 			return errors.Wrap(err, "failed to telemetry")
 		}
 
-		go ad_unmigration.UnmigrateAdGUIDUsersOnce(m.ScaledContext)
+		go adunmigration.UnmigrateAdGUIDUsersOnce(m.ScaledContext)
 		tokens.StartPurgeDaemon(ctx, management)
 		providerrefresh.StartRefreshDaemon(ctx, m.ScaledContext, management)
 		managementdata.CleanupOrphanedSystemUsers(ctx, management)