ensure target-auth-mode has a valid value

eksctl-io · Apr 25, 2024 · f34dd6f · f34dd6f
1 parent a21a8c1
commit f34dd6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/actions/accessentry/migrator.go b/pkg/actions/accessentry/migrator.go
@@ -64,7 +64,7 @@ func NewMigrator(
 }
 
 func (m *Migrator) MigrateToAccessEntry(ctx context.Context, options MigrationOptions) error {
-	if m.tgAuthMode == ekstypes.AuthenticationModeConfigMap {
+	if m.tgAuthMode != ekstypes.AuthenticationModeApi && m.tgAuthMode != ekstypes.AuthenticationModeApiAndConfigMap {
 		return fmt.Errorf("target authentication mode is invalid, must be either %s or %s", ekstypes.AuthenticationModeApi, ekstypes.AuthenticationModeApiAndConfigMap)
 	}
 	if m.curAuthMode == ekstypes.AuthenticationModeApi {

diff --git a/pkg/actions/accessentry/migrator_test.go b/pkg/actions/accessentry/migrator_test.go
@@ -126,13 +126,15 @@ var _ = Describe("Migrate Access Entry", func() {
 
 		Entry("[Validation Error] current authentication mode is API", migrateToAccessEntryEntry{
 			curAuthMode: ekstypes.AuthenticationModeApi,
+			tgAuthMode:  ekstypes.AuthenticationModeApi,
 			validateCustomLoggerOutput: func(output string) {
 				Expect(output).To(ContainSubstring(fmt.Sprintf("cluster authentication mode is already %s; there is no need to migrate to access entries", ekstypes.AuthenticationModeApi)))
 			},
 		}),
 
 		Entry("[API Error] getting access entries fails", migrateToAccessEntryEntry{
 			curAuthMode: ekstypes.AuthenticationModeApiAndConfigMap,
+			tgAuthMode:  ekstypes.AuthenticationModeApi,
 			mockAccessEntries: func(getter *fakes.FakeGetterInterface) {
 				getter.GetReturns(nil, genericErr)
 			},