Fixing an issue with EULA prompt (#259)

* Windows yaml file path modified to address error- unsupported protocol schema

cmd/qliksense/eula.go

@@ -85,7 +85,6 @@ func doEnforceEula() {
 	fmt.Println(eulaText)
 	fmt.Print(eulaPrompt)
 	answer := readRuneFromTty()
-	fmt.Printf("%v\n", answer)
 	if strings.ToLower(answer) != "y" {
 		fmt.Println(eulaErrorInstruction)
 		os.Exit(1)
@@ -98,9 +97,9 @@ func readRuneFromTty() string {
 		panic(err)
 	}
 	defer t.Close()
-	answer, err := t.ReadRune()
+	answer, err := t.ReadString()
 	if err != nil {
 		panic(err)
 	}
-	return string(answer)
+	return answer
 }

pkg/api/apis.go

@@ -159,10 +159,10 @@ func (qc *QliksenseConfig) BuildCurrentManifestsRoot(version string) string {
 	return qc.BuildRepoPath(version)
 }
 
-func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR, contextName string) error {
-	crf := qc.GetCRFilePath(contextName)
+func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR) error {
+	crf := qc.GetCRFilePath(cr.GetName())
 	if crf == "" {
-		return errors.New("context name " + contextName + " not found")
+		return errors.New("context name " + cr.GetName() + " not found")
 	}
 
 	return qc.TransformAndWriteCr(cr, crf)
@@ -183,7 +183,7 @@ func (qc *QliksenseConfig) CreateOrWriteCrAndContext(cr *QliksenseCR) error {
 		crf = filepath.Join(cDir, cr.GetName()+".yaml")
 		ctx := Context{
 			Name:   cr.GetName(),
-			CrFile: filepath.Join("contexts", cr.GetName(), cr.GetName()+".yaml"),
+			CrFile: "contexts/" + cr.GetName() + "/" + cr.GetName() + ".yaml", //filepath.Join("contexts", cr.GetName(), cr.GetName()+".yaml"),
 		}
 		qc.AddToContexts(ctx)
 
@@ -198,6 +198,8 @@ func (qc *QliksenseConfig) CreateOrWriteCrAndContext(cr *QliksenseCR) error {
 func (qc *QliksenseConfig) TransformAndWriteCr(cr *QliksenseCR, file string) error {
 	if strings.HasPrefix(cr.Spec.ManifestsRoot, qc.QliksenseHomePath) {
 		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, qc.QliksenseHomePath+"/", "", 1)
+		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, qc.QliksenseHomePath+"\\", "", 1)
+		cr.Spec.ManifestsRoot = strings.Replace(cr.Spec.ManifestsRoot, "\\", "/", -1)
 	}
 	if err := WriteToFile(cr, file); err != nil {
 		return err
@@ -214,7 +216,7 @@ func (qc *QliksenseConfig) AddToContexts(ctx Context) error {
 	return nil
 }
 func (qc *QliksenseConfig) WriteCurrentContextCR(cr *QliksenseCR) error {
-	return qc.WriteCR(cr, qc.Spec.CurrentContext)
+	return qc.WriteCR(cr)
 }
 
 func (qc *QliksenseConfig) IsContextExist(ctxName string) bool {

pkg/api/utils.go

@@ -70,7 +70,7 @@ func ProcessConfigArgs(args []string) ([]*ServiceKeyValue, error) {
 		return nil, err
 	}
 	resultSvcKV := make([]*ServiceKeyValue, len(args))
-	re1 := regexp.MustCompile(`(\w{1,}).(\w{1,})=("*[\w\-?=_/:0-9]+"*)`)
+	re1 := regexp.MustCompile(`(\w{1,}).(\w{1,})=("*[\w\-?=_/:0-9\.]+"*)`)
 	for i, arg := range args {
 		LogDebugMessage("Arg received: %s", arg)
 		result := re1.FindStringSubmatch(arg)

pkg/preflight/dns_check.go

@@ -15,24 +15,24 @@ apiVersion: troubleshoot.replicated.com/v1beta1
 kind: Preflight
 metadata:
   name: cluster-preflight-checks
-  namespace: {{ . }}
+  namespace: {{ .namespace }}
 spec:
   collectors:
     - run: 
         collectorName: spin-up-pod
-        args: ["-z", "-v", "-w 1", "qnginx001", "80"]
+        args: ["-z", "-v", "-w 1", "{{ .serviceName }}", "80"]
         command: ["nc"]
         image: subfuzion/netcat:latest
         imagePullPolicy: IfNotPresent
         name: spin-up-pod-check-dns
-        namespace: {{ . }}
+        namespace: {{ .namespace }}
         timeout: 30s
 
   analyzers:
     - textAnalyze:
         checkName: DNS check
         collectorName: spin-up-pod-check-dns
-        fileName: spin-up-pod.txt
+        fileName: spin-up-pod.log
         regex: succeeded
         outcomes:
           - fail:
@@ -59,8 +59,13 @@ func (qp *QliksensePreflight) CheckDns() error {
 	}
 	api.LogDebugMessage("Temp Yaml file: %s\n", tempYaml.Name())
 
+	appName := "qnginx001"
+	const PreflightChecksDirName = "preflight_checks"
 	b := bytes.Buffer{}
-	err = tmpl.Execute(&b, namespace)
+	err = tmpl.Execute(&b, map[string]string{
+		"namespace":   namespace,
+		"serviceName": appName,
+	})
 	if err != nil {
 		fmt.Println(err)
 		return err
@@ -69,9 +74,6 @@ func (qp *QliksensePreflight) CheckDns() error {
 	tempYaml.WriteString(b.String())
 
 	// creating Kubectl resources
-	appName := "qnginx001"
-	const PreflightChecksDirName = "preflight_checks"
-
 	fmt.Println("Creating resources to run preflight checks")
 
 	// kubectl create deployment

pkg/preflight/preflight_utils.go

@@ -21,7 +21,7 @@ type QliksensePreflight struct {
 
 const (
 	// preflight releases have the same version
-	preflightRelease       = "v0.9.26"
+	preflightRelease       = "v0.9.28"
 	preflightLinuxFile     = "preflight_linux_amd64.tar.gz"
 	preflightMacFile       = "preflight_darwin_amd64.tar.gz"
 	preflightWindowsFile   = "preflight_windows_amd64.zip"
@@ -32,10 +32,12 @@ const (
 var preflightBaseURL = fmt.Sprintf("https://github.com/replicatedhq/troubleshoot/releases/download/%s/", preflightRelease)
 
 func (qp *QliksensePreflight) DownloadPreflight() error {
-	const preflightExecutable = "preflight"
+	preflightExecutable := "preflight"
+	if runtime.GOOS == "windows" {
+		preflightExecutable += ".exe"
+	}
 
 	preflightInstallDir := filepath.Join(qp.Q.QliksenseHome, PreflightChecksDirName)
-	platform := runtime.GOOS
 
 	exists, err := checkInstalled(preflightInstallDir, preflightExecutable)
 	if err != nil {
@@ -60,7 +62,7 @@ func (qp *QliksensePreflight) DownloadPreflight() error {
 	}
 	api.LogDebugMessage("Preflight-checks install Dir: %s exists", preflightInstallDir)
 
-	preflightUrl, preflightFile, err := determinePlatformSpecificUrls(platform)
+	preflightUrl, preflightFile, err := determinePlatformSpecificUrls(runtime.GOOS)
 	if err != nil {
 		err = fmt.Errorf("There was an error when trying to determine platform specific paths")
 		return err
@@ -144,7 +146,8 @@ func initiateK8sOps(opr, namespace string) error {
 }
 
 func invokePreflight(preflightCommand string, yamlFile *os.File) error {
-	arguments := []string{}
+	var arguments []string
+
 	arguments = append(arguments, yamlFile.Name(), "--interactive=false")
 	cmd := exec.Command(preflightCommand, arguments...)
 

pkg/qliksense/context_configs.go

@@ -3,17 +3,18 @@ package qliksense
 import (
 	"crypto/rsa"
 	"fmt"
+
+	"github.com/qlik-oss/k-apis/pkg/config"
+	"github.com/robfig/cron/v3"
+
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"text/tabwriter"
 
-	"github.com/robfig/cron/v3"
-
-	"github.com/qlik-oss/k-apis/pkg/config"
-
 	b64 "encoding/base64"
 
 	ansi "github.com/mattn/go-colorable"
@@ -39,7 +40,7 @@ const (
 // SetSecrets - set-secrets <key>=<value> commands
 func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
+	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
@@ -61,9 +62,7 @@ func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
 		}
 	}
 	// write modified content into context-yaml
-	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
-
-	return nil
+	return qConfig.WriteCR(qliksenseCR)
 }
 
 func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.PublicKey, qliksenseCR *api.QliksenseCR, isSecretSet bool) error {
@@ -131,7 +130,8 @@ func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.Pub
 // SetConfigs - set-configs <key>=<value> commands
 func (q *Qliksense) SetConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
+	qConfig := api.NewQConfig(q.QliksenseHome)
+	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
@@ -144,54 +144,66 @@ func (q *Qliksense) SetConfigs(args []string) error {
 		qliksenseCR.Spec.AddToConfigs(ra.SvcName, ra.Key, ra.Value)
 	}
 	// write modified content into context.yaml
-	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
-
-	return nil
+	return qConfig.WriteCR(qliksenseCR)
 }
 
-func retrieveCurrentContextInfo(q *Qliksense) (*api.QliksenseCR, string, error) {
-	var qliksenseConfig api.QliksenseConfig
-	qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
-	if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
-		log.Println(err)
-		return nil, "", err
-	}
-	currentContext := qliksenseConfig.Spec.CurrentContext
-	api.LogDebugMessage("Current-context from config.yaml: %s", currentContext)
-	if currentContext == "" {
-		// current-context is empty
-		err := fmt.Errorf(`Please run the "qliksense config set-context <context-name>" first before viewing the current context info`)
-		log.Println(err)
-		return nil, "", err
-	}
-	// read the context.yaml file
-	qliksenseCR := &api.QliksenseCR{}
-	if currentContext == "" {
-		// current-context is empty
-		err := fmt.Errorf(`Please run the "qliksense config set-context <context-name>" first before viewing the current context info`)
-		log.Println(err)
-		return nil, "", err
-	}
-	qliksenseContextsFile := filepath.Join(q.QliksenseHome, QliksenseContextsDir, currentContext, currentContext+".yaml")
-	if !api.FileExists(qliksenseContextsFile) {
-		err := fmt.Errorf("Context file does not exist.\nPlease try re-running `qliksense config set-context <context-name>` and then `qliksense config view` again")
-		log.Println(err)
-		return nil, "", err
-	}
-	if err := api.ReadFromFile(qliksenseCR, qliksenseContextsFile); err != nil {
-		log.Println(err)
-		return nil, "", err
-	}
+func caseInsenstiveFieldByName(v reflect.Value, name string) reflect.Value {
+	name = strings.ToLower(name)
+	return v.FieldByNameFunc(func(n string) bool { return strings.ToLower(n) == name })
+}
 
-	api.LogDebugMessage("Read context file: %s, Read QliksenseCR: %v", qliksenseContextsFile, qliksenseCR)
-
-	return qliksenseCR, qliksenseContextsFile, nil
+func validateCR(key string, keySub string, value string, crSpec *api.QliksenseCR) (bool, *api.QliksenseCR) {
+	cr := reflect.ValueOf(crSpec.Spec)
+	keyValid := caseInsenstiveFieldByName(reflect.Indirect(cr), key)
+	if !keyValid.IsValid() {
+		//not in main spec
+		fmt.Println(key, "is an invalid key")
+		return false, crSpec
+	} else if keySub == "" {
+		if key == "rotatekeys" {
+			if _, err := validateInput(value); err != nil {
+				return false, crSpec
+			}
+		}
+	}
+	// checks if it is git or gitops
+	if keySub != "" {
+		if !keyValid.IsNil() {
+			if !caseInsenstiveFieldByName(reflect.Indirect(keyValid), keySub).IsValid() {
+				fmt.Println(keySub, "is an invalid key")
+				return false, crSpec
+			} else {
+				// verify gitops enabled and gitops schedule
+				switch keySub {
+				case "schedule":
+					if _, err := cron.ParseStandard(value); err != nil {
+						fmt.Println("Please enter string with standard cron scheduling syntax ")
+						return false, crSpec
+					}
+				case "enabled":
+					if !strings.EqualFold(value, "yes") && !strings.EqualFold(value, "no") {
+						fmt.Println("Please use yes or no for key enabled")
+						return false, crSpec
+					}
+				}
+			}
+		} else {
+			switch key {
+			case "gitops":
+				crSpec.Spec.GitOps = &config.GitOps{}
+			case "git":
+				crSpec.Spec.Git = &config.Repo{}
+			}
+		}
+	}
+	return true, crSpec
 }
 
 // SetOtherConfigs - set profile/storageclassname/git.repository/manifestRoot commands
 func (q *Qliksense) SetOtherConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
+	qConfig := api.NewQConfig(q.QliksenseHome)
+	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
@@ -205,72 +217,40 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 
 	for _, arg := range args {
 		argsString := strings.Split(arg, "=")
-		switch argsString[0] {
-		case "profile":
-			qliksenseCR.Spec.Profile = argsString[1]
-			api.LogDebugMessage("Current profile after modification: %s ", qliksenseCR.Spec.Profile)
-		case "git.repository":
-			if qliksenseCR.Spec.Git == nil {
-				qliksenseCR.Spec.Git = &config.Repo{}
-			}
-			qliksenseCR.Spec.Git.Repository = argsString[1]
-			api.LogDebugMessage("Current git repository after modification: %s ", qliksenseCR.Spec.Git.Repository)
-		case "storageClassName":
-			qliksenseCR.Spec.StorageClassName = argsString[1]
-			api.LogDebugMessage("Current StorageClassName after modification: %s ", qliksenseCR.Spec.StorageClassName)
-		case "manifestsRoot":
-			qliksenseCR.Spec.ManifestsRoot = argsString[1]
-		case "rotateKeys":
-			rotateKeys, err := validateInput(argsString[1])
-			if err != nil {
-				return err
-			}
-			qliksenseCR.Spec.RotateKeys = rotateKeys
-			api.LogDebugMessage("Current rotateKeys after modification: %s ", qliksenseCR.Spec.RotateKeys)
-		case "gitops.enabled":
-			if qliksenseCR.Spec.GitOps == nil {
-				qliksenseCR.Spec.GitOps = &config.GitOps{}
-			}
-			if strings.EqualFold(argsString[1], "yes") || strings.EqualFold(argsString[1], "no") {
-				qliksenseCR.Spec.GitOps.Enabled = argsString[1]
-				api.LogDebugMessage("Current gitOps enabled status : %s ", qliksenseCR.Spec.GitOps.Enabled)
-			} else {
-				err := fmt.Errorf("Please use yes or no")
-				log.Println(err)
-				return err
-			}
-		case "gitops.schedule":
-			if qliksenseCR.Spec.GitOps == nil {
-				qliksenseCR.Spec.GitOps = &config.GitOps{}
-			}
-			if _, err := cron.ParseStandard(argsString[1]); err != nil {
-				err := fmt.Errorf("Please enter string with standard cron scheduling syntax ")
-				return err
-			}
-			qliksenseCR.Spec.GitOps.Schedule = argsString[1]
-			api.LogDebugMessage("Current gitOps schedule is : %s ", qliksenseCR.Spec.GitOps.Schedule)
-		case "gitops.watchbranch":
-			if qliksenseCR.Spec.GitOps == nil {
-				qliksenseCR.Spec.GitOps = &config.GitOps{}
-			}
-			qliksenseCR.Spec.GitOps.WatchBranch = argsString[1]
-			api.LogDebugMessage("Current gitOps watchbranch is : %s ", qliksenseCR.Spec.GitOps.WatchBranch)
-		case "gitops.image":
-			if qliksenseCR.Spec.GitOps == nil {
-				qliksenseCR.Spec.GitOps = &config.GitOps{}
-			}
-			qliksenseCR.Spec.GitOps.Image = argsString[1]
-			api.LogDebugMessage("Current gitOps image is : %s ", qliksenseCR.Spec.GitOps.Image)
-		default:
-			err := fmt.Errorf("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot, git.repository or gitops arguments to configure the current context")
-			log.Println(err)
-			return err
+		key := strings.ToLower(argsString[0])
+		value := argsString[1]
+		// check if key is for git or gitops (sub objects)
+		keySplit := strings.Split(key, ".")
+		key = keySplit[0]
+		keySub := ""
+
+		if len(keySplit) == 2 {
+			keySub = strings.ToLower(keySplit[1])
 		}
+
+		valid := true
+		valid, qliksenseCR = validateCR(key, keySub, value, qliksenseCR)
+		field := caseInsenstiveFieldByName(reflect.Indirect(reflect.ValueOf(qliksenseCR.Spec)), key)
+		if !valid {
+			err := fmt.Errorf("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot, git.repository or gitops arguments to configure the current context")
+			return err
+		} else if strings.EqualFold("", keySub) {
+			// set spec for everything excluding git and gitops
+			if field.CanSet() {
+				field.SetString(value)
+			}
+		} else {
+			// set spec for git or gitops
+			subField := caseInsenstiveFieldByName(reflect.Indirect(field), keySub)
+			if subField.CanSet() {
+				subField.SetString(value)
+			}
+		}
+
+		fmt.Println(chalk.Green.Color("Successfully added to Custom Resource Spec"))
 	}
 	// write modified content into context.yaml
-	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
-
-	return nil
+	return qConfig.WriteCR(qliksenseCR)
 }
 
 // SetContextConfig - set the context for qliksense kubernetes resources to live in
@@ -496,7 +476,7 @@ func readTargetfile(targetFile string) ([]byte, error) {
 
 func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullUsername, pullPassword string) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
+	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
@@ -523,7 +503,7 @@ func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullU
 	}
 
 	qliksenseCR.Spec.AddToConfigs("qliksense", imageRegistryConfigKey, registry)
-	return api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+	return qConfig.WriteCR(qliksenseCR)
 }
 
 func (q *Qliksense) SetEulaAccepted() error {

pkg/qliksense/context_configs_test.go

@@ -224,7 +224,8 @@ func Test_retrieveCurrentContextInfo(t *testing.T) {
 	q := &Qliksense{
 		QliksenseHome: testDir,
 	}
-	_, _, err := retrieveCurrentContextInfo(q)
+	qConfig := api.NewQConfig(q.QliksenseHome)
+	_, err := qConfig.GetCurrentCR()
 	if err != nil {
 		t.FailNow()
 	}
@@ -327,7 +328,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitops.enabled=yes", "gitops.schedule=30 * * * *"},
+				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitops.enabled=yes", "gitops.schedule=30 * * * *", "git.repository=master", "git.username=foo", "git.accesstoken=1234"},
 			},
 			wantErr: false,
 		},
@@ -337,7 +338,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"someconfig=somevalue, gitops.schedule=bar", "gitops.enabled=bar"},
+				args: []string{"someconfig=somevalue, gitops.schedule=bar", "gitops.enabled=bar", "git.foo=bar", "rotatekeys=bar"},
 			},
 			wantErr: true,
 		},