From e6e0d82bee3a6e7dbecfdbef4cbe0d59d1854082 Mon Sep 17 00:00:00 2001
From: Richard Case <198425+richardcase@users.noreply.github.com>
Date: Wed, 23 Sep 2020 17:15:45 +0100
Subject: [PATCH] refactor: changed the name of the eks providers

The EKS bootstrap and control plane providers have had their names
changes so they are prefixed with aws and both end up being
`aws-eks`.
---
 cmd/clusterctl/client/config/providers_client.go    | 8 ++++----
 cmd/clusterctl/client/config_test.go                | 8 ++++----
 cmd/clusterctl/client/repository/metadata_client.go | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
index c035b95b0dcc..7ff501b99167 100644
--- a/cmd/clusterctl/client/config/providers_client.go
+++ b/cmd/clusterctl/client/config/providers_client.go
@@ -44,12 +44,12 @@ const (
 	// Bootstrap providers
 	KubeadmBootstrapProviderName = "kubeadm"
 	TalosBootstrapProviderName   = "talos"
-	EKSBootstrapProviderName     = "eks"
+	AWSEKSBootstrapProviderName  = "aws-eks"
 
 	// ControlPlane providers
 	KubeadmControlPlaneProviderName = "kubeadm"
 	TalosControlPlaneProviderName   = "talos"
-	EKSControlPlaneProviderName     = "eks"
+	AWSEKSControlPlaneProviderName  = "aws-eks"
 
 	// Other
 	ProvidersConfigKey = "providers"
@@ -155,7 +155,7 @@ func (p *providersClient) defaults() []Provider {
 			providerType: clusterctlv1.BootstrapProviderType,
 		},
 		&provider{
-			name:         EKSBootstrapProviderName,
+			name:         AWSEKSBootstrapProviderName,
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/eks-bootstrap-components.yaml",
 			providerType: clusterctlv1.BootstrapProviderType,
 		},
@@ -171,7 +171,7 @@ func (p *providersClient) defaults() []Provider {
 			providerType: clusterctlv1.ControlPlaneProviderType,
 		},
 		&provider{
-			name:         EKSControlPlaneProviderName,
+			name:         AWSEKSControlPlaneProviderName,
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/eks-controlplane-components.yaml",
 			providerType: clusterctlv1.ControlPlaneProviderType,
 		},
diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
index 2e02d697ff1f..078d960af659 100644
--- a/cmd/clusterctl/client/config_test.go
+++ b/cmd/clusterctl/client/config_test.go
@@ -55,12 +55,12 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 			// note: these will be sorted by name by the Providers() call, so be sure they are in alphabetical order here too
 			wantProviders: []string{
 				config.ClusterAPIProviderName,
-				config.EKSBootstrapProviderName,
+				config.AWSEKSBootstrapProviderName,
 				config.KubeadmBootstrapProviderName,
 				config.TalosBootstrapProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.TalosControlPlaneProviderName,
-				config.EKSControlPlaneProviderName,
+				config.AWSEKSControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,
 				config.DOProviderName,
@@ -82,12 +82,12 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 			wantProviders: []string{
 				config.ClusterAPIProviderName,
 				customProviderConfig.Name(),
-				config.EKSBootstrapProviderName,
+				config.AWSEKSBootstrapProviderName,
 				config.KubeadmBootstrapProviderName,
 				config.TalosBootstrapProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.TalosControlPlaneProviderName,
-				config.EKSControlPlaneProviderName,
+				config.AWSEKSControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,
 				config.DOProviderName,
diff --git a/cmd/clusterctl/client/repository/metadata_client.go b/cmd/clusterctl/client/repository/metadata_client.go
index 4295b642e6e7..e1cf2fd9cdc3 100644
--- a/cmd/clusterctl/client/repository/metadata_client.go
+++ b/cmd/clusterctl/client/repository/metadata_client.go
@@ -156,7 +156,7 @@ func (f *metadataClient) getEmbeddedMetadata() *clusterctlv1.Metadata {
 					// older version are not supported by clusterctl
 				},
 			}
-		case config.EKSBootstrapProviderName:
+		case config.AWSEKSBootstrapProviderName:
 			return &clusterctlv1.Metadata{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: clusterctlv1.GroupVersion.String(),
@@ -196,7 +196,7 @@ func (f *metadataClient) getEmbeddedMetadata() *clusterctlv1.Metadata {
 					// there are no older version for Talos controlplane
 				},
 			}
-		case config.EKSControlPlaneProviderName:
+		case config.AWSEKSControlPlaneProviderName:
 			return &clusterctlv1.Metadata{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: clusterctlv1.GroupVersion.String(),