refactor: use one function for both conf files

jakuboskera · May 3, 2022 · 4cfae02 · 4cfae02
1 parent 6a50f55
commit 4cfae02
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/internal/tkgi/config.go b/internal/tkgi/config.go
@@ -1,12 +1,9 @@
 package tkgi
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
-	"path/filepath"
 
-	"github.com/ahmetb/kubectx/internal/cmdutil"
 	"gopkg.in/yaml.v3"
 )
 
@@ -18,8 +15,9 @@ type Config struct {
 	} `yaml:"clusters"`
 }
 
+// get method returns content of config.yaml file
 func (c *Config) get() *Config {
-	path, err := tkgiKubectxConfigFile()
+	path, err := getTkgiKubectxFile("config.yaml")
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -38,11 +36,3 @@ func (c *Config) get() *Config {
 	}
 	return c
 }
-
-func tkgiKubectxConfigFile() (string, error) {
-	home := cmdutil.HomeDir()
-	if home == "" {
-		return "", errors.New("HOME or USERPROFILE environment variable not set")
-	}
-	return filepath.Join(home, ".kube", "tkgi-kubectx", "config.yaml"), nil
-}
diff --git a/internal/tkgi/credentials.go b/internal/tkgi/credentials.go
@@ -1,12 +1,9 @@
 package tkgi
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
-	"path/filepath"
 
-	"github.com/ahmetb/kubectx/internal/cmdutil"
 	"gopkg.in/yaml.v3"
 )
 
@@ -18,8 +15,9 @@ type Credentials struct {
 	} `yaml:"credentials"`
 }
 
+// get method returns content of credentials.yaml file
 func (c *Credentials) get() *Credentials {
-	path, err := tkgiKubectxCredentialsFile()
+	path, err := getTkgiKubectxFile("credentials.yaml")
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -38,11 +36,3 @@ func (c *Credentials) get() *Credentials {
 	}
 	return c
 }
-
-func tkgiKubectxCredentialsFile() (string, error) {
-	home := cmdutil.HomeDir()
-	if home == "" {
-		return "", errors.New("HOME or USERPROFILE environment variable not set")
-	}
-	return filepath.Join(home, ".kube", "tkgi-kubectx", "credentials.yaml"), nil
-}
diff --git a/internal/tkgi/util.go b/internal/tkgi/util.go
@@ -3,8 +3,12 @@ package tkgi
 import (
 	"errors"
 	"os"
+	"path/filepath"
+
+	"github.com/ahmetb/kubectx/internal/cmdutil"
 )
 
+// exists returns true if file or folder exists
 func exists(name string) (bool, error) {
 	_, err := os.Stat(name)
 	if err == nil {
@@ -15,3 +19,12 @@ func exists(name string) (bool, error) {
 	}
 	return false, err
 }
+
+// getTkgiKubectxFile returns full path for given file
+func getTkgiKubectxFile(file string) (string, error) {
+	home := cmdutil.HomeDir()
+	if home == "" {
+		return "", errors.New("HOME or USERPROFILE environment variable not set")
+	}
+	return filepath.Join(home, ".kube", "tkgi-kubectx", file), nil
+}