Merge pull request #260 from qlik-oss/license

Add License

LICENSE

@@ -0,0 +1,191 @@
+
+                                Apache License
+                        Version 2.0, January 2004
+                    https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+        Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+        stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+        that You distribute, all copyright, patent, trademark, and
+        attribution notices from the Source form of the Work,
+        excluding those notices that do not pertain to any part of
+        the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+        distribution, then any Derivative Works that You distribute must
+        include a readable copy of the attribution notices contained
+        within such NOTICE file, excluding those notices that do not
+        pertain to any part of the Derivative Works, in at least one
+        of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or
+        documentation, if provided along with the Derivative Works; or,
+        within a display generated by the Derivative Works, if and
+        wherever such third-party notices normally appear. The contents
+        of the NOTICE file are for informational purposes only and
+        do not modify the License. You may add Your own attribution
+        notices within Derivative Works that You distribute, alongside
+        or as an addendum to the NOTICE text from the Work, provided
+        that such additional attribution notices cannot be construed
+        as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright 2019 QlikTech International AB
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

cmd/qliksense/context.go

@@ -115,18 +115,15 @@ func deleteContextConfigCmd(q *qliksense.Qliksense) *cobra.Command {
 	var (
 		cmd *cobra.Command
 	)
-	skipConfirmation := false
+
 	cmd = &cobra.Command{
 		Use:     "delete-context",
 		Short:   "deletes a specific context locally (not in-cluster)",
 		Example: `qliksense config delete-contexts <context_name>`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.DeleteContextConfig(args, skipConfirmation)
+			return q.DeleteContextConfig(args)
 		},
 	}
-	f := cmd.Flags()
-
-	f.BoolVar(&skipConfirmation, "yes", skipConfirmation, "skips confirmation")
 	return cmd
 }
 

cmd/qliksense/crds.go

@@ -22,7 +22,7 @@ func crdsViewCmd(q *qliksense.Qliksense) *cobra.Command {
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "a", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
 	return c
 }
 

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
 }

go.mod

@@ -41,7 +41,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/qlik-oss/k-apis v0.0.22
+	github.com/qlik-oss/k-apis v0.0.25
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
 	github.com/spf13/cobra v0.0.6

go.sum

@@ -849,6 +849,12 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/qlik-oss/k-apis v0.0.22 h1:tntQEeRqDYkBi2Ku5+xt7ABGMeFPck7+DOKrHUnpzwI=
 github.com/qlik-oss/k-apis v0.0.22/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
+github.com/qlik-oss/k-apis v0.0.23 h1:w4lj2PHDTtKkukgoT2a6/jAY3NkkI/V0vNetkRzEXXY=
+github.com/qlik-oss/k-apis v0.0.23/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
+github.com/qlik-oss/k-apis v0.0.24 h1:cBXggOMeEaUpxO91TfI2jQToh5r/ojBPcjuJM7cBRIM=
+github.com/qlik-oss/k-apis v0.0.24/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
+github.com/qlik-oss/k-apis v0.0.25 h1:OF4YZDklkNyvPKKLOQ4a8JMQaFaqD/vevl6wOOzlhek=
+github.com/qlik-oss/k-apis v0.0.25/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
 github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9 h1:iqeqTS4zjp6rPEaxmFB7pemA2CMjOEN5dYSXZaQ82uw=
 github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9/go.mod h1:OCt7FTrRVHj4kmR2xLJJUIqu00BTr6GeF09hSmM17Kw=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=

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/kubectl.go

@@ -98,20 +98,21 @@ func kubectlOperation(manifests string, oprName string, namespace string) error
 	return nil
 }
 
-func KubectlDirectOps(opr []string, namespace string) error {
+func KubectlDirectOps(opr []string, namespace string) (string, error) {
 	arguments := []string{}
 	if namespace != "" {
 		arguments = append(arguments, "-n", namespace)
 	}
 	arguments = append(arguments, opr...)
-
+	var out bytes.Buffer
 	cmd := exec.Command("kubectl", arguments...)
 	LogDebugMessage("Kubectl command: %s %v\n", "kubectl", arguments)
 	sterrBuffer := &bytes.Buffer{}
 	cmd.Stderr = sterrBuffer
-	cmd.Stdout = os.Stdout
+	cmd.Stdout = &out
 	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("kubectl %v failed with: %v, %v\n", opr, err, sterrBuffer.String())
+		return "", fmt.Errorf("kubectl %v failed with: %v, %v\n", opr, err, sterrBuffer.String())
 	}
-	return nil
+	s := out.String()
+	return s, nil
 }

pkg/api/kubectl_test.go

@@ -24,7 +24,7 @@ func TestKubectlDirectOps(t *testing.T) {
 	ns := GetKubectlNamespace()
 	opr := fmt.Sprintf("version")
 	opr1 := strings.Fields(opr)
-	err := KubectlDirectOps(opr1, ns)
+	_, err := KubectlDirectOps(opr1, ns)
 	if err != nil {
 		t.Log(err)
 		t.Fail()

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
@@ -135,7 +137,7 @@ func determinePlatformSpecificUrls(platform string) (string, string, error) {
 
 func initiateK8sOps(opr, namespace string) error {
 	opr1 := strings.Fields(opr)
-	err := api.KubectlDirectOps(opr1, namespace)
+	_, err := api.KubectlDirectOps(opr1, namespace)
 	if err != nil {
 		fmt.Println(err)
 		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/apply.go

@@ -15,8 +15,29 @@ func (q *Qliksense) ApplyCRFromReader(r io.Reader, opts *InstallCommandOptions,
 	if err != nil {
 		return err
 	}
-	if err := q.InstallQK8s(cr.GetLabelFromCr("version"), opts, keepPatchFiles); err != nil {
-		return err
+	if IsQliksenseInstalled(cr.GetName()) {
+		// it is needed in case want to upgrade from one version to another
+		if cr.Spec.ManifestsRoot == "" && cr.Spec.Git == nil {
+			if err := q.FetchQK8s(cr.GetLabelFromCr("version")); err != nil {
+				return err
+			}
+		}
+		return q.UpgradeQK8s(keepPatchFiles)
 	}
-	return nil
+	return q.InstallQK8s(cr.GetLabelFromCr("version"), opts, keepPatchFiles)
+}
+
+func IsQliksenseInstalled(crName string) bool {
+	args := []string{
+		"get",
+		"qliksense",
+		crName,
+		"-ogo-template",
+		`--template='{{ .metadata.name}}'`,
+	}
+	_, err := qapi.KubectlDirectOps(args, "")
+	if err != nil {
+		return false
+	}
+	return true
 }

pkg/qliksense/confirmation.go

@@ -1,24 +0,0 @@
-package qliksense
-
-import (
-	"fmt"
-	"log"
-	"strings"
-)
-
-func AskForConfirmation(s string) bool {
-	for {
-		fmt.Printf("%s [y/n]: ", s)
-		var response string
-		_, err := fmt.Scanln(&response)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if strings.EqualFold(response, "y") || strings.EqualFold(response, "yes") {
-			return true
-		} else if strings.EqualFold(response, "n") || strings.EqualFold(response, "no") {
-			return false
-		}
-	}
-}

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
@@ -312,7 +292,7 @@ func (q *Qliksense) ListContextConfigs() error {
 	return nil
 }
 
-func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
+func (q *Qliksense) DeleteContextConfig(args []string) error {
 	if len(args) == 1 {
 		qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
 		var qliksenseConfig api.QliksenseConfig
@@ -354,17 +334,9 @@ func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
 					}
 					newLength := len(qliksenseConfig.Spec.Contexts)
 					if currentLength != newLength {
-						ans := flag
-						if ans == false {
-							ans = AskForConfirmation("Are You Sure? ")
-						}
-						if ans == true {
-							api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
-							fmt.Fprintln(out, chalk.Yellow.Color(chalk.Underline.TextStyle("Warning: Active resources may still be running in-cluster")))
-							fmt.Fprintln(out, chalk.Green.Color("Successfully deleted context: "), chalk.Bold.TextStyle(args[0]))
-						} else {
-							return nil
-						}
+						api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
+						fmt.Fprintln(out, chalk.Yellow.Color(chalk.Underline.TextStyle("Warning: Active resources may still be running in-cluster")))
+						fmt.Fprintln(out, chalk.Green.Color("Successfully deleted context: "), chalk.Bold.TextStyle(args[0]))
 					} else {
 						err := fmt.Errorf(chalk.Red.Color("Context not found"))
 						return err
@@ -382,6 +354,12 @@ func (q *Qliksense) DeleteContextConfig(args []string, flag bool) error {
 
 // SetUpQliksenseDefaultContext - to setup dir structure for default qliksense context
 func (q *Qliksense) SetUpQliksenseDefaultContext() error {
+	if api.FileExists(filepath.Join(q.QliksenseHome, "config.yaml")) {
+		qliksenseConfig := api.NewQConfig(q.QliksenseHome)
+		if qliksenseConfig.IsContextExist(DefaultQliksenseContext) {
+			return nil
+		}
+	}
 	return q.SetUpQliksenseContext(DefaultQliksenseContext)
 }
 
@@ -412,7 +390,8 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string) error {
 	}
 
 	if qliksenseConfig.IsContextExist(contextName) {
-		return nil
+		qliksenseConfig.Spec.CurrentContext = contextName
+		return qliksenseConfig.Write()
 	}
 	qliksenseCR := &api.QliksenseCR{}
 	qliksenseCR.AddCommonConfig(contextName)
@@ -504,7 +483,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
 	}
@@ -531,7 +510,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,
 		},
@@ -928,10 +929,9 @@ func TestDeleteContexts(t *testing.T) {
 			q := New(tt.args.qlikSenseHome)
 			var arg []string
 			arg = append(arg, tt.args.contextName)
-			if err := q.DeleteContextConfig(arg, true); (err != nil) != tt.wantErr {
+			if err := q.DeleteContextConfig(arg); (err != nil) != tt.wantErr {
 				t.Errorf("DeleteContext() error = %v, wantErr %v", err, tt.wantErr)
 			}
-
 		})
 	}
 

pkg/qliksense/install.go

@@ -94,10 +94,11 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 			return q.applyCR(dcr)
 		}
 	}
-	if version != "" { // no need to fetch manifest root already set by some other way
-		if err := fetchAndUpdateCR(qConfig, version); err != nil {
-			return err
-		}
+	if version == "" {
+		version = qcr.GetLabelFromCr("version")
+	}
+	if err := fetchAndUpdateCR(qConfig, version); err != nil {
+		return err
 	}
 
 	qcr, err = qConfig.GetCurrentCR()

pkg/qliksense/load_cr.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"os"
+	"strings"
 
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
@@ -41,9 +41,10 @@ func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingCo
 		if !overwriteExistingContext {
 			return "", errors.New("Context with name: " + cr.GetName() + " already exists. " +
 				"Please delete the existing context first using the delete-context command or specify the --overwrite flag.")
-		} else if err := os.RemoveAll(qConfig.GetContextPath(cr.GetName())); err != nil {
-			return "", err
 		}
+		// else if err := os.RemoveAll(qConfig.GetContextPath(cr.GetName())); err != nil {
+		// 	return "", err
+		// }
 	}
 	if err := qConfig.CreateContextDirs(cr.GetName()); err != nil {
 		return "", err
@@ -69,8 +70,15 @@ func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingCo
 		}
 	}
 
+	// update manifestsRoot in case already exist
+	if existingCr, err := qConfig.GetCR(cr.GetName()); err == nil {
+		// cr exists, so update the manifestsRoot if version exist
+		newV := cr.GetLabelFromCr("version")
+		if strings.HasSuffix(existingCr.Spec.ManifestsRoot, newV) {
+			cr.Spec.ManifestsRoot = existingCr.Spec.ManifestsRoot
+		}
+	}
 	// write to disk
-
 	if err = qConfig.CreateOrWriteCrAndContext(cr); err != nil {
 		return "", err
 	}

pkg/qliksense/upgrade.go

@@ -28,21 +28,20 @@ func (q *Qliksense) UpgradeQK8s(keepPatchFiles bool) error {
 		return err
 	}
 	qcr.Spec.RotateKeys = "no"
-	if dcr, err := qConfig.GetDecryptedCr(qcr); err != nil {
-		return err
-	} else if err := q.applyConfigToK8s(dcr); err != nil {
-		fmt.Println("cannot do kubectl apply on manifests")
-		return err
-	}
 
-	fmt.Println("Install operator CR into cluster")
-	r, err := qcr.GetString()
+	dcr, err := qConfig.GetDecryptedCr(qcr)
 	if err != nil {
 		return err
 	}
-	if err := qapi.KubectlApply(r, ""); err != nil {
-		fmt.Println("cannot do kubectl apply on operator CR")
+	if dcr.Spec.Git != nil && dcr.Spec.Git.Repository != "" {
+		// fetching and applying manifest will be in the operator controller
+		// get decrypted cr
+		return q.applyCR(dcr)
 	}
-	return nil
-
+	err = q.applyConfigToK8s(dcr)
+	if err != nil {
+		fmt.Println("cannot do kubectl apply on manifests")
+		return err
+	}
+	return q.applyCR(dcr)
 }