Make revive happy on naming

Author: adammw

controlplane/eks/api/v1beta2/awsmanagedcontrolplane_webhook.go

@@ -331,8 +331,8 @@ func (r *AWSManagedControlPlane) validateAccessConfig(old *AWSManagedControlPlan
 
 	// AuthenticationMode is ratcheting - do not allow downgrades
 	if old.Spec.AccessConfig != nil && old.Spec.AccessConfig.AuthenticationMode != r.Spec.AccessConfig.AuthenticationMode &&
-		((old.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeApiAndConfigMap && r.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeConfigMap) ||
-			old.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeApi) {
+		((old.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeAPIAndConfigMap && r.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeConfigMap) ||
+			old.Spec.AccessConfig.AuthenticationMode == EKSAuthenticationModeAPI) {
 		allErrs = append(allErrs,
 			field.Invalid(field.NewPath("spec", "accessConfig", "authenticationMode"), r.Spec.AccessConfig.AuthenticationMode, "downgrading authentication mode is not allowed after it has been enabled"),
 		)

controlplane/eks/api/v1beta2/awsmanagedcontrolplane_webhook_test.go

@@ -716,13 +716,13 @@ func TestWebhookUpdate(t *testing.T) {
 			oldClusterSpec: AWSManagedControlPlaneSpec{
 				EKSClusterName: "default_cluster1",
 				AccessConfig: &AccessConfig{
-					AuthenticationMode: EKSAuthenticationModeApiAndConfigMap,
+					AuthenticationMode: EKSAuthenticationModeAPIAndConfigMap,
 				},
 			},
 			newClusterSpec: AWSManagedControlPlaneSpec{
 				EKSClusterName: "default_cluster1",
 				AccessConfig: &AccessConfig{
-					AuthenticationMode: EKSAuthenticationModeApi,
+					AuthenticationMode: EKSAuthenticationModeAPI,
 				},
 			},
 			expectError: false,
@@ -732,7 +732,7 @@ func TestWebhookUpdate(t *testing.T) {
 			oldClusterSpec: AWSManagedControlPlaneSpec{
 				EKSClusterName: "default_cluster1",
 				AccessConfig: &AccessConfig{
-					AuthenticationMode: EKSAuthenticationModeApi,
+					AuthenticationMode: EKSAuthenticationModeAPI,
 				},
 			},
 			newClusterSpec: AWSManagedControlPlaneSpec{
@@ -748,7 +748,7 @@ func TestWebhookUpdate(t *testing.T) {
 			oldClusterSpec: AWSManagedControlPlaneSpec{
 				EKSClusterName: "default_cluster1",
 				AccessConfig: &AccessConfig{
-					AuthenticationMode: EKSAuthenticationModeApiAndConfigMap,
+					AuthenticationMode: EKSAuthenticationModeAPIAndConfigMap,
 				},
 			},
 			newClusterSpec: AWSManagedControlPlaneSpec{

controlplane/eks/api/v1beta2/types.go

@@ -86,12 +86,12 @@ var (
 	// EKSAuthenticationModeConfigMap indicates that only `aws-auth` ConfigMap will be used for authentication
 	EKSAuthenticationModeConfigMap = EKSAuthenticationMode("CONFIG_MAP")
 
-	// EKSAuthenticationModeApi indicates that only AWS Access Entries will be used for authentication
-	EKSAuthenticationModeApi = EKSAuthenticationMode("API")
+	// EKSAuthenticationModeAPI indicates that only AWS Access Entries will be used for authentication
+	EKSAuthenticationModeAPI = EKSAuthenticationMode("API")
 
-	// EKSAuthenticationModeApiAndConfigMap indicates that both `aws-auth` ConfigMap and AWS Access Entries will
+	// EKSAuthenticationModeAPIAndConfigMap indicates that both `aws-auth` ConfigMap and AWS Access Entries will
 	// be used for authentication
-	EKSAuthenticationModeApiAndConfigMap = EKSAuthenticationMode("API_AND_CONFIG_MAP")
+	EKSAuthenticationModeAPIAndConfigMap = EKSAuthenticationMode("API_AND_CONFIG_MAP")
 )
 
 var (