From ef0851b71161affe4c098c81b6d37dde7f148a4e Mon Sep 17 00:00:00 2001
From: Steve Kuznetsov <stekuznetsov@microsoft.com>
Date: Wed, 5 Feb 2025 07:19:13 -0700
Subject: [PATCH] Makefile: format code after generation

No need to copy-paste the formatting and import ordering line in every
single generation argument, it's easy enough to just run it in the
generate target.

Signed-off-by: Steve Kuznetsov <stekuznetsov@microsoft.com>
---
 Makefile                                                   | 1 +
 pkg/api/generate.go                                        | 1 -
 pkg/cluster/generate.go                                    | 1 -
 pkg/cluster/graph/generate.go                              | 1 -
 pkg/database/cosmosdb/generate.go                          | 2 --
 pkg/deploy/vmsscleaner/generate.go                         | 1 -
 pkg/env/generate.go                                        | 1 -
 pkg/frontend/adminactions/generate.go                      | 3 ---
 pkg/frontend/generate.go                                   | 4 ----
 pkg/hive/generate.go                                       | 1 -
 pkg/metrics/generate.go                                    | 1 -
 pkg/operator/controllers/workaround/generate.go            | 1 -
 pkg/operator/deploy/generate.go                            | 1 -
 pkg/operator/generate.go                                   | 1 -
 pkg/proxy/generate.go                                      | 1 -
 pkg/util/azureclient/azuresdk/armauthorization/generate.go | 1 -
 pkg/util/azureclient/azuresdk/armcosmos/generate.go        | 1 -
 pkg/util/azureclient/azuresdk/armdns/generate.go           | 1 -
 pkg/util/azureclient/azuresdk/armmsi/generate.go           | 2 --
 pkg/util/azureclient/azuresdk/armnetwork/generate.go       | 1 -
 pkg/util/azureclient/azuresdk/armstorage/generate.go       | 1 -
 pkg/util/azureclient/azuresdk/azblob/generate.go           | 1 -
 pkg/util/azureclient/azuresdk/azcore/generate.go           | 1 -
 pkg/util/azureclient/azuresdk/azsecrets/generate.go        | 1 -
 pkg/util/azureclient/keyvault/generate.go                  | 1 -
 pkg/util/azureclient/mgmt/authorization/generate.go        | 1 -
 pkg/util/azureclient/mgmt/compute/generate.go              | 1 -
 pkg/util/azureclient/mgmt/containerregistry/generate.go    | 1 -
 pkg/util/azureclient/mgmt/dns/generate.go                  | 1 -
 pkg/util/azureclient/mgmt/features/generate.go             | 1 -
 pkg/util/azureclient/mgmt/msi/generate.go                  | 1 -
 pkg/util/azureclient/mgmt/network/generate.go              | 1 -
 pkg/util/azureclient/mgmt/privatedns/generate.go           | 1 -
 pkg/util/azureclient/mgmt/storage/generate.go              | 1 -
 pkg/util/billing/generate.go                               | 1 -
 pkg/util/blob/generate.go                                  | 1 -
 pkg/util/clusterdata/generate.go                           | 1 -
 pkg/util/deployer/generate.go                              | 1 -
 pkg/util/dns/generate.go                                   | 1 -
 pkg/util/dynamichelper/generate.go                         | 1 -
 pkg/util/encryption/generate.go                            | 1 -
 pkg/util/instancemetadata/generate.go                      | 1 -
 pkg/util/keyvault/generate.go                              | 1 -
 pkg/util/msidataplane/generate.go                          | 2 --
 pkg/util/net/generate.go                                   | 1 -
 pkg/util/platformworkloadidentity/generate.go              | 1 -
 pkg/util/storage/generate.go                               | 1 -
 pkg/util/subnet/generate.go                                | 1 -
 pkg/validate/dynamic/generate.go                           | 2 --
 49 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/Makefile b/Makefile
index c5446b40b2d..5ebc84160a6 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,7 @@ discoverycache:
 .PHONY: generate
 generate: install-tools
 	go generate ./...
+	$(MAKE) imports
 
 # TODO: This does not work outside of GOROOT. We should replace all usage of the
 # clientset with controller-runtime so we don't need to generate it.
diff --git a/pkg/api/generate.go b/pkg/api/generate.go
index 0d4004e4d6e..d0836571269 100644
--- a/pkg/api/generate.go
+++ b/pkg/api/generate.go
@@ -5,4 +5,3 @@ package api
 
 //go:generate enumer -type InstallPhase -output zz_generated_installphase_enumer.go
 //go:generate mockgen -destination=../util/mocks/api/api.go github.com/Azure/ARO-RP/pkg/api SyncSetConverter,MachinePoolConverter,SyncIdentityProviderConverter,SecretConverter
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/api/api.go
diff --git a/pkg/cluster/generate.go b/pkg/cluster/generate.go
index ce5588c46fa..eedc4006a59 100644
--- a/pkg/cluster/generate.go
+++ b/pkg/cluster/generate.go
@@ -6,4 +6,3 @@ package cluster
 //go:generate mockgen -source cluster.go -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go Interface
 //go:generate mockgen -destination=../util/mocks/samplesclient/versioned.go github.com/openshift/client-go/samples/clientset/versioned Interface
 //go:generate mockgen -destination=../util/mocks/samples/samples.go github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1 SamplesV1Interface,ConfigInterface
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/cluster.go
diff --git a/pkg/cluster/graph/generate.go b/pkg/cluster/graph/generate.go
index 1de36444168..63181da308c 100644
--- a/pkg/cluster/graph/generate.go
+++ b/pkg/cluster/graph/generate.go
@@ -5,4 +5,3 @@ package graph
 
 //go:generate rm -rf ../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/cluster/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/database/cosmosdb/generate.go b/pkg/database/cosmosdb/generate.go
index b456c1819b5..654ab5f8293 100644
--- a/pkg/database/cosmosdb/generate.go
+++ b/pkg/database/cosmosdb/generate.go
@@ -4,6 +4,4 @@ package cosmosdb
 // Licensed under the Apache License 2.0.
 
 //go:generate gencosmosdb github.com/Azure/ARO-RP/pkg/api,AsyncOperationDocument github.com/Azure/ARO-RP/pkg/api,BillingDocument github.com/Azure/ARO-RP/pkg/api,GatewayDocument github.com/Azure/ARO-RP/pkg/api,MonitorDocument github.com/Azure/ARO-RP/pkg/api,OpenShiftClusterDocument github.com/Azure/ARO-RP/pkg/api,SubscriptionDocument github.com/Azure/ARO-RP/pkg/api,OpenShiftVersionDocument github.com/Azure/ARO-RP/pkg/api,ClusterManagerConfigurationDocument github.com/Azure/ARO-RP/pkg/api,PlatformWorkloadIdentityRoleSetDocument github.com/Azure/ARO-RP/pkg/api,MaintenanceManifestDocument
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ./
 //go:generate mockgen -destination=../../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/database/$GOPACKAGE PermissionClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/deploy/vmsscleaner/generate.go b/pkg/deploy/vmsscleaner/generate.go
index ad1d97ebd13..916a130862f 100644
--- a/pkg/deploy/vmsscleaner/generate.go
+++ b/pkg/deploy/vmsscleaner/generate.go
@@ -5,4 +5,3 @@ package vmsscleaner
 
 //go:generate rm -rf ../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/deploy/$GOPACKAGE Interface
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/env/generate.go b/pkg/env/generate.go
index 97490407bca..bcb05115140 100644
--- a/pkg/env/generate.go
+++ b/pkg/env/generate.go
@@ -8,5 +8,4 @@ package env
 // Need to use source mode as reflect mode always uses pkg "azcore/internal/exported"
 //go:generate sh -c "for file in core env certificateRefresher; do mockgen -destination=../util/mocks/$GOPACKAGE/${DOLLAR}file.go -source ${DOLLAR}file.go -aux_files github.com/Azure/ARO-RP/pkg/env=core.go,github.com/Azure/ARO-RP/pkg/env=armhelper.go; done"
 
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/
 //go:generate enumer -type Feature -output zz_generated_feature_enumer.go
diff --git a/pkg/frontend/adminactions/generate.go b/pkg/frontend/adminactions/generate.go
index 64a01fdce93..7d54572d275 100644
--- a/pkg/frontend/adminactions/generate.go
+++ b/pkg/frontend/adminactions/generate.go
@@ -7,6 +7,3 @@ package adminactions
 //go:generate mockgen -source kubeactions.go -destination=../../util/mocks/$GOPACKAGE/kubeactions.go github.com/Azure/ARO-RP/pkg/frontend/$GOPACKAGE KubeActions
 //go:generate mockgen -source azureactions.go -destination=../../util/mocks/$GOPACKAGE/azureactions.go github.com/Azure/ARO-RP/pkg/frontend/$GOPACKAGE AzureActions
 //go:generate mockgen -source applens.go -destination=../../util/mocks/$GOPACKAGE/applens.go github.com/Azure/ARO-RP/pkg/frontend/$GOPACKAGE AppLensActions
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/kubeactions.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/azureactions.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/applens.go
diff --git a/pkg/frontend/generate.go b/pkg/frontend/generate.go
index 7cdf141f354..8f3de552f88 100644
--- a/pkg/frontend/generate.go
+++ b/pkg/frontend/generate.go
@@ -8,7 +8,3 @@ package frontend
 //go:generate mockgen -source providers_validation.go -destination=../util/mocks/$GOPACKAGE/providers_validation.go github.com/Azure/ARO-RP/pkg/frontend ProvidersValidator
 //go:generate mockgen -source sku_validation.go -destination=../util/mocks/$GOPACKAGE/sku_validation.go github.com/Azure/ARO-RP/pkg/frontend SkuValidator
 //go:generate mockgen -source adminreplies.go -destination=../util/mocks/$GOPACKAGE/adminreplies.go github.com/Azure/ARO-RP/pkg/frontend StreamResponder
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/quota_validation.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/providers_validation.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/sku_validation.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/adminreplies.go
diff --git a/pkg/hive/generate.go b/pkg/hive/generate.go
index 2b1e4198021..6b6b88454be 100644
--- a/pkg/hive/generate.go
+++ b/pkg/hive/generate.go
@@ -5,4 +5,3 @@ package hive
 
 //go:generate rm -rf ../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/$GOPACKAGE ClusterManager,SyncSetManager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/metrics/generate.go b/pkg/metrics/generate.go
index 810e6448c66..240ed1638ae 100644
--- a/pkg/metrics/generate.go
+++ b/pkg/metrics/generate.go
@@ -5,4 +5,3 @@ package metrics
 
 //go:generate rm -rf ../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/$GOPACKAGE Emitter
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/operator/controllers/workaround/generate.go b/pkg/operator/controllers/workaround/generate.go
index f233da3055d..c5325a7d751 100644
--- a/pkg/operator/controllers/workaround/generate.go
+++ b/pkg/operator/controllers/workaround/generate.go
@@ -5,4 +5,3 @@ package workaround
 
 //go:generate rm -rf ../../../util/mocks/operator/controllers/$GOPACKAGE
 //go:generate mockgen -destination=../../../util/mocks/operator/controllers/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/operator/controllers/$GOPACKAGE Workaround
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../util/mocks/operator/controllers/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/operator/deploy/generate.go b/pkg/operator/deploy/generate.go
index d254301c907..e4c4c38a12d 100644
--- a/pkg/operator/deploy/generate.go
+++ b/pkg/operator/deploy/generate.go
@@ -5,4 +5,3 @@ package deploy
 
 //go:generate rm -rf ../../util/mocks/operator/$GOPACKAGE
 //go:generate mockgen -destination=../../util/mocks/operator/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/operator/$GOPACKAGE Operator
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/operator/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/operator/generate.go b/pkg/operator/generate.go
index 534c00a6789..b78b9734eb9 100644
--- a/pkg/operator/generate.go
+++ b/pkg/operator/generate.go
@@ -5,7 +5,6 @@ package operator
 
 // build the Kubernetes objects
 //go:generate controller-gen object paths=./apis/...
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ./apis
 
 // build the operator's CRD (based on the apis)
 // for master deployment
diff --git a/pkg/proxy/generate.go b/pkg/proxy/generate.go
index 0fd64414619..07dc25e876f 100644
--- a/pkg/proxy/generate.go
+++ b/pkg/proxy/generate.go
@@ -5,4 +5,3 @@ package proxy
 
 //go:generate rm -rf ../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/$GOPACKAGE Dialer
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/armauthorization/generate.go b/pkg/util/azureclient/azuresdk/armauthorization/generate.go
index 2ae4931d933..9b4e27178d6 100644
--- a/pkg/util/azureclient/azuresdk/armauthorization/generate.go
+++ b/pkg/util/azureclient/azuresdk/armauthorization/generate.go
@@ -5,4 +5,3 @@ package armauthorization
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE RoleDefinitionsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/armcosmos/generate.go b/pkg/util/azureclient/azuresdk/armcosmos/generate.go
index 1c56a485c21..8b084556bf8 100644
--- a/pkg/util/azureclient/azuresdk/armcosmos/generate.go
+++ b/pkg/util/azureclient/azuresdk/armcosmos/generate.go
@@ -5,4 +5,3 @@ package armcosmos
 
 //go:generate rm -rf ../../../../../pkg/util/mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE DatabaseAccountsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/armdns/generate.go b/pkg/util/azureclient/azuresdk/armdns/generate.go
index f5e5ffb92bc..6532a47bc9d 100644
--- a/pkg/util/azureclient/azuresdk/armdns/generate.go
+++ b/pkg/util/azureclient/azuresdk/armdns/generate.go
@@ -5,4 +5,3 @@ package armdns
 
 //go:generate rm -rf ../../../../../pkg/util/mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE RecordSetsClient,ZonesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/armmsi/generate.go b/pkg/util/azureclient/azuresdk/armmsi/generate.go
index e3d4f570378..055d9347cba 100644
--- a/pkg/util/azureclient/azuresdk/armmsi/generate.go
+++ b/pkg/util/azureclient/azuresdk/armmsi/generate.go
@@ -7,5 +7,3 @@ package armmsi
 //go:generate rm -rf ../../../../../pkg/util/mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -source ./federated_identity_credentials.go -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/federated_identity_credentials.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE FederatedIdentityCredentialsClient
 //go:generate mockgen -source ./user_assigned_identities.go -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/user_assigned_identities.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE UserAssignedIdentitiesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/federated_identity_credentials.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/user_assigned_identities.go
diff --git a/pkg/util/azureclient/azuresdk/armnetwork/generate.go b/pkg/util/azureclient/azuresdk/armnetwork/generate.go
index 43a1affe2e6..77416ab9bad 100644
--- a/pkg/util/azureclient/azuresdk/armnetwork/generate.go
+++ b/pkg/util/azureclient/azuresdk/armnetwork/generate.go
@@ -5,4 +5,3 @@ package armnetwork
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE FlowLogsClientInterface,InterfacesClient,LoadBalancersClient,LoadBalancerBackendAddressPoolsClient,PrivateEndpointsClient,PrivateLinkServicesClient,PublicIPAddressesClient,RouteTablesClient,SecurityGroupsClient,SubnetsClient,UsagesClient,VirtualNetworksClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/armstorage/generate.go b/pkg/util/azureclient/azuresdk/armstorage/generate.go
index eb82c451089..cf65b280d0b 100644
--- a/pkg/util/azureclient/azuresdk/armstorage/generate.go
+++ b/pkg/util/azureclient/azuresdk/armstorage/generate.go
@@ -5,4 +5,3 @@ package armstorage
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE AccountsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/azuresdk/azblob/generate.go b/pkg/util/azureclient/azuresdk/azblob/generate.go
index 05abe7e90b3..7081ef87f9b 100644
--- a/pkg/util/azureclient/azuresdk/azblob/generate.go
+++ b/pkg/util/azureclient/azuresdk/azblob/generate.go
@@ -5,4 +5,3 @@ package azblob
 
 //go:generate rm -rf ../../../../../mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/blobs.go -source=blobs.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/blobs.go
diff --git a/pkg/util/azureclient/azuresdk/azcore/generate.go b/pkg/util/azureclient/azuresdk/azcore/generate.go
index 30b67c97f56..af6866fb618 100644
--- a/pkg/util/azureclient/azuresdk/azcore/generate.go
+++ b/pkg/util/azureclient/azuresdk/azcore/generate.go
@@ -5,4 +5,3 @@ package azcore
 
 //go:generate rm -rf ../../../../../mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/tokencredential.go -source=tokencredential.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/tokencredential.go
diff --git a/pkg/util/azureclient/azuresdk/azsecrets/generate.go b/pkg/util/azureclient/azuresdk/azsecrets/generate.go
index 72b60371b25..062175d1e32 100644
--- a/pkg/util/azureclient/azuresdk/azsecrets/generate.go
+++ b/pkg/util/azureclient/azuresdk/azsecrets/generate.go
@@ -6,4 +6,3 @@ package azsecrets
 // Use source mode to prevent some issues related to generics being present in the interface.
 //go:generate rm -rf ../../../../../pkg/util/mocks/azureclient/azuresdk/$GOPACKAGE
 //go:generate mockgen -source ./client.go -destination=../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/azuresdk/$GOPACKAGE Client
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../mocks/azureclient/azuresdk/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/keyvault/generate.go b/pkg/util/azureclient/keyvault/generate.go
index 1c39fae880a..1d5c55babaf 100644
--- a/pkg/util/azureclient/keyvault/generate.go
+++ b/pkg/util/azureclient/keyvault/generate.go
@@ -5,4 +5,3 @@ package keyvault
 
 //go:generate rm -rf ../../../util/mocks/azureclient/$GOPACKAGE
 //go:generate mockgen -destination=../../../util/mocks/azureclient/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/$GOPACKAGE BaseClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../util/mocks/azureclient/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/authorization/generate.go b/pkg/util/azureclient/mgmt/authorization/generate.go
index 0b85d47dc66..d462644380c 100644
--- a/pkg/util/azureclient/mgmt/authorization/generate.go
+++ b/pkg/util/azureclient/mgmt/authorization/generate.go
@@ -5,4 +5,3 @@ package authorization
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE RoleAssignmentsClient,DenyAssignmentClient,RoleDefinitionsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/compute/generate.go b/pkg/util/azureclient/mgmt/compute/generate.go
index 78915cab6a6..6010fd2ba0e 100644
--- a/pkg/util/azureclient/mgmt/compute/generate.go
+++ b/pkg/util/azureclient/mgmt/compute/generate.go
@@ -5,4 +5,3 @@ package compute
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE DisksClient,ResourceSkusClient,VirtualMachinesClient,UsageClient,VirtualMachineScaleSetVMsClient,VirtualMachineScaleSetsClient,DiskEncryptionSetsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/containerregistry/generate.go b/pkg/util/azureclient/mgmt/containerregistry/generate.go
index c262057d444..4f13560f07e 100644
--- a/pkg/util/azureclient/mgmt/containerregistry/generate.go
+++ b/pkg/util/azureclient/mgmt/containerregistry/generate.go
@@ -5,4 +5,3 @@ package containerregistry
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE TokensClient,RegistriesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/dns/generate.go b/pkg/util/azureclient/mgmt/dns/generate.go
index b9f58b74633..9856f499409 100644
--- a/pkg/util/azureclient/mgmt/dns/generate.go
+++ b/pkg/util/azureclient/mgmt/dns/generate.go
@@ -5,4 +5,3 @@ package dns
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE RecordSetsClient,ZonesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/features/generate.go b/pkg/util/azureclient/mgmt/features/generate.go
index 17a5d4b4c60..fabf665a27a 100644
--- a/pkg/util/azureclient/mgmt/features/generate.go
+++ b/pkg/util/azureclient/mgmt/features/generate.go
@@ -5,4 +5,3 @@ package features
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE DeploymentsClient,ProvidersClient,ResourceGroupsClient,ResourcesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/msi/generate.go b/pkg/util/azureclient/mgmt/msi/generate.go
index f9ec6b60fff..485bfe92034 100644
--- a/pkg/util/azureclient/mgmt/msi/generate.go
+++ b/pkg/util/azureclient/mgmt/msi/generate.go
@@ -5,4 +5,3 @@ package msi
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE UserAssignedIdentitiesClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/network/generate.go b/pkg/util/azureclient/mgmt/network/generate.go
index 2d06e62cbd0..3aa68e69093 100644
--- a/pkg/util/azureclient/mgmt/network/generate.go
+++ b/pkg/util/azureclient/mgmt/network/generate.go
@@ -5,4 +5,3 @@ package network
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE InterfacesClient,LoadBalancersClient,PrivateEndpointsClient,PublicIPAddressesClient,LoadBalancerBackendAddressPoolsClient,SubnetsClient,VirtualNetworksClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/privatedns/generate.go b/pkg/util/azureclient/mgmt/privatedns/generate.go
index 4e28049702b..d0dd041ecca 100644
--- a/pkg/util/azureclient/mgmt/privatedns/generate.go
+++ b/pkg/util/azureclient/mgmt/privatedns/generate.go
@@ -5,4 +5,3 @@ package privatedns
 
 //go:generate rm -rf ../../../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE PrivateZonesClient,VirtualNetworkLinksClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/azureclient/mgmt/storage/generate.go b/pkg/util/azureclient/mgmt/storage/generate.go
index c69bfa4bd9f..b614db30a09 100644
--- a/pkg/util/azureclient/mgmt/storage/generate.go
+++ b/pkg/util/azureclient/mgmt/storage/generate.go
@@ -5,4 +5,3 @@ package storage
 
 //go:generate rm -rf ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE
 //go:generate mockgen -destination=../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/$GOPACKAGE AccountsClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../../util/mocks/azureclient/mgmt/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/billing/generate.go b/pkg/util/billing/generate.go
index 3e2c7533263..0e71133855c 100644
--- a/pkg/util/billing/generate.go
+++ b/pkg/util/billing/generate.go
@@ -5,4 +5,3 @@ package billing
 
 //go:generate rm -rf ../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/blob/generate.go b/pkg/util/blob/generate.go
index 17e72574290..b77b434021a 100644
--- a/pkg/util/blob/generate.go
+++ b/pkg/util/blob/generate.go
@@ -5,4 +5,3 @@ package blob
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/clusterdata/generate.go b/pkg/util/clusterdata/generate.go
index 9006c151a10..256a6e9cf35 100644
--- a/pkg/util/clusterdata/generate.go
+++ b/pkg/util/clusterdata/generate.go
@@ -4,4 +4,3 @@ package clusterdata
 // Licensed under the Apache License 2.0.
 
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE ClusterEnricher,BestEffortEnricher
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/deployer/generate.go b/pkg/util/deployer/generate.go
index 044a7156326..1a1c3a91c85 100644
--- a/pkg/util/deployer/generate.go
+++ b/pkg/util/deployer/generate.go
@@ -4,4 +4,3 @@ package deployer
 // Licensed under the Apache License 2.0.
 
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Deployer
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/dns/generate.go b/pkg/util/dns/generate.go
index d95688b618f..d6104b924bb 100644
--- a/pkg/util/dns/generate.go
+++ b/pkg/util/dns/generate.go
@@ -5,4 +5,3 @@ package dns
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/dynamichelper/generate.go b/pkg/util/dynamichelper/generate.go
index 693bd222349..97fd076ab4b 100644
--- a/pkg/util/dynamichelper/generate.go
+++ b/pkg/util/dynamichelper/generate.go
@@ -5,4 +5,3 @@ package dynamichelper
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Interface
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/encryption/generate.go b/pkg/util/encryption/generate.go
index a1acc67c98f..26bddc0074a 100644
--- a/pkg/util/encryption/generate.go
+++ b/pkg/util/encryption/generate.go
@@ -5,4 +5,3 @@ package encryption
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE AEAD
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/instancemetadata/generate.go b/pkg/util/instancemetadata/generate.go
index 4acc3bf2609..898e519c704 100644
--- a/pkg/util/instancemetadata/generate.go
+++ b/pkg/util/instancemetadata/generate.go
@@ -5,4 +5,3 @@ package instancemetadata
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE InstanceMetadata
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/keyvault/generate.go b/pkg/util/keyvault/generate.go
index 8f8a748834b..08a2d7da208 100644
--- a/pkg/util/keyvault/generate.go
+++ b/pkg/util/keyvault/generate.go
@@ -5,4 +5,3 @@ package keyvault
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/msidataplane/generate.go b/pkg/util/msidataplane/generate.go
index 83cb0cde2f9..09ff073d611 100644
--- a/pkg/util/msidataplane/generate.go
+++ b/pkg/util/msidataplane/generate.go
@@ -5,10 +5,8 @@ package msidataplane
 
 //go:generate rm -rf ../mocks/$GOPACKAGE/client_factory.go
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/client_factory.go github.com/Azure/msi-dataplane/pkg/dataplane ClientFactory
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/client_factory.go
 
 // mockgen unfortunately walks the type aliases in the dataplane package, and tries to import their
 // underlying sources from an internal package, so the generated mock is useful as a first step but
 // is not functional as-is
 //  go:generate mockgen -destination=../mocks/$GOPACKAGE/client.go github.com/Azure/msi-dataplane/pkg/dataplane Client
-//  go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/client.go
diff --git a/pkg/util/net/generate.go b/pkg/util/net/generate.go
index dbf1a14aeeb..262d40b3906 100644
--- a/pkg/util/net/generate.go
+++ b/pkg/util/net/generate.go
@@ -5,4 +5,3 @@ package net
 
 //go:generate rm -rf ../../util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE DNSIClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/platformworkloadidentity/generate.go b/pkg/util/platformworkloadidentity/generate.go
index 58fb74ac0dd..b05af31c958 100644
--- a/pkg/util/platformworkloadidentity/generate.go
+++ b/pkg/util/platformworkloadidentity/generate.go
@@ -5,4 +5,3 @@ package platformworkloadidentity
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE PlatformWorkloadIdentityRolesByVersion
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/storage/generate.go b/pkg/util/storage/generate.go
index 45d40c6bda0..3b6cf4a56c7 100644
--- a/pkg/util/storage/generate.go
+++ b/pkg/util/storage/generate.go
@@ -5,4 +5,3 @@ package storage
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/subnet/generate.go b/pkg/util/subnet/generate.go
index eab6ff1e8e5..6aaa9477f80 100644
--- a/pkg/util/subnet/generate.go
+++ b/pkg/util/subnet/generate.go
@@ -5,4 +5,3 @@ package subnet
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
 //go:generate mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Manager,KubeManager
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/validate/dynamic/generate.go b/pkg/validate/dynamic/generate.go
index 2641a996744..e1a2cc5b714 100644
--- a/pkg/validate/dynamic/generate.go
+++ b/pkg/validate/dynamic/generate.go
@@ -10,5 +10,3 @@ package dynamic
 //go:generate rm -rf ../../../pkg/util/mocks/$GOPACKAGE
 //go:generate mockgen -destination=../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.go -source=dynamic.go
 //go:generate mockgen -destination=../../../pkg/util/mocks/checkaccess/checkaccess.go github.com/Azure/checkaccess-v2-go-sdk/client RemotePDPClient
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../pkg/util/mocks/$GOPACKAGE/$GOPACKAGE.go
-//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../../../pkg/util/mocks/checkaccess/checkaccess.go