rancher/cli
1
0
Fork 0
mirror of https://github.com/rancher/cli.git synced 2026-02-05 09:48:36 +01:00
Code Issues Releases Activity

Reverting to 9ac2118268

Browse Source 
Removing new flag added to token command
This commit is contained in:
Dan Ramich
2020-11-10 09:03:30 -07:00
parent 0073195ba0
commit 792e2c58d6
2 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/kubectl_token.go
View File

@@ -17,7 +17,6 @@ import (
url2 "net/url"
"os"
"os/signal"
"path"
"path/filepath"
"strings"
"time"
@@ -110,11 +109,6 @@ func CredentialCommand() cli.Command {
Name: "skip-verify",
Usage: "Skip verification of the CACerts presented by the Server",
},
cli.StringFlag{
Name: "cache-dir",
Usage: "The absolute path for the kubectl-token .cache directory",
EnvVar: "RANCHER_CACHE_DIR",
},
},
Subcommands: []cli.Command{
cli.Command{
@@ -147,13 +141,8 @@ func runCredential(ctx *cli.Context) error {
}
clusterID := ctx.String("cluster")
dir, err := getCacheDir(ctx)
if err != nil {
return err
}
cachedCredName := fmt.Sprintf("%s_%s", userID, clusterID)
cachedCred, err := loadCachedCredential(cachedCredName, dir)
cachedCred, err := loadCachedCredential(cachedCredName)
if err != nil {
customPrint(fmt.Errorf("LoadToken: %v", err))
}
@@ -175,7 +164,7 @@ func runCredential(ctx *cli.Context) error {
return err
}
if err := cacheCredential(newCred, fmt.Sprintf("%s_%s", userID, clusterID), dir); err != nil {
if err := cacheCredential(newCred, fmt.Sprintf("%s_%s", userID, clusterID)); err != nil {
customPrint(fmt.Errorf("CacheToken: %v", err))
}
@@ -186,7 +175,7 @@ func deleteCachedCredential(ctx *cli.Context) error {
if len(ctx.Args()) == 0 {
return cli.ShowSubcommandHelp(ctx)
}
dir, err := getCacheDir(ctx)
dir, err := os.Getwd()
if err != nil {
return err
}
@@ -206,7 +195,11 @@ func deleteCachedCredential(ctx *cli.Context) error {
return nil
}
func loadCachedCredential(key, dir string) (*ExecCredential, error) {
func loadCachedCredential(key string) (*ExecCredential, error) {
dir, err := os.Getwd()
if err != nil {
return nil, err
}
cachePath := filepath.Join(dir, kubeConfigCache, fmt.Sprintf("%s%s", key, cachedFileExt))
f, err := os.Open(cachePath)
if err != nil {
@@ -229,12 +222,15 @@ func loadCachedCredential(key, dir string) (*ExecCredential, error) {
return execCredential, nil
}
func cacheCredential(cred *ExecCredential, id, dir string) error {
func cacheCredential(cred *ExecCredential, id string) error {
// cache only if valid
if cred.Status.Token == "" {
return nil
}
dir, err := os.Getwd()
if err != nil {
return err
}
cachePathDir := filepath.Join(dir, kubeConfigCache)
if err := os.MkdirAll(cachePathDir, os.FileMode(0700)); err != nil {
return err
@@ -525,19 +521,6 @@ func generateKey() (string, error) {
return string(token), nil
}
func getCacheDir(ctx *cli.Context) (string, error) {
p := ctx.String("cache-dir")
if p == "" {
return os.Getwd()
}
if !path.IsAbs(p) {
return "", fmt.Errorf("cache dir requires an absolute path")
}
return p, nil
}
func getTLSConfig(input *LoginInput) (*tls.Config, error) {
config := &tls.Config{}
if input.skipVerify || input.caCerts == "" {

7
main_test.go
View File

@@ -27,7 +27,6 @@ func (m *MainTestSuite) TestParseArgs(c *check.C) {
{"rancher", "run", "--debug", "-f=b"},
{"rancher", "run", "--debug", "-=b"},
{"rancher", "run", "--debug", "-"},
{"rancher", "token", "--cache-dir=/path/to/cache"},
}
r0, err := parseArgs(input[0])
if err != nil {
@@ -62,10 +61,4 @@ func (m *MainTestSuite) TestParseArgs(c *check.C) {
c.Fatal(err)
}
c.Assert(r5, check.DeepEquals, []string{"rancher", "run", "--debug", "-"})
r6, err := parseArgs(input[6])
if err != nil {
c.Fatal(err)
}
c.Assert(r6, check.DeepEquals, []string{"rancher", "token", "--cache-dir=/path/to/cache"})
}