-
Notifications
You must be signed in to change notification settings - Fork 39k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30007 from ericchiang/kubectl-config-set-credenti…
…als-auth-providers Automatic merge from submit-queue kubectl config set-crentials: add arguments for auth providers This PR adds `--auth-provider` and `--auth-provider-arg` flags to the `kubectl config set-credentials` sub-command. There's currently no way of interacting with the new auth provider framework added in #23066 through kubectl. You have to render a custom kubeconfig to use them. Additionally `kubectl config set` just sort of craps out when attempting to interact with authentication info objects (#29312). This is a minimal implementation of allowing `kubect config set-credentials` to set fields for client auth providers. cc @cjcullen @kubernetes/kubectl
- Loading branch information
Showing
3 changed files
with
259 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "k8s.io/kubernetes/pkg/util" | ||
| ) | ||
|
|
||
| func stringFlagFor(s string) util.StringFlag { | ||
| var f util.StringFlag | ||
| f.Set(s) | ||
| return f | ||
| } | ||
|
|
||
| func TestCreateAuthInfoOptions(t *testing.T) { | ||
| tests := []struct { | ||
| flags []string | ||
| wantParseErr bool | ||
| wantCompleteErr bool | ||
| wantValidateErr bool | ||
|
|
||
| wantOptions *createAuthInfoOptions | ||
| }{ | ||
| { | ||
| flags: []string{ | ||
| "me", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| }, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "me", | ||
| "--token=foo", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| token: stringFlagFor("foo"), | ||
| }, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "me", | ||
| "--username=jane", | ||
| "--password=bar", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| username: stringFlagFor("jane"), | ||
| password: stringFlagFor("bar"), | ||
| }, | ||
| }, | ||
| { | ||
| // Cannot provide both token and basic auth. | ||
| flags: []string{ | ||
| "me", | ||
| "--token=foo", | ||
| "--username=jane", | ||
| "--password=bar", | ||
| }, | ||
| wantValidateErr: true, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "--auth-provider=oidc", | ||
| "--auth-provider-arg=client-id=foo", | ||
| "--auth-provider-arg=client-secret=bar", | ||
| "me", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| authProvider: stringFlagFor("oidc"), | ||
| authProviderArgs: map[string]string{ | ||
| "client-id": "foo", | ||
| "client-secret": "bar", | ||
| }, | ||
| authProviderArgsToRemove: []string{}, | ||
| }, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "--auth-provider=oidc", | ||
| "--auth-provider-arg=client-id-", | ||
| "--auth-provider-arg=client-secret-", | ||
| "me", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| authProvider: stringFlagFor("oidc"), | ||
| authProviderArgs: map[string]string{}, | ||
| authProviderArgsToRemove: []string{ | ||
| "client-id", | ||
| "client-secret", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "--auth-provider-arg=client-id-", // auth provider name not required | ||
| "--auth-provider-arg=client-secret-", | ||
| "me", | ||
| }, | ||
| wantOptions: &createAuthInfoOptions{ | ||
| name: "me", | ||
| authProviderArgs: map[string]string{}, | ||
| authProviderArgsToRemove: []string{ | ||
| "client-id", | ||
| "client-secret", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| "--auth-provider=oidc", | ||
| "--auth-provider-arg=client-id", // values must be of form 'key=value' or 'key-' | ||
| "me", | ||
| }, | ||
| wantCompleteErr: true, | ||
| }, | ||
| { | ||
| flags: []string{ | ||
| // No name for authinfo provided. | ||
| }, | ||
| wantCompleteErr: true, | ||
| }, | ||
| } | ||
|
|
||
| for i, test := range tests { | ||
| buff := new(bytes.Buffer) | ||
|
|
||
| opts := new(createAuthInfoOptions) | ||
| cmd := newCmdConfigSetAuthInfo(buff, opts) | ||
| if err := cmd.ParseFlags(test.flags); err != nil { | ||
| if !test.wantParseErr { | ||
| t.Errorf("case %d: parsing error for flags %q: %v: %s", i, test.flags, err, buff) | ||
| } | ||
| continue | ||
| } | ||
| if test.wantParseErr { | ||
| t.Errorf("case %d: expected parsing error for flags %q: %s", i, test.flags, buff) | ||
| continue | ||
| } | ||
|
|
||
| if !opts.complete(cmd, buff) { | ||
| if !test.wantCompleteErr { | ||
| t.Errorf("case %d: complete() error for flags %q: %s", i, test.flags, buff) | ||
| } | ||
| continue | ||
| } | ||
| if test.wantCompleteErr { | ||
| t.Errorf("case %d: complete() expected errors for flags %q: %s", i, test.flags, buff) | ||
| continue | ||
| } | ||
|
|
||
| if err := opts.validate(); err != nil { | ||
| if !test.wantValidateErr { | ||
| t.Errorf("case %d: flags %q: validate failed: %v", i, test.flags, err) | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| if test.wantValidateErr { | ||
| t.Errorf("case %d: flags %q: expected validate to fail", i, test.flags) | ||
| continue | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(opts, test.wantOptions) { | ||
| t.Errorf("case %d: flags %q: mis-matched options,\nwanted=%#v\ngot= %#v", i, test.flags, test.wantOptions, opts) | ||
| } | ||
| } | ||
| } |