add unit tests

Author: adammw

pkg/cloud/services/eks/cluster.go

@@ -585,6 +585,17 @@ func (s *Service) reconcileAccessConfig(accessConfig *ekstypes.AccessConfigRespo
 				}
 				return false, err
 			}
+
+			// Wait until status transitions to UPDATING because there's a short
+			// window after UpdateClusterVersion returns where the cluster
+			// status is ACTIVE and the update would be tried again
+			if err := s.EKSClient.WaitUntilClusterUpdating(
+				&eks.DescribeClusterInput{Name: aws.String(s.scope.KubernetesClusterName())},
+				request.WithWaiterLogger(&awslog{s.GetLogger()}),
+			); err != nil {
+				return false, err
+			}
+
 			conditions.MarkTrue(s.scope.ControlPlane, ekscontrolplanev1.EKSControlPlaneUpdatingCondition)
 			record.Eventf(s.scope.ControlPlane, "InitiatedUpdateEKSControlPlane", "Initiated auth config update for EKS control plane %s", s.scope.KubernetesClusterName())
 			return true, nil

pkg/cloud/services/eks/cluster_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/awserr"
 	"github.com/aws/aws-sdk-go-v2/service/eks"
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
@@ -474,6 +475,123 @@ func TestReconcileClusterVersion(t *testing.T) {
 	}
 }
 
+func TestReconcileAccessConfig(t *testing.T) {
+	clusterName := "default.cluster"
+	tests := []struct {
+		name        string
+		expect      func(m *mock_eksiface.MockEKSAPIMockRecorder)
+		expectError bool
+	}{
+		{
+			name: "no upgrade necessary",
+			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
+				m.
+					DescribeCluster(gomock.Eq(context.TODO()), gomock.AssignableToTypeOf(&eks.DescribeClusterInput{})).
+					Return(&eks.DescribeClusterOutput{
+						Cluster: &ekstypes.Cluster{
+							Name: aws.String("default.cluster"),
+							AccessConfig: &ekstypes.AccessConfigResponse{
+								AuthenticationMode: string(ekstypes.AuthenticationModeApiAndConfigMap),
+							},
+						},
+					}, nil)
+			},
+			expectError: false,
+		},
+		{
+			name: "needs upgrade",
+			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
+				m.
+					DescribeCluster(gomock.Eq(context.TODO()), gomock.AssignableToTypeOf(&eks.DescribeClusterInput{})).
+					Return(&eks.DescribeClusterOutput{
+						Cluster: &ekstypes.Cluster{
+							Name: aws.String("default.cluster"),
+							AccessConfig: &ekstypes.AccessConfigResponse{
+								AuthenticationMode: string(ekstypes.AuthenticationModeConfigMap),
+							},
+						},
+					}, nil)
+				m.WaitUntilClusterUpdating(
+					gomock.Eq(context.TODO()),
+					gomock.AssignableToTypeOf(&eks.DescribeClusterInput{}),
+					gomock.Any(),
+				).Return(nil)
+				m.
+					UpdateClusterConfig(gomock.Eq(context.TODO()), gomock.AssignableToTypeOf(&eks.UpdateClusterConfigInput{})).
+					Return(&eks.UpdateClusterConfigOutput{}, nil)
+			},
+			expectError: false,
+		},
+		{
+			name: "api error",
+			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
+				m.
+					DescribeCluster(gomock.Eq(context.TODO()), gomock.AssignableToTypeOf(&eks.DescribeClusterInput{})).
+					Return(&eks.DescribeClusterOutput{
+						Cluster: &ekstypes.Cluster{
+							Name: aws.String("default.cluster"),
+							AccessConfig: &ekstypes.AccessConfigResponse{
+								AuthenticationMode: string(ekstypes.AuthenticationModeApi),
+							},
+						},
+					}, nil)
+				m.
+					UpdateClusterConfig(gomock.Eq(context.TODO()), gomock.AssignableToTypeOf(&eks.UpdateClusterConfigInput{})).
+					Return(&eks.UpdateClusterConfigOutput{}, awserr.New(string(ekstypes.ErrCodeInvalidParameterException), "Unsupported authentication mode update", nil))
+			},
+			expectError: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			g := NewWithT(t)
+
+			mockControl := gomock.NewController(t)
+			defer mockControl.Finish()
+
+			eksMock := mock_eksiface.NewMockEKSAPI(mockControl)
+
+			scheme := runtime.NewScheme()
+			_ = infrav1.AddToScheme(scheme)
+			_ = ekscontrolplanev1.AddToScheme(scheme)
+			client := fake.NewClientBuilder().WithScheme(scheme).Build()
+			scope, err := scope.NewManagedControlPlaneScope(scope.ManagedControlPlaneScopeParams{
+				Client: client,
+				Cluster: &clusterv1.Cluster{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "ns",
+						Name:      clusterName,
+					},
+				},
+				ControlPlane: &ekscontrolplanev1.AWSManagedControlPlane{
+					Spec: ekscontrolplanev1.AWSManagedControlPlaneSpec{
+						EKSClusterName: clusterName,
+						AccessConfig: &ekscontrolplanev1.AccessConfig{
+							AuthenticationMode: ekscontrolplanev1.EKSAuthenticationModeApiAndConfigMap,
+						},
+					},
+				},
+			})
+			g.Expect(err).To(BeNil())
+
+			tc.expect(eksMock.EXPECT())
+			s := NewService(scope)
+			s.EKSClient = eksMock
+
+			cluster, err := s.describeEKSCluster(context.TODO(), clusterName)
+			g.Expect(err).To(BeNil())
+
+			err = s.reconcileAccessConfig(cluster.AccessConfig)
+			if tc.expectError {
+				g.Expect(err).To(HaveOccurred())
+				return
+			}
+			g.Expect(err).To(BeNil())
+		})
+	}
+}
+
 func TestCreateCluster(t *testing.T) {
 	clusterName := "cluster.default"
 	version := aws.String("1.24")