Ensure that localProvider is always the 0th provider listed in the pr…

…ovider selection prompt. (#389)
rancher · Sep 7, 2024 · eca4a72 · eca4a72
1 parent d231ad1
commit eca4a72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/cmd/kubectl_token.go b/cmd/kubectl_token.go
@@ -558,7 +558,12 @@ func getAuthProviders(server string) ([]TypedProvider, error) {
 			if err != nil {
 				return nil, fmt.Errorf("attempting to decode the auth provider of type %s: %w", providerType, err)
 			}
-			supportedProviders = append(supportedProviders, typedProvider)
+
+			if typedProvider.GetType() == "localProvider" {
+				supportedProviders = append([]TypedProvider{typedProvider}, supportedProviders...)
+			} else {
+				supportedProviders = append(supportedProviders, typedProvider)
+			}
 		}
 	}
 

diff --git a/cmd/kubectl_token_test.go b/cmd/kubectl_token_test.go
@@ -28,6 +28,11 @@ func Test_getAuthProviders(t *testing.T) {
 			name:   "response ok",
 			server: setupServer(responseOK),
 			expectedProviders: []TypedProvider{
+				&apiv3.LocalProvider{
+					AuthProvider: apiv3.AuthProvider{
+						Type: "localProvider",
+					},
+				},
 				&apiv3.AzureADProvider{
 					AuthProvider: apiv3.AuthProvider{
 						Type: "azureADProvider",
@@ -44,11 +49,6 @@ func Test_getAuthProviders(t *testing.T) {
 						},
 					},
 				},
-				&apiv3.LocalProvider{
-					AuthProvider: apiv3.AuthProvider{
-						Type: "localProvider",
-					},
-				},
 			},
 		},
 		{