Merge pull request #2 from jjuarez/openshift-mapping

OpenShift mapping

Makefile

@@ -30,3 +30,6 @@ test: ## Testing all the things
 clean: ## Clean the generated products
 	@$(GOCLEAN)
 	@rm -f $(BINARY)
+
+.PHONY: all
+all: clean build test

cmd/root.go

@@ -19,22 +19,25 @@ func loadFile(fileName string) ([]byte, error) {
 	var err error
 	var fileContent []byte
 
+	// The parameter should be a valid filename
 	if fileName == "-" {
-		fileContent, err = ioutil.ReadAll(os.Stdin)
-		if err != nil {
+		// We have to deal with the standard input
+		if fileContent, err = ioutil.ReadAll(os.Stdin); err != nil {
 			return nil, fmt.Errorf("something went wrong reading from stdin")
 		}
 
 		return fileContent, nil
-	} else {
+	}
 
-		fileContent, err = ioutil.ReadFile(fileName)
-		if err != nil {
-			return nil, fmt.Errorf("something went wrong reading from file: %s", fileName)
-		}
+	if _, err := os.Stat(fileName); err != nil {
+		return nil, fmt.Errorf("The file: %s does not exists", fileName)
+	}
 
-		return fileContent, nil
+	if fileContent, err = ioutil.ReadFile(fileName); err != nil {
+		return nil, fmt.Errorf("something went wrong reading from file: %s", fileName)
 	}
+
+	return fileContent, nil
 }
 
 func unmarshalYAML(fileContent []byte) (*model.KubeConfig, error) {
@@ -81,14 +84,14 @@ func exit(err error, exitCode codes.Code) {
 	os.Exit(int(exitCode))
 }
 
-var InputFile string
+var inputFile string
 
 var rootCmd = &cobra.Command{
 	Use:   "cat your_iks_kubeconfig.yaml|ikscc",
 	Short: "IKS context cleaner",
 	Long:  "Small utility to clean the IBMCloud IKS kubeconfig context names",
 	Run: func(cmd *cobra.Command, args []string) {
-		fileContent, err := loadFile(InputFile)
+		fileContent, err := loadFile(inputFile)
 		if err != nil {
 			exit(err, codes.ReadError)
 		}
@@ -107,13 +110,14 @@ var rootCmd = &cobra.Command{
 	},
 }
 
+// Execute an entrypoint (TBC)
 func Execute() {
 	cobra.CheckErr(rootCmd.Execute())
 }
 
 func init() {
 	cobra.OnInitialize(initConfig)
-	rootCmd.PersistentFlags().StringVarP(&InputFile, "file", "f", "", "Input file to clean")
+	rootCmd.PersistentFlags().StringVarP(&inputFile, "file", "f", "", "YAML k8s context file to clean")
 
 	// Streams
 	rootCmd.SetOut(os.Stdout)

model/kubeconfig.go

@@ -8,6 +8,9 @@ type Cluster struct {
 	Server                   string `yaml:"server,omitempty"`
 }
 
+//
+// Clusters the collection of the cluster included in a context
+//
 type Clusters []struct {
 	Cluster Cluster `yaml:"cluster,omitempty"`
 	Name    string  `yaml:"name,omitempty"`
@@ -44,7 +47,9 @@ type UsersAuthProvider struct {
 }
 
 type User struct {
-	AuthProvider UsersAuthProvider `yaml:"auth-provider,omitempty"`
+	AuthProvider          UsersAuthProvider `yaml:"auth-provider,omitempty"`
+	ClientCertificateDAta string            `yaml:"client-certificate-data,omitempty"`
+	ClientKeyData         string            `yaml:"client-key-data,omitempty"`
 }
 
 type Users []struct {
@@ -59,11 +64,11 @@ type Preferences struct {
 // KubeConfig structure
 //
 type KubeConfig struct {
-	ApiVersion     string      `yaml:"apiVersion,omitempty"`
-	Kind           string      `yaml:"kind,omitempty"`
+	ApiVersion     string      `yaml:"apiVersion"`
+	Kind           string      `yaml:"kind"`
 	Preferences    Preferences `yaml:"preferences,omitempty"`
-	Clusters       Clusters    `yaml:"clusters,omitempty"`
-	Contexts       Contexts    `yaml:"contexts,omitempty"`
+	Clusters       Clusters    `yaml:"clusters"`
+	Contexts       Contexts    `yaml:"contexts"`
 	CurrentContext string      `yaml:"current-context,omitempty"`
 	Users          Users       `yaml:"users,omitempty"`
 }

tests/fixtures/openshift_sample.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    server: https://pb5e6c0180c97826be91f-6b64a6ccc9c596bf59a86625d8fa2202-ce00.us-east.satellite.appdomain.cloud:32483
+  name: sat-pok-qnet-prod/c662mkmw0dj72umm0bt0
+contexts:
+- context:
+    cluster: sat-pok-qnet-prod/c662mkmw0dj72umm0bt0
+    namespace: default
+    user: admin/c662mkmw0dj72umm0bt0
+  name: sat-pok-qnet-prod/c662mkmw0dj72umm0bt0/admin
+current-context: sat-pok-qnet-prod/c662mkmw0dj72umm0bt0/admin
+kind: Config
+preferences: {}
+users:
+- name: admin/c662mkmw0dj72umm0bt0
+  user:
+    client-certificate-data: REDACTED
+    client-key-data: REDACTED