Upgrading kustomize API to version qlik/v0.0.27 (#398)

Signed-off-by: Foysal Iqbal <mqb@qlik.com>

cmd/qliksense/crds.go

@@ -12,31 +12,35 @@ var crdsCmd = &cobra.Command{
 }
 
 func crdsViewCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{}
+	opts := &qliksense.CrdCommandOptions{
+		All: true,
+	}
 	c := &cobra.Command{
 		Use:   "view",
-		Short: "View CRDs for qliksense application. use view --all to see opearator crd as well ",
-		Long:  `View CRDs for qliksense application. use view --all to see opearator crd as well`,
+		Short: "View CRDs for qliksense application. Use view --all=false to exclude the operator CRD",
+		Long:  "View CRDs for qliksense application. Use view --all=false to exclude the operator CRD",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.ViewCrds(opts)
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "", opts.All, "If set to false, then the operator CRD is excluded")
 	return c
 }
 
 func crdsInstallCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.CrdCommandOptions{}
+	opts := &qliksense.CrdCommandOptions{
+		All: true,
+	}
 	c := &cobra.Command{
 		Use:   "install",
-		Short: "Install CRDs fro Qliksense application. Use install --all to include operator crd",
-		Long:  `Install CRDs fro Qliksense application. Use install --all to include operator crd`,
+		Short: "Install CRDs for Qliksense application. Use install --all=false to exclude the operator CRD",
+		Long:  "Install CRDs for Qliksense application. Use install --all=false to exclude the operator CRD",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return q.InstallCrds(opts)
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "", opts.All, "If set to false, then the operator CRD is excluded")
 	return c
 }

go.mod

@@ -10,7 +10,7 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.17.0
 	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
 
-	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd
+	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200604192606-17370c1af57b
 )
 
 require (

go.sum

@@ -885,14 +885,10 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qlik-oss/k-apis v0.1.2 h1:BBcrXl+NxdsvuRsZuJbvIFxMv5QIXqWBzhXOcr5KUX8=
-github.com/qlik-oss/k-apis v0.1.2/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
-github.com/qlik-oss/k-apis v0.1.4 h1:YXnjKXm/yhPblzYYyVCtD0dNbIkLPLlDdBKnjeYW0IY=
-github.com/qlik-oss/k-apis v0.1.4/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
 github.com/qlik-oss/k-apis v0.1.5 h1:IeqHuF1IIQCsuSmsUhL7GjdfkOFsNgh3z2UyX59GTsk=
 github.com/qlik-oss/k-apis v0.1.5/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd h1:dYd6duTr54L7OqykGkd3Z+336frAvzsibWNYruYkYVc=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200514233516-4ac83864b7bd/go.mod h1:zh3yFgE5zFk1kreqzVyyj1eXyIxQJT53l4zSg8Wt4SA=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200604192606-17370c1af57b h1:UqyMR9WA/MbUxCOaaDFk8D2VwM3fG98foDU5nG2HPoM=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200604192606-17370c1af57b/go.mod h1:zh3yFgE5zFk1kreqzVyyj1eXyIxQJT53l4zSg8Wt4SA=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=

pkg/api/kubectl.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-// KubectlApply create resoruces in the provided namespace,
+// KubectlApply create resources in the provided namespace,
 // if namespace="" then use whatever the kubectl default is
 func KubectlApply(manifests, namespace string) error {
 	return kubectlOperation(manifests, "apply", namespace)
@@ -19,7 +19,7 @@ func KubectlApplyVerbose(manifests, namespace string, verbose bool) error {
 	return kubectlOperationVerbose(manifests, "apply", namespace, verbose)
 }
 
-// KubectlDelete delete resoruces in the provided namespace,
+// KubectlDelete delete resources in the provided namespace,
 // if namespace="" then use whatever the kubectl default is
 func KubectlDelete(manifests, namespace string) error {
 	return kubectlOperation(manifests, "delete", namespace)

pkg/api/utils.go

@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
 
@@ -78,8 +79,9 @@ func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, e
 		if len(first) != 2 {
 			return nil, notValidErr
 		}
-		second := strings.SplitN(first[0], ".", 2)
-		if len(second) != 2 {
+
+		svcKey := getSvcAndKey(first[0])
+		if len(svcKey) != 2 {
 			return nil, notValidErr
 		}
 		resultValue := strings.Trim(first[1], "\"")
@@ -91,14 +93,33 @@ func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, e
 			}
 		}
 		resultSvcKV[i] = &ServiceKeyValue{
-			SvcName: second[0],
-			Key:     second[1],
+			SvcName: svcKey[0],
+			Key:     svcKey[1],
 			Value:   resultValue,
 		}
 	}
 	return resultSvcKV, nil
 }
 
+// input should be svc[key]
+func getSvcAndKey(arg string) []string {
+	// for key
+	re := regexp.MustCompile(`\[(.*)\]`)
+	// for service
+	re2 := regexp.MustCompile(`(.*)\[`)
+
+	keys := re.FindStringSubmatch(arg)
+
+	svcs := re2.FindStringSubmatch(arg)
+	if len(svcs) != 2 || len(keys) != 2 {
+		return strings.SplitN(arg, ".", 2)
+	}
+	if svcs[1] == "" || keys[1] == "" {
+		return []string{}
+	}
+	return []string{svcs[1], keys[1]}
+}
+
 func ExecuteTaskWithBlinkingStdoutFeedback(task func() (interface{}, error), feedback string) (result interface{}, err error) {
 	taskDone := make(chan bool)
 	go func() {

pkg/api/utils_test.go

@@ -45,3 +45,24 @@ func contains(arr []string, str string) bool {
 	}
 	return false
 }
+
+func TestGetSvcAndKey(t *testing.T) {
+	s1 := "qliksense[tls.cert]"
+	sa := getSvcAndKey(s1)
+	if sa[0] != "qliksense" || sa[1] != "tls.cert" {
+		t.Fail()
+		t.Logf("expected service: qliksense but got %s", sa[0])
+		t.Logf("expected key: tls.cert but got %s", sa[1])
+	}
+	s1 = "qliksense-idps.tls"
+	sa = getSvcAndKey(s1)
+	for _, s := range sa {
+		t.Logf("|%s|", s)
+	}
+	if sa[0] != "qliksense-idps" || sa[1] != "tls" {
+		t.Fail()
+		t.Logf("expected service: qliksense-idps but got %s", sa[0])
+		t.Logf("expected key: tls but got %s", sa[1])
+	}
+
+}

pkg/qliksense/config.go

@@ -39,9 +39,9 @@ func (q *Qliksense) ConfigApplyQK8s() error {
 		return errors.New(agreementTempalte + "\nPlease do $ qliksense config set-configs qliksense.acceptEULA=yes\n")
 	}
 
-	// create patch dependent resoruces
+	// create patch dependent resources
 	fmt.Println("Installing resources used by the kuztomize patch")
-	if err := q.createK8sResoruceBeforePatch(qcr); err != nil {
+	if err := q.createK8sResourceBeforePatch(qcr); err != nil {
 		return err
 	}
 

pkg/qliksense/install.go

@@ -69,7 +69,7 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 		fmt.Println("error verifying whether CRDs are installed", err)
 		return err
 	} else if !installed {
-		return errors.New(`please install CRDs by executing: $ qliksense crds install --all`)
+		return errors.New(`please install CRDs by executing: $ qliksense crds install`)
 	}
 
 	if err := applyImagePullSecret(qConfig); err != nil {
@@ -87,9 +87,9 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 		return err
 	}
 
-	// create patch dependent resoruces
+	// create patch dependent resources
 	fmt.Println("Installing resources used by the kuztomize patch")
-	if err := q.createK8sResoruceBeforePatch(qcr); err != nil {
+	if err := q.createK8sResourceBeforePatch(qcr); err != nil {
 		return err
 	}
 
@@ -207,7 +207,7 @@ func (q *Qliksense) applyCR(cr *qapi.QliksenseCR) error {
 	return nil
 }
 
-func (q *Qliksense) createK8sResoruceBeforePatch(qcr *qapi.QliksenseCR) error {
+func (q *Qliksense) createK8sResourceBeforePatch(qcr *qapi.QliksenseCR) error {
 	for svc, nvs := range qcr.Spec.Secrets {
 		for _, nv := range nvs {
 			if isK8sSecretNeedToCreate(nv) {

pkg/qliksense/install_test.go

@@ -18,7 +18,7 @@ import (
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 )
 
-func TestCreateK8sResoruceBeforePatch(t *testing.T) {
+func TestCreateK8sResourceBeforePatch(t *testing.T) {
 	td := setup()
 	sampleCr := `
 apiVersion: qlik.com/v1
@@ -66,7 +66,7 @@ spec:
 		t.Log(err)
 		t.FailNow()
 	}
-	if err = q.createK8sResoruceBeforePatch(cr); err != nil {
+	if err = q.createK8sResourceBeforePatch(cr); err != nil {
 		t.Log(err)
 		t.FailNow()
 	}

pkg/qliksense/operator.go

@@ -41,7 +41,7 @@ func (q *Qliksense) getYamlFromPackrFile(packrFile string) string {
 	if err != nil {
 		fmt.Printf("Cannot read file %s", packrFile)
 	}
-	return fmt.Sprintln("#soruce: " + packrFile + "\n\n" + s + "\n---")
+	return fmt.Sprintln("#source: " + packrFile + "\n\n" + s + "\n---")
 }
 func (q *Qliksense) getFileList(resourceType string) []string {
 	var resList []string