chore: Clean up repeated package import (argoproj#12431)

Signed-off-by: Zechun Chen <[email protected]>

cmd/argocd-applicationset-controller/commands/applicationset_controller.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/argoproj/argo-cd/v2/applicationset/services"
-	appsetv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	appv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	"github.com/argoproj/argo-cd/v2/util/cli"
@@ -60,7 +59,6 @@ func NewCommand() *cobra.Command {
 	)
 	scheme := runtime.NewScheme()
 	_ = clientgoscheme.AddToScheme(scheme)
-	_ = appsetv1alpha1.AddToScheme(scheme)
 	_ = appv1alpha1.AddToScheme(scheme)
 	var command = cobra.Command{
 		Use:   "controller",

reposerver/cache/cache_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	. "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
 	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
 )
@@ -114,7 +113,7 @@ func TestCache_GetAppDetails(t *testing.T) {
 	cache := newFixtures().Cache
 	// cache miss
 	value := &apiclient.RepoAppDetailsResponse{}
-	emptyRefSources := map[string]*appv1.RefTarget{}
+	emptyRefSources := map[string]*RefTarget{}
 	err := cache.GetAppDetails("my-revision", &ApplicationSource{}, emptyRefSources, value, "", nil)
 	assert.Equal(t, ErrCacheMiss, err)
 	res := &apiclient.RepoAppDetailsResponse{Type: "my-type"}
@@ -153,7 +152,7 @@ func TestCachedManifestResponse_HashBehavior(t *testing.T) {
 		Revision:  "revision",
 		Manifests: []string{"sample-text"},
 	}
-	appSrc := &appv1.ApplicationSource{}
+	appSrc := &ApplicationSource{}
 	appKey := "key"
 	appValue := "value"
 

server/applicationset/applicationset.go

@@ -28,7 +28,6 @@ import (
 	servercache "github.com/argoproj/argo-cd/v2/server/cache"
 	"github.com/argoproj/argo-cd/v2/server/rbacpolicy"
 	"github.com/argoproj/argo-cd/v2/util/argo"
-	argoutil "github.com/argoproj/argo-cd/v2/util/argo"
 	"github.com/argoproj/argo-cd/v2/util/db"
 	"github.com/argoproj/argo-cd/v2/util/rbac"
 	"github.com/argoproj/argo-cd/v2/util/session"
@@ -115,7 +114,7 @@ func (s *Server) List(ctx context.Context, q *applicationset.ApplicationSetListQ
 		}
 	}
 
-	newItems = argoutil.FilterAppSetsByProjects(newItems, q.Projects)
+	newItems = argo.FilterAppSetsByProjects(newItems, q.Projects)
 
 	// Sort found applicationsets by name
 	sort.Slice(newItems, func(i, j int) bool {

test/e2e/fixture/applicationsets/actions.go

@@ -17,7 +17,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/argoproj/argo-cd/v2/common"
-	argocommon "github.com/argoproj/argo-cd/v2/common"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/test/e2e/fixture/applicationsets/utils"
 	"github.com/argoproj/argo-cd/v2/util/clusterauth"
@@ -109,8 +108,8 @@ func (a *Actions) CreateClusterSecret(secretName string, clusterName string, clu
 				Name:      secretName,
 				Namespace: fixture.TestNamespace(),
 				Labels: map[string]string{
-					argocommon.LabelKeySecretType: argocommon.LabelValueSecretTypeCluster,
-					utils.TestingLabel:            "true",
+					common.LabelKeySecretType: common.LabelValueSecretTypeCluster,
+					utils.TestingLabel:        "true",
 				},
 			},
 			Data: map[string][]byte{

test/e2e/fixture/applicationsets/consequences.go

@@ -11,7 +11,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/test/e2e/fixture/applicationsets/utils"
 )
 
@@ -61,7 +60,7 @@ func (c *Consequences) When() *Actions {
 	return c.actions
 }
 
-func (c *Consequences) app(name string) *argov1alpha1.Application {
+func (c *Consequences) app(name string) *v1alpha1.Application {
 	apps := c.apps()
 
 	for index, app := range apps {
@@ -73,14 +72,14 @@ func (c *Consequences) app(name string) *argov1alpha1.Application {
 	return nil
 }
 
-func (c *Consequences) apps() []argov1alpha1.Application {
+func (c *Consequences) apps() []v1alpha1.Application {
 
 	fixtureClient := utils.GetE2EFixtureK8sClient()
 	list, err := fixtureClient.AppClientset.ArgoprojV1alpha1().Applications(fixture.TestNamespace()).List(context.Background(), metav1.ListOptions{})
 	errors.CheckError(err)
 
 	if list == nil {
-		list = &argov1alpha1.ApplicationList{}
+		list = &v1alpha1.ApplicationList{}
 	}
 
 	return list.Items

test/e2e/fixture/applicationsets/expectation.go

@@ -11,7 +11,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/test/e2e/fixture/applicationsets/utils"
 )
 
@@ -58,7 +57,7 @@ func Error(message, err string) Expectation {
 
 // ApplicationsExist checks whether each of the 'expectedApps' exist in the namespace, and are
 // equivalent to provided values.
-func ApplicationsExist(expectedApps []argov1alpha1.Application) Expectation {
+func ApplicationsExist(expectedApps []v1alpha1.Application) Expectation {
 	return func(c *Consequences) (state, string) {
 
 		for _, expectedApp := range expectedApps {
@@ -107,7 +106,7 @@ func ApplicationSetHasConditions(applicationSetName string, expectedConditions [
 }
 
 // ApplicationsDoNotExist checks that each of the 'expectedApps' no longer exist in the namespace
-func ApplicationsDoNotExist(expectedApps []argov1alpha1.Application) Expectation {
+func ApplicationsDoNotExist(expectedApps []v1alpha1.Application) Expectation {
 	return func(c *Consequences) (state, string) {
 
 		for _, expectedApp := range expectedApps {
@@ -145,7 +144,7 @@ func pods(namespace string) (*corev1.PodList, error) {
 }
 
 // getDiff returns a string containing a comparison result of two applications (for test output/debug purposes)
-func getDiff(orig, new argov1alpha1.Application) (string, error) {
+func getDiff(orig, new v1alpha1.Application) (string, error) {
 
 	bytes, _, err := diff.CreateTwoWayMergePatch(orig, new, orig)
 	if err != nil {
@@ -177,27 +176,27 @@ func getConditionDiff(orig, new []v1alpha1.ApplicationSetCondition) (string, err
 }
 
 // filterFields returns a copy of Application, but with unnecessary (for testing) fields removed
-func filterFields(input argov1alpha1.Application) argov1alpha1.Application {
+func filterFields(input v1alpha1.Application) v1alpha1.Application {
 
 	spec := input.Spec
 
 	metaCopy := input.ObjectMeta.DeepCopy()
 
-	output := argov1alpha1.Application{
+	output := v1alpha1.Application{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      metaCopy.Labels,
 			Annotations: metaCopy.Annotations,
 			Name:        metaCopy.Name,
 			Namespace:   metaCopy.Namespace,
 			Finalizers:  metaCopy.Finalizers,
 		},
-		Spec: argov1alpha1.ApplicationSpec{
-			Source: &argov1alpha1.ApplicationSource{
+		Spec: v1alpha1.ApplicationSpec{
+			Source: &v1alpha1.ApplicationSource{
 				Path:           spec.GetSource().Path,
 				RepoURL:        spec.GetSource().RepoURL,
 				TargetRevision: spec.GetSource().TargetRevision,
 			},
-			Destination: argov1alpha1.ApplicationDestination{
+			Destination: v1alpha1.ApplicationDestination{
 				Server:    spec.Destination.Server,
 				Name:      spec.Destination.Name,
 				Namespace: spec.Destination.Namespace,
@@ -227,7 +226,7 @@ func filterConditionFields(input *[]v1alpha1.ApplicationSetCondition) *[]v1alpha
 }
 
 // appsAreEqual returns true if the apps are equal, comparing only fields of interest
-func appsAreEqual(one argov1alpha1.Application, two argov1alpha1.Application) bool {
+func appsAreEqual(one v1alpha1.Application, two v1alpha1.Application) bool {
 	return reflect.DeepEqual(filterFields(one), filterFields(two))
 }
 

util/argo/diff/diff.go

@@ -6,7 +6,6 @@ import (
 	"github.com/go-logr/logr"
 
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/util/argo"
 	"github.com/argoproj/argo-cd/v2/util/argo/managedfields"
 	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
@@ -40,7 +39,7 @@ func (b *DiffConfigBuilder) WithDiffSettings(id []v1alpha1.ResourceIgnoreDiffere
 
 	overrides := o
 	if overrides == nil {
-		overrides = make(map[string]appv1.ResourceOverride)
+		overrides = make(map[string]v1alpha1.ResourceOverride)
 	}
 	b.diffConfig.overrides = overrides
 	b.diffConfig.ignoreAggregatedRoles = ignoreAggregatedRoles
@@ -113,7 +112,7 @@ type DiffConfig interface {
 	Validate() error
 	// DiffFromCache will verify if it should retrieve the cached ResourceDiff based on this
 	// DiffConfig.
-	DiffFromCache(appName string) (bool, []*appv1.ResourceDiff)
+	DiffFromCache(appName string) (bool, []*v1alpha1.ResourceDiff)
 	// Ignores Application level ignore difference configurations.
 	Ignores() []v1alpha1.ResourceIgnoreDifferences
 	// Overrides is map of system configurations to override the Application ones.
@@ -267,13 +266,13 @@ func StateDiffs(lives, configs []*unstructured.Unstructured, diffConfig DiffConf
 	return diff.DiffArray(normResults.Targets, normResults.Lives, diffOpts...)
 }
 
-func diffArrayCached(configArray []*unstructured.Unstructured, liveArray []*unstructured.Unstructured, cachedDiff []*appv1.ResourceDiff, opts ...diff.Option) (*diff.DiffResultList, error) {
+func diffArrayCached(configArray []*unstructured.Unstructured, liveArray []*unstructured.Unstructured, cachedDiff []*v1alpha1.ResourceDiff, opts ...diff.Option) (*diff.DiffResultList, error) {
 	numItems := len(configArray)
 	if len(liveArray) != numItems {
 		return nil, fmt.Errorf("left and right arrays have mismatched lengths")
 	}
 
-	diffByKey := map[kube.ResourceKey]*appv1.ResourceDiff{}
+	diffByKey := map[kube.ResourceKey]*v1alpha1.ResourceDiff{}
 	for i := range cachedDiff {
 		res := cachedDiff[i]
 		diffByKey[kube.NewResourceKey(res.Group, res.Kind, res.Namespace, res.Name)] = cachedDiff[i]
@@ -322,11 +321,11 @@ func diffArrayCached(configArray []*unstructured.Unstructured, liveArray []*unst
 // DiffFromCache will verify if it should retrieve the cached ResourceDiff based on this
 // DiffConfig. Returns true and the cached ResourceDiff if configured to use the cache.
 // Returns false and nil otherwise.
-func (c *diffConfig) DiffFromCache(appName string) (bool, []*appv1.ResourceDiff) {
+func (c *diffConfig) DiffFromCache(appName string) (bool, []*v1alpha1.ResourceDiff) {
 	if c.noCache || c.stateCache == nil || appName == "" {
 		return false, nil
 	}
-	cachedDiff := make([]*appv1.ResourceDiff, 0)
+	cachedDiff := make([]*v1alpha1.ResourceDiff, 0)
 	if c.stateCache != nil && c.stateCache.GetAppManagedResources(appName, &cachedDiff) == nil {
 		return true, cachedDiff
 	}

util/notification/argocd/service.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	repoapiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
 	"github.com/argoproj/argo-cd/v2/util/db"
 	"github.com/argoproj/argo-cd/v2/util/settings"
 )
@@ -22,7 +21,7 @@ type Service interface {
 	GetAppDetails(ctx context.Context, appSource *v1alpha1.ApplicationSource) (*shared.AppDetail, error)
 }
 
-func NewArgoCDService(clientset kubernetes.Interface, namespace string, repoClientset repoapiclient.Clientset) (*argoCDService, error) {
+func NewArgoCDService(clientset kubernetes.Interface, namespace string, repoClientset apiclient.Clientset) (*argoCDService, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	settingsMgr := settings.NewSettingsManager(ctx, clientset, namespace)
 	closer, repoClient, err := repoClientset.NewRepoServerClient()