Skip to content

make login test avoid default kubeconfig chain #1378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Mar 19, 2015
Merged

make login test avoid default kubeconfig chain #1378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions test/integration/login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,30 @@ import (
"os"
"testing"

"github.com/spf13/pflag"

kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"

"github.com/openshift/origin/pkg/client"
"github.com/openshift/origin/pkg/cmd/cli/cmd"
"github.com/openshift/origin/pkg/cmd/cli/config"
newproject "github.com/openshift/origin/pkg/cmd/experimental/project"
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
"github.com/openshift/origin/pkg/user/api"
"github.com/openshift/origin/test/util"
"github.com/spf13/pflag"
)

func init() {
util.RequireEtcd()
}

func TestLogin(t *testing.T) {
clientcmd.DefaultCluster = clientcmdapi.Cluster{Server: ""}

_, clusterAdminKubeConfig, err := util.StartTestMaster()

if err != nil {
t.Fatalf("unexpected error: %v", err)
}
Expand Down Expand Up @@ -113,7 +120,6 @@ func TestLogin(t *testing.T) {

func newLoginOptions(server string, username string, password string, context string, insecure bool) *cmd.LoginOptions {
flagset := pflag.NewFlagSet("test-flags", pflag.ContinueOnError)
factory := clientcmd.New(flagset)

flags := []string{}

Expand All @@ -127,15 +133,15 @@ func newLoginOptions(server string, username string, password string, context st
flags = append(flags, "--insecure-skip-tls-verify")
}

flagset.Parse(flags)

loginOptions := &cmd.LoginOptions{
ClientConfig: factory.OpenShiftClientConfig,
ClientConfig: defaultClientConfig(flagset),
Reader: os.Stdin,
Username: username,
Password: password,
}

flagset.Parse(flags)

return loginOptions
}

Expand All @@ -152,3 +158,18 @@ func whoami(clientCfg *kclient.Config) (*api.User, error) {

return me, nil
}

func defaultClientConfig(flags *pflag.FlagSet) clientcmd.ClientConfig {
loadingRules := &clientcmd.ClientConfigLoadingRules{ExplicitPath: ""}

flags.StringVar(&loadingRules.ExplicitPath, config.OpenShiftConfigFlagName, "", "Path to the config file to use for CLI requests.")

overrides := &clientcmd.ConfigOverrides{}
overrideFlags := clientcmd.RecommendedConfigOverrideFlags("")
overrideFlags.ContextOverrideFlags.NamespaceShort = "n"
clientcmd.BindOverrideFlags(overrides, flags, overrideFlags)

clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides)

return clientConfig
}