go.sum

.circleci/config.yml

@@ -0,0 +1,43 @@
+# Golang CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:stretch
+    working_directory: /go/src/github.com/qlik-oss/sense-installer
+    steps:
+      - checkout
+      - run: make test
+      - run: make build
+  build_release:
+    docker:
+      - image: circleci/golang:stretch
+    working_directory: /go/src/github.com/qlik-oss/sense-installer
+    steps:
+      - checkout
+      - run: make test
+      - run: make xbuild-all
+      - run:
+          name: "Publish Release on GitHub"
+          command: |
+            go get github.com/tcnksm/ghr
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG}  /go/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/bin/${CIRCLE_TAG}/
+workflows:
+  version: 2
+  commit:
+    jobs:
+      - build:
+          filters:
+            tags:
+              ignore: /^v.*/
+  build_release:
+    jobs:
+      - build_release:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+

.github/workflows/build.yml

@@ -1,27 +0,0 @@
-name: Build Sense installer
-
-on: [pull_request]
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Go 1.13
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13
-
-    - uses: actions/checkout@v2
-    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-    - name: Set GOPATH
-        # temporary fix
-        # see https://github.com/actions/setup-go/issues/14
-      run: |
-        echo "##[set-env name=GOPATH;]$(dirname $GITHUB_WORKSPACE)"
-        echo "##[add-path]$(dirname $GITHUB_WORKSPACE)/bin"
-      shell: bash
-
-    - run: make test
-    - run: make xbuild-all

.github/workflows/mkdocs.yml

@@ -4,8 +4,8 @@ on:
     branches:
       - master
     paths:
-      - 'docs/**'
+      - docs/
-      - 'mkdocs.yml'
+      - mkdocs.yml
 
 jobs:
   build:

.github/workflows/release.yml

@@ -1,37 +0,0 @@
-name: Release Sense installer binaries
-
-on: 
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-
-  release:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Go 1.13
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13
-
-    - uses: actions/checkout@v2
-    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* # Needed in makefile for versioning
-    - name: Set GOPATH
-        # temporary fix
-        # see https://github.com/actions/setup-go/issues/14
-      run: |
-        echo "##[set-env name=GOPATH;]$(dirname $GITHUB_WORKSPACE)"
-        echo "##[add-path]$(dirname $GITHUB_WORKSPACE)/bin"
-      shell: bash
-
-    - run: make test
-    - run: make xbuild-all
-
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        files: bin/**/*

.gitignore

@@ -6,6 +6,3 @@ pkg/qliksense/packrd
 pkg/qliksense/qliksense-packr.go
 pkg/qliksense/docker-registry
 /pkg/qliksense/tests
-.DS_Store
-
-.idea/

LICENSE

@@ -1,191 +0,0 @@
-
-                                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.

Makefile

@@ -43,46 +43,31 @@ build: clean generate
 	go build -ldflags '$(LDFLAGS)' -tags "$(BUILDTAGS)" -o $(BINDIR)/$(MIXIN)$(FILE_EXT) ./cmd/$(MIXIN)
 	$(MAKE) clean
 
-.PHONY: test-setup
-test-setup: clean generate
-ifeq ($(shell ${WHICH} docker-registry 2>${DEVNUL}),)
-	$(eval TMP-docker-distribution := $(shell mktemp -d))
-	git clone https://github.com/docker/distribution.git $(TMP-docker-distribution)/docker-distribution
-	cd $(TMP-docker-distribution)/docker-distribution; git checkout -b v2.7.1; make
-	cp $(TMP-docker-distribution)/docker-distribution/bin/registry pkg/qliksense/docker-registry
-	-rm -rf $(TMP-docker-distribution)
-endif
-
-.PHONY: test-short
-test-short: test-setup
-	go test -short -count=1 -tags "$(BUILDTAGS)" -v ./...
-	$(MAKE) clean
-
 .PHONY: test
-test: test-setup
+test: clean generate
-	go test -count=1 -tags "$(BUILDTAGS)" -v ./...
+ifeq ($(shell ${WHICH} docker-registry 2>${DEVNUL}),)
+	$(eval TMP := $(shell mktemp -d))
+	git clone https://github.com/docker/distribution.git $(TMP)/docker-distribution
+	cd $(TMP)/docker-distribution; git checkout -b v2.7.1; make
+	cp $(TMP)/docker-distribution/bin/registry pkg/qliksense/docker-registry
+	-rm -rf $(TMP)/docker-distribution
+endif
+	go test -short -count=1 -tags "$(BUILDTAGS)" -v ./...
 	$(MAKE) clean
 
 xbuild-all: clean generate
 	$(foreach OS, $(SUPPORTED_PLATFORMS), \
-		$(foreach ARCH, $(SUPPORTED_ARCHES), \
+    	$(foreach ARCH, $(SUPPORTED_ARCHES), \
-			$(MAKE) $(MAKE_OPTS) CLIENT_PLATFORM=$(OS) CLIENT_ARCH=$(ARCH) MIXIN=$(MIXIN) xbuild; \
+            	$(MAKE) $(MAKE_OPTS) CLIENT_PLATFORM=$(OS) CLIENT_ARCH=$(ARCH) MIXIN=$(MIXIN) xbuild; \
-	))
+    	))
-
 	$(MAKE) clean
-
 xbuild: $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
-
 $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT):
 	mkdir -p $(dir $@)
 	GOOS=$(CLIENT_PLATFORM) GOARCH=$(CLIENT_ARCH) $(XBUILD) -o $@ ./cmd/$(MIXIN)
-
-ifeq ($(CLIENT_PLATFORM),windows)
-	zip $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH).zip $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
-else
 	tar -czvf $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH).tar.gz -C $(BINDIR)/$(VERSION)/ $(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
-endif
+	#tar -C $(BINDIR)/$(VERSION)/ -cvf $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH).tar.gz $(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
-	upx $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
+
 
 generate: get-crds packr2
 	go generate ./...
@@ -99,16 +84,12 @@ clean-packr: packr2
 	cd pkg/qliksense && packr2 clean
 
 get-crds:
-ifeq ($(QLIKSENSE_OPERATOR_DIR),)
+	$(eval TMP := $(shell mktemp -d))
-	$(eval TMP-operator := $(shell mktemp -d))
+	git clone git@github.com:qlik-oss/qliksense-operator.git -b ms-3 $(TMP)/operator
-	git clone https://github.com/qlik-oss/qliksense-operator.git -b master $(TMP-operator)/operator
-	$(MAKE) QLIKSENSE_OPERATOR_DIR=$(TMP-operator)/operator get-crds
-	-rm -rf $(TMP-operator)
-else
 	mkdir -p pkg/qliksense/crds/cr
 	mkdir -p pkg/qliksense/crds/crd
 	mkdir -p pkg/qliksense/crds/crd-deploy
-	cp $(QLIKSENSE_OPERATOR_DIR)/deploy/*.yaml pkg/qliksense/crds/crd-deploy
+	cp $(TMP)/operator/deploy/*.yaml pkg/qliksense/crds/crd-deploy
-	cp $(QLIKSENSE_OPERATOR_DIR)/deploy/crds/*_crd.yaml pkg/qliksense/crds/crd
+	cp $(TMP)/operator/deploy/crds/*_crd.yaml pkg/qliksense/crds/crd
-	cp $(QLIKSENSE_OPERATOR_DIR)/deploy/crds/*_cr.yaml pkg/qliksense/crds/cr
+	cp $(TMP)/operator/deploy/crds/*_cr.yaml pkg/qliksense/crds/cr
-endif
+	-rm -rf $(TMP)/operator

README.md

@@ -1,9 +1,17 @@
 # (WIP) Qlik Sense installation and operations CLI
 
-## Documentation
+- [Qlik Sense installation and operations CLI](#qlik-sense-installation-and-operations-cli)
-
+  - [About](#about)
-To learn more about Qlik Sense installer go to https://qlik-oss.github.io/sense-installer/
+    - [Future Direction](#future-direction)
-
+  - [Getting Started](#getting-started)
+    - [Requirements](#requirements)
+    - [Download](#download)
+    - [TL;DR](#TL;DR)
+    - [How qliksense CLI works](#how-qliksense-cli-works)
+      - [Witout Git Repo](#Without-git-repo)
+      - [With Git Repo](#With-a-git-repo)
+    - [Air Gapped](#air-gaped)
+  
 ## About
 
 The Qlik Sense installer CLI (qliksense) provides an imperative interface to many of the configurations that need to be applied against the declarative structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s). This cli facilitates:
@@ -23,3 +31,120 @@ For each version of a qliksense edge build there should be a corresponding relea
   - backup/restore operations
   - fully support airgap installation of QSEoK
   - restore unwanted deletion of kubernetes resources
+
+## Getting Started
+
+### Requirements
+
+- `kubectl` need to be installed and configured properly so that `kubectl` can connect to the kubernetes cluser. The `qliksense` CLI uses `kubectl` under the hood to perform operations on cluster
+  - (Docker Desktop setup tested for these instructions)
+  
+### Download
+
+- Download the appropriate executable for your platform from the [releases page](https://github.com/qlik-oss/sense-installer/releases) and rename it to `qliksense`. All the examplease down below uses `qliksense`.
+  
+### TL;DR
+
+- To download the version `v0.0.2` from qliksense-k8s [releases](https://github.com/qlik-oss/qliksense-k8s/releases).
+
+```shell
+$qliksense fetch v0.0.2
+```
+
+- To install CRDs for QSEoK and qliksense operator into the kubernetes cluster.
+
+```shell
+$qliksense crds install --all
+```
+
+- To install QSEoK into a namespace in the kubernetes cluster where `kubectl` is pointing to.
+
+```shell
+$qliksense install --acceptEULA="yes"
+```
+
+## How qliksense cli works
+
+At the initialization `qliksense` cli create few files in the director `~/.qliksene` and it contains following files
+
+```console
+.qliksense
+├── config.yaml
+├── contexts
+│   └── qlik-default
+│       └── qlik-default.yaml
+└── ejson
+    └── keys
+```
+
+`qlik-default.yaml` is a default CR has been created with some default values like this
+
+```yaml
+apiVersion: qlik.com/v1
+kind: Qliksense
+metadata:
+  name: qlik-default
+spec:
+  profile: docker-desktop
+  secrets:
+    qliksense:
+    - name: mongoDbUri
+      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
+  rotateKeys: "yes"
+  releaseName: qlik-default
+```
+
+The `qliksense` cli creates a default qliksense context (different from kubectl context) named `qlik-default` which will be the prefix for all kubernetes resources created by the cli under this context latter on. New context and configuration can be created by the cli.
+
+```console
+$ qliksense config -h
+do operations on/around CR
+
+Usage:
+  qliksense config [command]
+
+Available Commands:
+  apply         generate the patchs and apply manifests to k8s
+  list-contexts retrieves the contexts and lists them
+  set           configure a key value pair into the current context
+  set-configs   set configurations into the qliksense context as key-value pairs
+  set-context   Sets the context in which the Kubernetes cluster and resources live in
+  set-secrets   set secrets configurations into the qliksense context as key-value pairs
+  view          view the qliksense operator CR
+
+Flags:
+  -h, --help   help for config
+
+Use "qliksense config [command] --help" for more information about a command.
+```
+
+`qliksense` cli works in two modes
+
+- with a git repo fork/clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s)
+- without git repo
+
+### Without git repo
+
+In this mode `qliksense` CLI download the specified version from [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and put it into folder `~/.qliksense/contexts/<context-name>/qlik-k8s`.
+
+The qliksense cli create a CR for the qliksense operator and all the config operations are peformed to edit the CR. So when `qliksense install` or `qliksense config apply` both generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and install those manifests into the cluster and create a custom resoruce (CR) for the `qliksene operator` then the operator make association to the isntalled resoruces  so that when `qliksenes uninstall` is performed the operator can delete all those kubernetes resources related to QSEoK for the current context.
+
+### With a git repo
+
+User has to create fork or clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and push it to their own git server. When user perform `qliksense install` or `qliksene config apply` the qliksense operator do these tasks
+
+- downloads the corresponding version of manifests from the user's git repo.
+- generate kustomize patches
+- install kubernetes resoruces 
+- push those generated patches into a new branch in the provided git repo. so that user user can merge those patches into their master branch. 
+- spinup a cornjob to monitor master branch. If user modifies anything in the master branch those changes will be applied into the cluster. This is a light weight `git-ops` model
+
+This is how repo info is provided into the CR
+
+```console
+qliksense config set git.repository="https://github.com/my-org/qliksense-k8s"
+
+qliksense config set git.accessToken=blablalaala
+```
+
+## Air gaped

action_about.md

@@ -0,0 +1,41 @@
+# qliksense about
+
+About action will display inside information regarding [qliksense-k8](https://github.com/qlik-oss/qliksense-k8s) release.
+
+it will support following flags
+
+- `qliksense about 1.0.0` display default profile for tag `1.0.0`.
+- `qliksense about 1.0.0 --profile=docker-desktop`
+- `qliksense about` 
+  - assuming current directory has `manifests/docker-desktop`
+  - or get version information from pull of `qliksense-k8s` `master`
+
+using other supported commands user might have built the CR into the location `~/.qliksense/myqliksense.yaml`
+
+```yaml
+apiVersion: qlik.com/v1
+kind: QlikSense
+metadata:
+  name: myqliksense
+spec:
+  profile: docker-desktop
+  manifestsRoot: /Usr/ddd/my-k8-repo/manifests
+  namespace: myqliksense
+  storageClassName: efs
+  configs:
+    qliksense:
+    - name: acceptEULA
+      value: "yes"
+  secrets:
+    qliksense:
+    - name: mongoDbUri
+      value: "mongo://mongo:3307"
+    - name: messagingPassword
+      valueFromKey: messagingPassword
+```
+
+In that case the command would be
+
+- `qliksense about`
+   - display from `/Usr/ddd/my-k8-repo/manifests/docker-desktop` location
+   - pull from `master` if directory invalid/empty

action_config.md

@@ -0,0 +1,34 @@
+# qliksense config
+
+Config action will perform operations on configurations and contexts regarding the [qliksense-k8](https://github.com/qlik-oss/qliksense-k8s) release.
+
+it will support following commands:
+
+- `qliksense config apply` - generate the patchs and apply manifests to k8s
+- `qliksense config list-contexts` - retrieves the contexts and lists them
+- `qliksense config set` - configure a key value pair into the current context
+- `qliksense config set-configs` - set configurations into the qliksense context as key-value pairs
+- `qliksense config set-context` - sets the context in which the Kubernetes cluster and resources live in
+- `qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=false` - set secrets configurations into the qliksense context as key-value pairs and show encrypted value as part of CR
+- `qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=true` - set secrets configurations into the qliksense context as key-value pairs and show a key reference to the created Kubernetes secret resource as part of the CR
+- `qliksense config view` - view the qliksense operator CR
+- `qliksense config delete-context` - deletes a specific context locally (not in-cluster). Deletes context in spec of `config.yaml` and locally deletes entire folder of specified context (does not delete in-cluster secrets)
+
+
+the global file that abstracts all the contexts is `config.yaml`, located at:  `~/.qliksense/config.yaml`:
+```yaml
+apiVersion: config.qlik.com/v1
+kind: QliksenseConfig
+metadata:
+  name: QliksenseConfigMetadata
+spec:
+  contexts:
+  - name: qlik-default
+    crFile: /Users/fff/.qliksense/contexts/qlik-default/qlik-default.yaml
+  - name: myqliksense
+    crFile: /Users/fff/.qliksense/contexts/myqliksense/myqliksense.yaml
+  - name: hello
+    crFile: /Users/fff/.qliksense/contexts/hello/hello.yaml
+  currentContext: hello
+```
+

cmd/qliksense/apply.go

@@ -1,37 +0,0 @@
-package main
-
-import (
-	"io"
-
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-func applyCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.InstallCommandOptions{}
-	filePath := ""
-	keepPatchFiles := false
-	c := &cobra.Command{
-		Use:     "apply",
-		Short:   "install qliksense based on provided cr file",
-		Long:    `install qliksense based on provided cr file`,
-		Example: `qliksense apply -f file_name or cat cr_file | qliksense apply -f -`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLoadOrApplyCommandE(cmd, func(reader io.Reader) error {
-				return q.ApplyCRFromReader(reader, opts, keepPatchFiles, true)
-			})
-		},
-	}
-
-	f := c.Flags()
-	f.StringVarP(&filePath, "file", "f", "", "Install from a CR file")
-	c.MarkFlagRequired("file")
-	f.StringVarP(&opts.StorageClass, "storageClass", "s", "", "Storage class for qliksense")
-	f.StringVarP(&opts.MongoDbUri, "mongoDbUri", "m", "", "mongoDbUri for qliksense (i.e. mongodb://qlik-default-mongodb:27017/qliksense?ssl=false)")
-	f.StringVarP(&opts.RotateKeys, "rotateKeys", "r", "", "Rotate JWT keys for qliksense (yes:rotate keys/ no:use exising keys from cluster/ None: use default EJSON_KEY from env")
-	f.BoolVar(&keepPatchFiles, keepPatchFilesFlagName, keepPatchFiles, keepPatchFilesFlagUsage)
-
-	eulaPreRunHooks.addValidator(c.Name(), loadOrApplyCommandEulaPreRunHook)
-
-	return c
-}

cmd/qliksense/config.go

@@ -20,7 +20,7 @@ func configCmd(q *qliksense.Qliksense) *cobra.Command {
 func configApplyCmd(q *qliksense.Qliksense) *cobra.Command {
 	c := &cobra.Command{
 		Use:     "apply",
-		Short:   "generate the patches and apply manifests to k8s",
+		Short:   "generate the patchs and apply manifests to k8s",
 		Long:    `generate patches based on CR and apply manifests to k8s`,
 		Example: `qliksense config apply`,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -42,20 +42,3 @@ func configViewCmd(q *qliksense.Qliksense) *cobra.Command {
 	}
 	return c
 }
-
-func configEditCmd(q *qliksense.Qliksense) *cobra.Command {
-	c := &cobra.Command{
-		Use:   "edit [context-name]",
-		Short: "Edit the context cr",
-		Long: `edit the context cr. if no context name provided default context will be edited
-		It will open the vim editor unless KUBE_EDITOR is defined`,
-		Example: `qliksense config edit [context-name]`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 1 {
-				return q.EditCR(args[0])
-			}
-			return q.EditCR("")
-		},
-	}
-	return c
-}

cmd/qliksense/context.go

@@ -3,7 +3,6 @@ package main
 import (
 	"errors"
 	"fmt"
-	"os"
 
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 
@@ -69,30 +68,18 @@ func setConfigsCmd(q *qliksense.Qliksense) *cobra.Command {
 	var (
 		cmd *cobra.Command
 	)
-	base64Encoded := false
+
 	cmd = &cobra.Command{
 		Use:   "set-configs",
 		Short: "set configurations into the qliksense context as key-value pairs",
 		Example: `
 qliksense config set-configs <service_name>.<attribute>="<value>"
-		- The above configuration will be displayed in the CR
+    - The above configuration will be displayed in the CR
-qliksense config set-configs <service_name>.<attribute>="<value" --base64
-		- if the value is base64 encoded
-echo "something" | base64 | qliksense config set-configs <service_name>.<attribute> --base64
-	- value is coming from input pipe as base64 encoded
-echo "something" | qliksense config set-configs <service_name>.<attribute>
-	- value is coming from input pipe
-
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if isInputFromPipe() && len(args) == 1 {
+			return q.SetConfigs(args)
-				return q.SetConfigFromReader(args[0], os.Stdin, base64Encoded)
-			}
-			return q.SetConfigs(args, base64Encoded)
 		},
 	}
-	f := cmd.Flags()
-	f.BoolVarP(&base64Encoded, "base64", "", false, "if the arguments value is base64 encoded")
 	return cmd
 }
 
@@ -101,7 +88,7 @@ func setSecretsCmd(q *qliksense.Qliksense) *cobra.Command {
 		cmd    *cobra.Command
 		secret bool
 	)
-	base64Encoded := false
+
 	cmd = &cobra.Command{
 		Use:   "set-secrets",
 		Short: "set secrets configurations into the qliksense context as key-value pairs",
@@ -114,24 +101,13 @@ qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=true
 qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=false
 		- Encrypt the secret value and display it in the current context
 		- No secret resource is created
-		  - The above configuration will be displayed in the CR 
+        - The above configuration will be displayed in the CR `,
-qliksense config set-secrets <service_name>.<attribute>="<value>" --base64
-		- the <value> is base64 encoded
-echo "something" | base64 | qliksense config set-secrets <service_name>.<attribute> --base64
-		- value coming from input pipe as base64 encoded
-echo "something" | qliksense config set-secrets <service_name>.<attribute>
-		- value coming from input pipe`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if isInputFromPipe() && len(args) == 1 {
+			return q.SetSecrets(args, secret)
-				return q.SetSecretsFromReader(args[0], os.Stdin, secret, base64Encoded)
-			}
-			return q.SetSecrets(args, secret, base64Encoded)
 		},
 	}
 	f := cmd.Flags()
 	f.BoolVar(&secret, "secret", false, "Whether secrets should be encrypted as a Kubernetes Secret resource")
-	f.BoolVarP(&base64Encoded, "base64", "", false, "if the arguments value is base64 encoded")
-
 	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", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "a", false, "Include All CRDs")
 	return c
 }
 
@@ -37,6 +37,6 @@ func crdsInstallCmd(q *qliksense.Qliksense) *cobra.Command {
 		},
 	}
 	f := c.Flags()
-	f.BoolVarP(&opts.All, "all", "", false, "Include All CRDs")
+	f.BoolVarP(&opts.All, "all", "a", false, "Include All CRDs")
 	return c
 }

cmd/qliksense/eula.go

@@ -1,105 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/mattn/go-tty"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-type eulaPreRunHooksT struct {
-	validators              map[string]func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)
-	postValidationArtifacts map[string]interface{}
-}
-
-func (e *eulaPreRunHooksT) addValidator(command string, validator func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)) {
-	e.validators[command] = validator
-}
-
-func (e *eulaPreRunHooksT) getValidator(command string) func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error) {
-	if validator, ok := e.validators[command]; ok {
-		return validator
-	}
-	return nil
-}
-
-func (e *eulaPreRunHooksT) addPostValidationArtifact(artifactName string, artifact interface{}) {
-	e.postValidationArtifacts[artifactName] = artifact
-}
-
-func (e *eulaPreRunHooksT) getPostValidationArtifact(artifactName string) interface{} {
-	if artifact, ok := e.postValidationArtifacts[artifactName]; ok {
-		return artifact
-	}
-	return nil
-}
-
-var eulaEnforced = os.Getenv("QLIKSENSE_EULA_ENFORCE") == "true"
-var eulaText = "Please read the end user license agreement at: https://www.qlik.com/us/legal/license-terms"
-var eulaPrompt = "Do you accept our EULA? (y/n): "
-var eulaErrorInstruction = `You must enter "y" to continue`
-var eulaPreRunHooks = eulaPreRunHooksT{
-	validators:              make(map[string]func(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error)),
-	postValidationArtifacts: make(map[string]interface{}),
-}
-
-func commandAlwaysRequiresEulaAcceptance(commandName string) bool {
-	return commandName == "install" || commandName == "upgrade" || commandName == "apply"
-}
-
-func globalEulaPreRun(cmd *cobra.Command, q *qliksense.Qliksense) {
-	if isEulaEnforced(cmd.Name()) {
-		if strings.TrimSpace(strings.ToLower(cmd.Flag("acceptEULA").Value.String())) != "yes" {
-			if eulaPreRunHook := eulaPreRunHooks.getValidator(cmd.Name()); eulaPreRunHook != nil {
-				if eulaAccepted, err := eulaPreRunHook(cmd, q); err != nil {
-					panic(err)
-				} else if !eulaAccepted {
-					doEnforceEula()
-				}
-			} else if qConfig, err := qapi.NewQConfigE(q.QliksenseHome); err != nil {
-				doEnforceEula()
-			} else if qcr, err := qConfig.GetCurrentCR(); err != nil || !qcr.IsEULA() {
-				doEnforceEula()
-			}
-		}
-	}
-}
-
-func globalEulaPostRun(cmd *cobra.Command, q *qliksense.Qliksense) {
-	if isEulaEnforced(cmd.Name()) {
-		if err := q.SetEulaAccepted(); err != nil {
-			panic(err)
-		}
-	}
-}
-
-func isEulaEnforced(commandName string) bool {
-	return eulaEnforced || commandAlwaysRequiresEulaAcceptance(commandName)
-}
-
-func doEnforceEula() {
-	fmt.Println(eulaText)
-	fmt.Print(eulaPrompt)
-	answer := readRuneFromTty()
-	if strings.ToLower(answer) != "y" {
-		fmt.Println(eulaErrorInstruction)
-		os.Exit(1)
-	}
-}
-
-func readRuneFromTty() string {
-	t, err := tty.Open()
-	if err != nil {
-		panic(err)
-	}
-	defer t.Close()
-	answer, err := t.ReadString()
-	if err != nil {
-		panic(err)
-	}
-	return answer
-}

cmd/qliksense/fetch.go

@@ -1,30 +1,26 @@
 package main
 
 import (
+	"errors"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
 
 func fetchCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.FetchCommandOptions{}
 	c := &cobra.Command{
 		Use:     "fetch",
-		Short:   "fetch a release from qliksense-k8s repo, if version not supplied, will use from context",
+		Short:   "fetch a release from qliksense-k8s repo",
-		Long:    `fetch a release from qliksense-k8s repo, if version not supplied, will use from context`,
+		Long:    `fetch a release from qliksense-k8s repo`,
-		Example: `qliksense fetch [version]`,
+		Example: `qliksense fetch <version>`,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 1 {
+			if len(args) != 1 {
-				opts.Version = args[0]
+				return errors.New("requires a version (i.e. v1.0.0)")
 			}
-			return q.FetchK8sWithOpts(opts)
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return q.FetchQK8s(args[0])
 		},
 	}
-
-	f := c.Flags()
-	f.StringVarP(&opts.GitUrl, "url", "", "", "git url from where configuration will be pulled")
-	f.StringVarP(&opts.AccessToken, "accessToken", "", "", "access token for git url")
-	f.StringVarP(&opts.SecretName, "secretName", "", "", "kubernetes secret name where a key name accessToken exist")
-	f.BoolVarP(&opts.Overwrite, "overwrite", "", false, "Ovewrite previously fetched veersion as well as local chagnes")
-
 	return c
 }

cmd/qliksense/get_installable_versions.go

@@ -1,29 +0,0 @@
-package main
-
-import (
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-const defaultVersionsLimit = 10
-
-func getInstallableVersionsCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.LsRemoteCmdOptions{
-		IncludeBranches: false,
-		Limit:           defaultVersionsLimit,
-	}
-	c := &cobra.Command{
-		Use:     "get-versions",
-		Short:   "list remote/installable versions",
-		Long:    `list remote/installable versions`,
-		Example: `qliksense get-versions`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return q.GetInstallableVersions(opts)
-		},
-	}
-
-	f := c.Flags()
-	f.BoolVarP(&opts.IncludeBranches, "include-branches", "", opts.IncludeBranches, "Include branches")
-	f.IntVarP(&opts.Limit, "limit", "", opts.Limit, "Maximum versions to list (starting with the highest)")
-	return c
-}

cmd/qliksense/install.go

@@ -14,19 +14,18 @@ func installCmd(q *qliksense.Qliksense) *cobra.Command {
 		Long:    `install a qliksense release`,
 		Example: `qliksense install <version> #if no version provides, expect manifestsRoot is set somewhere in the file system`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			version := ""
+			if len(args) == 0 {
-			if len(args) != 0 {
+				return q.InstallQK8s("", opts, keepPatchFiles)
-				version = args[0]
 			}
-			return q.InstallQK8s(version, opts, keepPatchFiles)
+			return q.InstallQK8s(args[0], opts, keepPatchFiles)
 		},
 	}
 
 	f := c.Flags()
+	f.StringVarP(&opts.AcceptEULA, "acceptEULA", "a", "", "AcceptEULA for qliksense")
 	f.StringVarP(&opts.StorageClass, "storageClass", "s", "", "Storage class for qliksense")
 	f.StringVarP(&opts.MongoDbUri, "mongoDbUri", "m", "", "mongoDbUri for qliksense (i.e. mongodb://qlik-default-mongodb:27017/qliksense?ssl=false)")
 	f.StringVarP(&opts.RotateKeys, "rotateKeys", "r", "", "Rotate JWT keys for qliksense (yes:rotate keys/ no:use exising keys from cluster/ None: use default EJSON_KEY from env")
 	f.BoolVar(&keepPatchFiles, keepPatchFilesFlagName, keepPatchFiles, keepPatchFilesFlagUsage)
-
 	return c
 }

cmd/qliksense/load.go

@@ -1,84 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/pkg/errors"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-func loadCrFile(q *qliksense.Qliksense) *cobra.Command {
-	filePath := ""
-	overwriteExistingContext := false
-	c := &cobra.Command{
-		Use:     "load",
-		Short:   "load a CR a file and create necessary structure for future use",
-		Long:    `load a CR a file and create necessary structure for future use`,
-		Example: `qliksense load -f file_name or cat cr_file | qliksense load -f -`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLoadOrApplyCommandE(cmd, func(reader io.Reader) error {
-				return q.LoadCr(reader, overwriteExistingContext)
-			})
-		},
-	}
-	f := c.Flags()
-	f.StringVarP(&filePath, "file", "f", "", "File to load CR from")
-	c.MarkFlagRequired("file")
-	f.BoolVarP(&overwriteExistingContext, "overwrite", "o", overwriteExistingContext, "Overwrite any existing contexts with the same name")
-
-	eulaPreRunHooks.addValidator(c.Name(), loadOrApplyCommandEulaPreRunHook)
-	return c
-}
-
-func getCrFileFromFlag(cmd *cobra.Command, flagName string) (*os.File, error) {
-	filePath := cmd.Flag(flagName).Value.String()
-	if filePath == "-" {
-		if !isInputFromPipe() {
-			return nil, errors.New("No input pipe present")
-		}
-		return os.Stdin, nil
-	}
-	file, e := os.Open(filePath)
-	if e != nil {
-		return nil, errors.Wrapf(e,
-			"unable to read the file %s", filePath)
-	}
-	return file, nil
-}
-
-func isInputFromPipe() bool {
-	fileInfo, _ := os.Stdin.Stat()
-	return fileInfo.Mode()&os.ModeCharDevice == 0
-}
-
-func loadOrApplyCommandEulaPreRunHook(cmd *cobra.Command, q *qliksense.Qliksense) (bool, error) {
-	file, err := getCrFileFromFlag(cmd, "file")
-	if err != nil {
-		return false, err
-	}
-	defer file.Close()
-
-	if crBytes, err := ioutil.ReadAll(file); err != nil {
-		return false, err
-	} else {
-		eulaPreRunHooks.addPostValidationArtifact("CR", crBytes)
-		return q.IsEulaAcceptedInCrFile(bytes.NewBuffer(crBytes))
-	}
-}
-
-func runLoadOrApplyCommandE(cmd *cobra.Command, callBack func(io.Reader) error) error {
-	if crBytes := eulaPreRunHooks.getPostValidationArtifact("CR"); crBytes != nil {
-		return callBack(bytes.NewBuffer(crBytes.([]byte)))
-	} else {
-		file, err := getCrFileFromFlag(cmd, "file")
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-		return callBack(file)
-	}
-}

cmd/qliksense/preflight.go

@@ -1,350 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/qlik-oss/sense-installer/pkg/preflight"
-
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	"github.com/spf13/cobra"
-)
-
-func preflightCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightCmd = &cobra.Command{
-		Use:     "preflight",
-		Short:   "perform preflight checks on the cluster",
-		Long:    `perform preflight checks on the cluster`,
-		Example: `qliksense preflight <preflight_check_to_run>`,
-	}
-	return preflightCmd
-}
-
-func pfDnsCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightDnsCmd = &cobra.Command{
-		Use:     "dns",
-		Short:   "perform preflight dns check",
-		Long:    `perform preflight dns check to check DNS connectivity status in the cluster`,
-		Example: `qliksense preflight dns`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight DNS check
-			fmt.Printf("Preflight DNS check\n")
-			fmt.Println("---------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight DNS check FAILED\n")
-				log.Fatal(err)
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.CheckDns(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight DNS check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightDnsCmd
-}
-
-func pfK8sVersionCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightCheckK8sVersionCmd = &cobra.Command{
-		Use:     "kube-version",
-		Short:   "check kubernetes version",
-		Long:    `check minimum valid kubernetes version on the cluster`,
-		Example: `qliksense preflight kube-version`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight Kubernetes minimum version check
-			fmt.Printf("Preflight kubernetes minimum version check\n")
-			fmt.Println("------------------------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight kubernetes minimum version check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Printf("Preflight kubernetes minimum version check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightCheckK8sVersionCmd
-}
-
-func pfAllChecksCmd(q *qliksense.Qliksense) *cobra.Command {
-	var mongodbUrl string
-	var preflightAllChecksCmd = &cobra.Command{
-		Use:     "all",
-		Short:   "perform all checks",
-		Long:    `perform all preflight checks on the target cluster`,
-		Example: `qliksense preflight all`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight run all checks
-			fmt.Printf("Running all preflight checks\n")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Println(err)
-				fmt.Printf("Running preflight check suite has FAILED...\n")
-				log.Fatal()
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			qp.RunAllPreflightChecks(namespace, kubeConfigContents, mongodbUrl)
-			return nil
-
-		},
-	}
-	f := preflightAllChecksCmd.Flags()
-	f.StringVarP(&mongodbUrl, "mongodb-url", "", "", "mongodbUrl to try connecting to")
-	return preflightAllChecksCmd
-}
-
-func pfDeploymentCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfDeploymentCheckCmd = &cobra.Command{
-		Use:     "deployment",
-		Short:   "perform preflight deploymwnt check",
-		Long:    `perform preflight deployment check to ensure that we can create deployments in the cluster`,
-		Example: `qliksense preflight deployment`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight deployments check
-			fmt.Printf("Preflight deployment check\n")
-			fmt.Println("--------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight deployment check FAILED\n")
-				log.Fatal(err)
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight deploy check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfDeploymentCheckCmd
-}
-
-func pfServiceCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfServiceCheckCmd = &cobra.Command{
-		Use:     "service",
-		Short:   "perform preflight service check",
-		Long:    `perform preflight service check to ensure that we are able to create services in the cluster`,
-		Example: `qliksense preflight service`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight service check
-			fmt.Printf("Preflight service check\n")
-			fmt.Println("-----------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight service check FAILED\n")
-				log.Fatal(err)
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.CheckService(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight service check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfServiceCheckCmd
-}
-
-func pfPodCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var pfPodCheckCmd = &cobra.Command{
-		Use:     "pod",
-		Short:   "perform preflight pod check",
-		Long:    `perform preflight pod check to ensure we can create pods in the cluster`,
-		Example: `qliksense preflight pod`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight pod check
-			fmt.Printf("Preflight pod check\n")
-			fmt.Println("--------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight pod check FAILED\n")
-				log.Fatal(err)
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.CheckPod(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight pod check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return pfPodCheckCmd
-}
-
-func pfCreateRoleCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightRoleCmd = &cobra.Command{
-		Use:     "role",
-		Short:   "preflight create role check",
-		Long:    `perform preflight role check to ensure we are able to create a role in the cluster`,
-		Example: `qliksense preflight createRole`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight role check
-			fmt.Printf("Preflight role check\n")
-			fmt.Println("---------------------------")
-			namespace, _, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight role check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckCreateRole(namespace); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight role FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightRoleCmd
-}
-
-func pfCreateRoleBindingCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightRoleBindingCmd = &cobra.Command{
-		Use:     "rolebinding",
-		Short:   "preflight create rolebinding check",
-		Long:    `perform preflight rolebinding check to ensure we are able to create a rolebinding in the cluster`,
-		Example: `qliksense preflight rolebinding`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight createRoleBinding check
-			fmt.Printf("Preflight rolebinding check\n")
-			fmt.Println("---------------------------")
-			namespace, _, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight rolebinding check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckCreateRoleBinding(namespace); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight rolebinding check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightRoleBindingCmd
-}
-
-func pfCreateServiceAccountCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightServiceAccountCmd = &cobra.Command{
-		Use:     "serviceaccount",
-		Short:   "preflight create ServiceAccount check",
-		Long:    `perform preflight serviceaccount check to ensure we are able to create a service account in the cluster`,
-		Example: `qliksense preflight serviceaccount`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight createServiceAccount check
-			fmt.Printf("Preflight ServiceAccount check\n")
-			fmt.Println("-------------------------------------")
-			namespace, _, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight serviceaccount check FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckCreateServiceAccount(namespace); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight serviceaccount check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightServiceAccountCmd
-}
-
-func pfCreateAuthCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var preflightCreateAuthCmd = &cobra.Command{
-		Use:     "authcheck",
-		Short:   "preflight authcheck",
-		Long:    `perform preflight authcheck that combines the role, rolebinding and serviceaccount checks`,
-		Example: `qliksense preflight authcheck`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight authcheck
-			fmt.Printf("Preflight authcheck\n")
-			fmt.Println("------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight authcheck FAILED\n")
-				log.Fatal(err)
-			}
-			if err = qp.CheckCreateRB(namespace, kubeConfigContents); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight authcheck FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	return preflightCreateAuthCmd
-}
-
-func pfMongoCheckCmd(q *qliksense.Qliksense) *cobra.Command {
-	var mongodbUrl string
-	var preflightMongoCmd = &cobra.Command{
-		Use:     "mongo",
-		Short:   "preflight mongo OR preflight mongo --url=<url>",
-		Long:    `perform preflight mongo check to ensure we are able to connect to a mongodb instance in the cluster`,
-		Example: `qliksense preflight mongo OR preflight mongo --url=<url>`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			qp := &preflight.QliksensePreflight{Q: q}
-
-			// Preflight mongo check
-			fmt.Printf("Preflight mongo check\n")
-			fmt.Println("-------------------------------------")
-			namespace, kubeConfigContents, err := preflight.InitPreflight()
-			if err != nil {
-				fmt.Printf("Preflight mongo check FAILED\n")
-				log.Fatal(err)
-			}
-			if namespace == "" {
-				namespace = "default"
-			}
-			if err = qp.CheckMongo(kubeConfigContents, namespace, mongodbUrl); err != nil {
-				fmt.Println(err)
-				fmt.Print("Preflight mongo check FAILED\n")
-				log.Fatal()
-			}
-			return nil
-		},
-	}
-	f := preflightMongoCmd.Flags()
-	f.StringVarP(&mongodbUrl, "url", "", "", "mongodbUrl to try connecting to")
-	return preflightMongoCmd
-}

cmd/qliksense/pull_push.go

@@ -20,7 +20,28 @@ func pullQliksenseImages(q *qliksense.Qliksense) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			return q.PullImages(version, opts.Profile)
+
+			qConfig := qapi.NewQConfig(q.QliksenseHome)
+			if version == "" {
+				if qcr, err := qConfig.GetCurrentCR(); err != nil {
+					return err
+				} else {
+					version = qcr.GetLabelFromCr("version")
+				}
+			}
+
+			if version != "" {
+				if !qConfig.IsRepoExistForCurrent(version) {
+					if err := q.FetchQK8s(version); err != nil {
+						return err
+					}
+				}
+				if err := qConfig.SwitchCurrentCRToVersionAndProfile(version, opts.Profile); err != nil {
+					return err
+				}
+			}
+
+			return q.PullImagesForCurrentCR()
 		},
 	}
 	f := cmd.Flags()

cmd/qliksense/root.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -18,7 +19,7 @@ import (
 	"github.com/ttacon/chalk"
 )
 
-// To run this project in debug mode, run:
+// To run this project in ddebug mode, run:
 // export QLIKSENSE_DEBUG=true
 // qliksense <command>
 
@@ -42,13 +43,14 @@ func initAndExecute() error {
 	api.LogDebugMessage("QliksenseHomeDir: %s", qlikSenseHome)
 
 	qliksenseClient := qliksense.New(qlikSenseHome)
+	qliksenseClient.SetUpQliksenseDefaultContext()
 	cmd := rootCmd(qliksenseClient)
-	if err := cmd.Execute(); err != nil {
+	//levenstein checks
-		//levenstein checks (auto-suggestions)
+	if levenstein(cmd) == false {
-		levenstein(cmd)
+		if err := cmd.Execute(); err != nil {
-		return err
+			return err
+		}
 	}
-
 	return nil
 }
 
@@ -78,64 +80,30 @@ func setUpPaths() (string, error) {
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of qliksense cli",
-	Long:  "Print the version number of qliksense cli",
+	Long:  `All software has versions. This is Hugo's`,
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Printf("%s (%s, %s)\n", pkg.Version, pkg.Commit, pkg.CommitDate)
 	},
 }
 
-func commandUsesContext(commandName string) bool {
+func rootCmd(p *qliksense.Qliksense) *cobra.Command {
-	return commandName != "" && commandName != "qliksense" && commandName != "help" && commandName != "version"
+	var (
-}
+		cmd *cobra.Command
+	)
 
-func getRootCmd(p *qliksense.Qliksense) *cobra.Command {
+	cmd = &cobra.Command{
-	cmd := &cobra.Command{
 		Use:   "qliksense",
 		Short: "Qliksense cli tool",
 		Long:  `qliksense cli tool provides functionality to perform operations on qliksense-k8s, qliksense operator, and kubernetes cluster`,
 		Args:  cobra.ArbitraryArgs,
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			if commandUsesContext(cmd.Name()) {
-				globalEulaPreRun(cmd, p)
-				if err := p.SetUpQliksenseDefaultContext(); err != nil {
-					panic(err)
-				}
-				pf := api.NewPreflightConfig(p.QliksenseHome)
-				if err := pf.Initialize(); err != nil {
-					panic(err)
-				}
-				globalEulaPostRun(cmd, p)
-			}
-		},
-		PersistentPostRun: func(cmd *cobra.Command, args []string) {
-			if commandUsesContext(cmd.Name()) {
-				globalEulaPostRun(cmd, p)
-			}
-		},
 	}
-	origHelpFunc := cmd.HelpFunc()
+
-	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-		if !commandUsesContext(cmd.Name()) {
-			cmd.Flags().MarkHidden("acceptEULA")
-		}
-		origHelpFunc(cmd, args)
-	})
-	accept := ""
-	cmd.PersistentFlags().StringVarP(&accept, "acceptEULA", "a", "", "Accept EULA for qliksense")
 	cmd.Flags().SetInterspersed(false)
-	return cmd
-}
 
-func initConfig() {
-	viper.SetEnvPrefix("QLIKSENSE")
-	viper.AutomaticEnv()
-}
-
-func rootCmd(p *qliksense.Qliksense) *cobra.Command {
-	cmd := getRootCmd(p)
 	cobra.OnInitialize(initConfig)
 
-	cmd.AddCommand(getInstallableVersionsCmd(p))
+	// For qliksense overrides/commands
+
 	cmd.AddCommand(pullQliksenseImages(p))
 	cmd.AddCommand(pushQliksenseImages(p))
 	cmd.AddCommand(about(p))
@@ -189,8 +157,6 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	// add clean-config-repo-patches command as a sub-command to the app config sub-command
 	configCmd.AddCommand(cleanConfigRepoPatchesCmd(p))
 
-	// open editor for config
-	configCmd.AddCommand(configEditCmd(p))
 	// add uninstall command
 	cmd.AddCommand(uninstallCmd(p))
 
@@ -198,27 +164,40 @@ func rootCmd(p *qliksense.Qliksense) *cobra.Command {
 	cmd.AddCommand(crdsCmd)
 	crdsCmd.AddCommand(crdsViewCmd(p))
 	crdsCmd.AddCommand(crdsInstallCmd(p))
-
-	// add preflight command
-	preflightCmd := preflightCmd(p)
-	preflightCmd.AddCommand(pfDnsCheckCmd(p))
-	preflightCmd.AddCommand(pfK8sVersionCheckCmd(p))
-	preflightCmd.AddCommand(pfAllChecksCmd(p))
-	preflightCmd.AddCommand(pfMongoCheckCmd(p))
-	preflightCmd.AddCommand(pfDeploymentCheckCmd(p))
-	preflightCmd.AddCommand(pfServiceCheckCmd(p))
-	preflightCmd.AddCommand(pfPodCheckCmd(p))
-	preflightCmd.AddCommand(pfCreateRoleCheckCmd(p))
-	preflightCmd.AddCommand(pfCreateRoleBindingCheckCmd(p))
-	preflightCmd.AddCommand(pfCreateServiceAccountCheckCmd(p))
-	preflightCmd.AddCommand(pfCreateAuthCheckCmd(p))
-
-	cmd.AddCommand(preflightCmd)
-	cmd.AddCommand(loadCrFile(p))
-	cmd.AddCommand((applyCmd(p)))
 	return cmd
 }
 
+func initConfig() {
+	viper.SetEnvPrefix("QLIKSENSE")
+	viper.AutomaticEnv()
+}
+
+func downloadFile(url string, filepath string) error {
+	var (
+		out  *os.File
+		err  error
+		resp *http.Response
+	)
+	// Create the file
+	if out, err = os.Create(filepath); err != nil {
+		return err
+	}
+	defer out.Close()
+
+	// Get the data
+	if resp, err = http.Get(url); err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	// Write the body to file
+	if _, err = io.Copy(out, resp.Body); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func copy(src, dst string) (int64, error) {
 	var (
 		source, destination *os.File
@@ -247,21 +226,28 @@ func copy(src, dst string) (int64, error) {
 	return nBytes, err
 }
 
-func levenstein(cmd *cobra.Command) {
+func levenstein(cmd *cobra.Command) bool {
-	cmd.SuggestionsMinimumDistance = 2
+	cmd.SuggestionsMinimumDistance = 4
 	if len(os.Args) > 1 {
 		args := os.Args[1]
-		suggest := cmd.SuggestionsFor(args)
+		for _, ctx := range cmd.Commands() {
+			val := *ctx
+			if args == val.Name() {
+				//found command
+				return false
+			}
+		}
+		suggest := cmd.SuggestionsFor(os.Args[1])
 		if len(suggest) > 0 {
 			arg := []string{}
 			for _, cm := range os.Args {
 				arg = append(arg, cm)
 			}
-			if !strings.EqualFold(arg[1], suggest[0]) {
+			arg[1] = suggest[0]
-				arg[1] = suggest[0]
+			out := ansi.NewColorableStdout()
-				out := ansi.NewColorableStdout()
+			fmt.Fprintln(out, chalk.Green.Color("Did you mean: "), chalk.Bold.TextStyle(strings.Join(arg, " ")), "?")
-				fmt.Fprintln(out, chalk.Green.Color("Did you mean: "), chalk.Bold.TextStyle(strings.Join(arg, " ")), "?")
+			return true
-			}
 		}
 	}
+	return false
 }

cmd/qliksense/uninstall.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	qapi "github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
@@ -8,7 +9,7 @@ import (
 func uninstallCmd(q *qliksense.Qliksense) *cobra.Command {
 	c := &cobra.Command{
 		Use:     "uninstall",
-		Short:   "Uninstall the deployed qliksense.",
+		Short:   "Uninstall the deployed qliksense with release name [ " + qapi.NewQConfig(q.QliksenseHome).Spec.CurrentContext + " ]",
 		Long:    `Uninstall the deployed qliksense. By default uninstall the current context`,
 		Example: `qliksense uninstall <context-name>`,
 		RunE: func(cmd *cobra.Command, args []string) error {

docs/command_reference.md

@@ -1,119 +0,0 @@
-# qliksense command reference
-
-## qliksense apply
-
-`qliksense apply` command takes input a cr file or input from pipe
-
-- `qliksense apply -f cr-file.yaml`
-- `cat cr-file.yaml | qliksense apply -f -`
-
-the content of `cr-file.yaml` should be something similar
-
-```yaml
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-test
-  labels:
-    version: v0.0.2
-spec:
-  configs:
-    qliksense:
-    - name: acceptEULA
-      value: "yes"
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: mongodb://qlik-test-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop
-  rotateKeys: "yes"
-  ```
-
-This will do everything `qliksense load` does and install the qliksense into the cluster. 
-
-## qliksense load
-
-`qliksense load` command takes input a cr file or input from pipe.
-
-- `qliksense load -f cr-file.yaml`
-- `cat cr-file.yaml | qliksense load -f -`
-
-This will load the CR into `${QLIKSENSE_HOME}` folder, create context structure and set the current context to that CR. 
-This will also encrypt the secrets from CR while writing the CR into the disk.
-
-## qliksense about
-
-About action will display inside information regarding [qliksense-k8](https://github.com/qlik-oss/qliksense-k8s) release.
-
-it will support following flags
-
-- `qliksense about 1.0.0` display default profile for tag `1.0.0`.
-- `qliksense about 1.0.0 --profile=docker-desktop`
-- `qliksense about` 
-  - assuming current directory has `manifests/docker-desktop`
-  - or get version information from pull of `qliksense-k8s` `master`
-
-using other supported commands user might have built the CR into the location `~/.qliksense/myqliksense.yaml`
-
-```yaml
-apiVersion: qlik.com/v1
-kind: QlikSense
-metadata:
-  name: myqliksense
-spec:
-  profile: docker-desktop
-  manifestsRoot: /Usr/ddd/my-k8-repo/manifests
-  namespace: myqliksense
-  storageClassName: efs
-  configs:
-    qliksense:
-    - name: acceptEULA
-      value: "yes"
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: "mongo://mongo:3307"
-    - name: messagingPassword
-      valueFromKey: messagingPassword
-```
-
-In that case the command would be
-
-- `qliksense about`
-   - display from `/Usr/ddd/my-k8-repo/manifests/docker-desktop` location
-   - pull from `master` if directory invalid/empty
-
-
-## qliksense config
-
-Config action will perform operations on configurations and contexts regarding the [qliksense-k8](https://github.com/qlik-oss/qliksense-k8s) release.
-
-it will support following commands:
-
-- `qliksense config apply` - generate the patchs and apply manifests to k8s
-- `qliksense config list-contexts` - retrieves the contexts and lists them
-- `qliksense config set` - configure a key value pair into the current context
-- `qliksense config set-configs` - set configurations into the qliksense context as key-value pairs
-- `qliksense config set-context` - sets the context in which the Kubernetes cluster and resources live in
-- `qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=false` - set secrets configurations into the qliksense context as key-value pairs and show encrypted value as part of CR
-- `qliksense config set-secrets <service_name>.<attribute>="<value>" --secret=true` - set secrets configurations into the qliksense context as key-value pairs and show a key reference to the created Kubernetes secret resource as part of the CR
-- `qliksense config view` - view the qliksense operator CR
-- `qliksense config delete-context` - deletes a specific context locally (not in-cluster). Deletes context in spec of `config.yaml` and locally deletes entire folder of specified context (does not delete in-cluster secrets)
-
-
-the global file that abstracts all the contexts is `config.yaml`, located at:  `~/.qliksense/config.yaml`:
-```yaml
-apiVersion: config.qlik.com/v1
-kind: QliksenseConfig
-metadata:
-  name: QliksenseConfigMetadata
-spec:
-  contexts:
-  - name: qlik-default
-    crFile: /Users/fff/.qliksense/contexts/qlik-default/qlik-default.yaml
-  - name: myqliksense
-    crFile: /Users/fff/.qliksense/contexts/myqliksense/myqliksense.yaml
-  - name: hello
-    crFile: /Users/fff/.qliksense/contexts/hello/hello.yaml
-  currentContext: hello
-```

docs/concepts.md

@@ -1,6 +1,6 @@
 # How qliksense cli works
 
-At the initialization, `qliksense` cli creates few files in the director `~/.qliksene` and it contains following files:
+At the initialization `qliksense` cli create few files in the director `~/.qliksene` and it contains following files
 
 ```console
 .qliksense
@@ -12,7 +12,7 @@ At the initialization, `qliksense` cli creates few files in the director `~/.qli
     └── keys
 ```
 
-`qlik-default.yaml` is a default CR created with some default values like:
+`qlik-default.yaml` is a default CR has been created with some default values like this
 
 ```yaml
 apiVersion: qlik.com/v1
@@ -29,69 +29,55 @@ spec:
   releaseName: qlik-default
 ```
 
-The `qliksense` cli creates a default qliksense context (different from kubectl context) named `qlik-default` which will be the prefix for all kubernetes resources created by the cli under this context later on. 
+The `qliksense` cli creates a default qliksense context (different from kubectl context) named `qlik-default` which will be the prefix for all kubernetes resources created by the cli under this context latter on. New context and configuration can be created by the cli.
-
-New context and configuration can be created by the cli, get available commands using:
 
 ```console
-qliksense config -h
+$ qliksense config -h
-```
+do operations on/around CR
 
----
+Usage:
+  qliksense config [command]
+
+Available Commands:
+  apply         generate the patchs and apply manifests to k8s
+  list-contexts retrieves the contexts and lists them
+  set           configure a key value pair into the current context
+  set-configs   set configurations into the qliksense context as key-value pairs
+  set-context   Sets the context in which the Kubernetes cluster and resources live in
+  set-secrets   set secrets configurations into the qliksense context as key-value pairs
+  view          view the qliksense operator CR
+
+Flags:
+  -h, --help   help for config
+
+Use "qliksense config [command] --help" for more information about a command.
+```
 
 `qliksense` cli works in two modes
 
-- With a git repo fork/clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s)
+- with a git repo fork/clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s)
-- Without git repo
+- without git repo
 
 ## Without git repo
 
-In this mode `qliksense` CLI downloads the specified version from [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and places it in `~/.qliksense/contexts/<context-name>/qlik-k8s` folder.
+In this mode `qliksense` CLI download the specified version from [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and put it into folder `~/.qliksense/contexts/<context-name>/qlik-k8s`.
 
-The qliksense cli creates a CR for the QlikSense operator and all config operations are peformed to edit the CR.
+The qliksense cli create a CR for the qliksense operator and all the config operations are peformed to edit the CR. So when `qliksense install` or `qliksense config apply` both generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and install those manifests into the cluster and create a custom resoruce (CR) for the `qliksene operator` then the operator make association to the isntalled resoruces  so that when `qliksenes uninstall` is performed the operator can delete all those kubernetes resources related to QSEoK for the current context.
-
-`qliksense install` or `qliksense config apply` will generate patches in local file system (i.e `~/.qliksense/contexts/<context-name>/qlik-k8s`) and
-
-- Install those manifests into the cluster 
-- Create a custom resoruce (CR) for the `qliksene operator`.
-
-The operator makes the association to the installed resoruces so that when `qliksense uninstall` is performed the operator can delete all kubernetes resources related to QSEoK for the current context.
 
 ## With a git repo
 
-Create a fork or clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and push it to your git repo/server
+User has to create fork or clone of [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) and push it to their own git server. When user perform `qliksense install` or `qliksene config apply` the qliksense operator do these tasks
 
-To add your repo into CR, perform the following:
+- downloads the corresponding version of manifests from the user's git repo.
+- generate kustomize patches
+- install kubernetes resoruces 
+- push those generated patches into a new branch in the provided git repo. so that user user can merge those patches into their master branch. 
+- spinup a cornjob to monitor master branch. If user modifies anything in the master branch those changes will be applied into the cluster. This is a light weight `git-ops` model
 
-```bash
+This is how repo info is provided into the CR
+
+```console
 qliksense config set git.repository="https://github.com/my-org/qliksense-k8s"
-qliksense config set git.accessToken="<mySecretToken>"
+
+qliksense config set git.accessToken=blablalaala
 ```
-
-When you perform `qliksense install` or `qliksene config apply`, qliksense operator performs these tasks:
-
-- Download corresponding version of manifests from the your git repo
-- Generate kustomize patches
-- Install kubernetes resources
-- Push generated patches into a new branch in the provided git repo. _Gives you ability to merge patches into your master branch_
-- Create a CronJob to monitor master branch. Any changes pushed to master branch will be applied into the cluster. _This is a light weight `git-ops` model_
-
-## GitOps
-
-To enable gitops, the following section should be in the CR
-
-```yaml
-....
-spec:
-  git:
-    repository: https://github.com/<OWNER>/<REPO>
-    accessToken: "<git-token>"
-    userName: "<git-username>"
-  gitOps:
-    enabled: "yes"
-    schedule: "*/5 * * * *"
-    watchBranch: <myBranch>
-    image: qlik-docker-oss.bintray.io/qliksense-repo-watcher
-....
-```
-

docs/getting_started.md

@@ -2,52 +2,29 @@
 
 ## Requirements
 
-- Kubernetes cluster (Docker Desktop with enabled Kubernetes)
+- `kubectl` need to be installed and configured properly so that `kubectl` can connect to the kubernetes cluser. The `qliksense` CLI uses `kubectl` under the hood to perform operations on cluster
-- `kubectl` installed, configured and able to communicate with kubernetes cluster. _`qliksense` CLI uses `kubectl` under the hood to perform operations on cluster_
+  - (Docker Desktop setup tested for these instructions)
 
-## Installing Sense installer
+## Download
-
-Download the executable for your platform from [releases page](https://github.com/qlik-oss/sense-installer/releases) and rename it to `qliksense`
-
-??? tldr "Linux"
-
-    ``` bash
-    curl -Lo qliksense https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-linux-amd64
-    chmod +x qliksense
-    sudo mv qliksense /usr/local/bin
-    ```
-
-??? tldr "MacOS"
-
-    ``` bash
-    curl -Lo qliksense https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-darwin-amd64
-    chmod +x qliksense
-    sudo mv qliksense /usr/local/bin
-    ```
-
-??? tldr "Windows"
-    Download Windows executable and add it in your `PATH` as `qliksense.exe`
-
-    [https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-windows-amd64.exe](https://github.com/qlik-oss/sense-installer/releases/download/v0.7.0/qliksense-windows-amd64.exe)
-    
 
+- Download the appropriate executable for your platform from the [releases page](https://github.com/qlik-oss/sense-installer/releases) and rename it to `qliksense`. All the examplease down below uses `qliksense`.
 
 ## Quick start
 
 - To download the version `v0.0.2` from qliksense-k8s [releases](https://github.com/qlik-oss/qliksense-k8s/releases).
 
 ```shell
-qliksense fetch v0.0.2
+$qliksense fetch v0.0.2
 ```
 
 - To install CRDs for QSEoK and qliksense operator into the kubernetes cluster.
 
 ```shell
-qliksense crds install --all
+$qliksense crds install --all
 ```
 
 - To install QSEoK into a namespace in the kubernetes cluster where `kubectl` is pointing to.
 
 ```shell
-qliksense install --acceptEULA="yes"
+$qliksense install --acceptEULA="yes"
-```
+```

docs/index.md

@@ -1,22 +1,19 @@
 # Overview
 
-The Qlik Sense installer CLI (`qliksense`) provides an imperative interface to many of the configurations that need to be applied against the declarative structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s). This cli facilitates:
+The Qlik Sense installer CLI (qliksense) provides an imperative interface to many of the configurations that need to be applied against the declarative structure described in [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s). This cli facilitates:
 
-- Installation of QSEoK
+- installation of QSEoK
-- Installation of qliksense operator to manage QSEoK
+- installation of qliksense operator to manage QSEoK
-- Air gapped installation of QSEoK
+- air gapped installation of QSEoK
 
-!!! info ""
+This is a technology preview that uses Qlik modified [kustomize](https://github.com/qlik-oss/kustomize) to kubernetes manifests of the versions of the [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository.
-    This is a technology preview that uses Qlik modified [kustomize](https://github.com/qlik-oss/kustomize) for kubernetes manifests on [qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s) repository
 
-!!! info ""
+For each version of a qliksense edge build there should be a corresponding release in [qliksense-k8s] repository under [releases](https://github.com/qlik-oss/qliksense-k8s/releases)
-    See QlikSense [edge releases on qliksense-k8s](https://github.com/qlik-oss/qliksense-k8s/releases) repository
 
 ## Future Direction
 
-Operations:
+- More operations:
-
+  - Expand preflight checks
-- Expand preflight checks
+  - backup/restore operations
-- Backup/restore operations
+  - fully support airgap installation of QSEoK
-- Fully support airgap installation of QSEoK
+  - restore unwanted deletion of kubernetes resources
-- Restore unwanted deletion of kubernetes resources

docs/preflight_checks.md

@@ -1,253 +0,0 @@
-##Preflight checks
-Preflight checks provide pre-installation cluster conformance testing and validation before we install qliksense on the cluster. We gather a suite of conformance tests that can be easily written and run on the target cluster to verify that cluster-specific requirements are met.
-The suite consists of a set of `collectors` which run the specifications of every test and `analyzers` which analyze the results of every test run by the collector.
-We support the following tests at the moment as part of preflight checks, and the range of the suite will be expanded in future.
-
-Run the following command to view help about the commands supported by preflight at any moment:
-```console
-$ qliksense preflight
-perform preflight checks on the cluster
-
-Usage:
-  qliksense preflight [command]
-
-Examples:
-qliksense preflight <preflight_check_to_run>
-
-Available Commands:
-  all         perform all checks
-  dns         perform preflight dns check
-  k8s-version check k8s version
-
-Flags:
-  -h, --help   help for preflight
-```
-
-### DNS check
-Run the following command to perform preflight DNS check. We setup a kubernetes deployment and try to reach it as part of establishing DNS connectivity in this check. 
-The expected output should be similar to the one shown below.
-```console
-$ qliksense preflight dns
-
-Preflight DNS check
----------------------
-Created deployment "dep-dns-preflight-check"
-Created service "svc-dns-pf-check"
-Created pod: pf-pod-1
-Fetching pod: pf-pod-1
-Fetching pod: pf-pod-1
-Exec-ing into the container...
-Preflight DNS check: PASSED
-Completed preflight DNS check
-Cleaning up resources...
-Deleted pod: pf-pod-1
-Deleted service: svc-dns-pf-check
-Deleted deployment: dep-dns-preflight-check
-
-```
-
-### Kubernetes version check
-We check the version of the target kubernetes cluster and ensure that it falls in the valid range of kubernetes versions that are supported by qliksense. 
-The command to run this check and the expected similar output are as shown below:
-```console
-$ qliksense preflight k8s-version
-
-Preflight kubernetes minimum version check
-------------------------------------------
-Kubernetes API Server version: v1.15.5
-Current K8s Version: 1.15.5
-Current 1.15.5 is greater than minimum required version:1.11.0, hence good to go
-Preflight minimum kubernetes version check: PASSED
-Completed Preflight kubernetes minimum version check
-
-```
-
-### Service check
-We use the commmand below to test if we are able to create a service in the cluster.
-```console
-$ qliksense preflight service
-
-Preflight service check
------------------------
-
-Preflight service check: 
-Created service "svc-pf-check"
-Preflight service creation check: PASSED
-Cleaning up resources...
-Deleted service: svc-pf-check
-Completed preflight service check
-```
-
-### Deployment check
-We use the commmand below to test if we are able to create a deployment in the cluster. After the test exexutes, we wait until the created deployment terminates before we exit the command. 
-```console
-$ qliksense preflight deployment
-
-Preflight deployment check
------------------------
-Preflight deployment check: 
-Created deployment "deployment-preflight-check"
-Preflight Deployment check: PASSED
-Cleaning up resources...
-Deleted deployment: deployment-preflight-check
-Completed preflight deployment check
-```
-
-### Pod check
-We use the commmand below to test if we are able to create a pod in the cluster.
-```console
-$ qliksense preflight pod
-
-Preflight pod check
---------------------
-
-Preflight pod check: 
-Created pod: pod-pf-check
-Preflight pod creation check: PASSED
-Cleaning up resources...
-Deleted pod: pod-pf-check
-Completed preflight pod check
-```
-
-### Create-Role check
-We use the command below to test if we are able to create a role in the cluster
-```shell
-$ qliksense preflight create-role
-Preflight create-role check
----------------------------
-Preflight create-role check: 
-Created role: role-preflight-check
-Preflight create-role check: PASSED
-Cleaning up resources...
-Deleted role: role-preflight-check
-
-Completed preflight create-role check
-```
-
-### Create-RoleBinding check
-We use the command below to test if we are able to create a role binding in the cluster
-```shell
-$ qliksense preflight createRoleBinding
-
-Preflight create roleBinding check
----------------------------
-Preflight createRoleBinding check: 
-Created RoleBinding: role-binding-preflight-check
-Preflight createRoleBinding check: PASSED
-Cleaning up resources...
-Deleting RoleBinding: role-binding-preflight-check
-Deleted RoleBinding: role-binding-preflight-check
-
-Completed preflight createRoleBinding check
-```
-
-### Create-ServiceAccount check
-We use the command below to test if we are able to create a service account in the cluster
-```shell
-$ qliksense preflight createServiceAccount
-
-Preflight create ServiceAccount check
--------------------------------------
-Preflight createServiceAccount check: 
-Created Service Account: preflight-check-test-serviceaccount
-Preflight createServiceAccount check: PASSED
-Cleaning up resources...
-Deleting ServiceAccount: preflight-check-test-serviceaccount
-Deleted ServiceAccount: preflight-check-test-serviceaccount
-
-Completed preflight createServiceAccount check
-```
-
-### CreateRB check
-We use the command below to combine creation of role, role binding, and service account tests
-```shell
-$ qliksense preflight createRB
-
-Preflight createRB check
--------------------------------------
-Preflight create-role check: 
-Created role: role-preflight-check
-Preflight create-role check: PASSED
-Cleaning up resources...
-Deleted role: role-preflight-check
-
-Completed preflight create-role check
-
-Preflight create RoleBinding check: 
-Created RoleBinding: role-binding-preflight-check
-Preflight create RoleBinding check: PASSED
-Cleaning up resources...
-Deleted RoleBinding: role-binding-preflight-check
-
-Completed preflight create RoleBinding check
-
-Preflight createServiceAccount check: 
-Created Service Account: preflight-check-test-serviceaccount
-Preflight createServiceAccount check: PASSED
-Cleaning up resources...
-Deleted ServiceAccount: preflight-check-test-serviceaccount
-
-Completed preflight createServiceAccount check
-Completed preflight CreateRB check
-```
-
-### Mongodb check
-We can check if we are able to connect to an instance of mongodb on the cluster by either supplying the mongodbUri as part of the command or infer it from the current context.
-
-```shell
-qliksense preflight mongo --url=<url> OR
-qliksense preflight mongo
-
-Preflight mongo check
----------------------
-Preflight mongodb check: 
-Created pod: pf-mongo-pod
-stdout: MongoDB shell version v4.2.5
-connecting to: <url>/?compressors=disabled&gssapiServiceName=mongodb
-Implicit session: session { "id" : UUID("64f639d3-2c93-4894-80f6-ee14acaf56a5") }
-MongoDB server version: 4.2.5
-bye
-stderr: 
-Preflight mongo check: PASSED
-Deleted pod: pf-mongo-pod
-Completed preflight mongodb check
-```
-
-
-
-### Running all checks
-Run the command shown below to execute all preflight checks.
-```console
-$ qliksense preflight all --mongodb-url=<url> OR
-$ qliksense preflight all
-
-Running all preflight checks
-
-Preflight DNS check
--------------------
-Created deployment "dep-dns-preflight-check"
-Created service "svc-dns-pf-check"
-Created pod: pf-pod-1
-Fetching pod: pf-pod-1
-Fetching pod: pf-pod-1
-Exec-ing into the container...
-Preflight DNS check: PASSED
-Completed preflight DNS check
-Cleaning up resources...
-Deleted pod: pf-pod-1
-Deleted service: svc-dns-pf-check
-Deleted deployment: dep-dns-preflight-check
-
-Preflight kubernetes minimum version check
-------------------------------------------
-Kubernetes API Server version: v1.15.5
-Current K8s Version: 1.15.5
-Current 1.15.5 is greater than minimum required version:1.11.0, hence good to go
-Preflight minimum kubernetes version check: PASSED
-Completed Preflight kubernetes minimum version check
-...
-...
-All preflight checks have PASSED
-Completed running all preflight checks
-
-```

go.mod

@@ -10,13 +10,12 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
 	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
 
-	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36
+	sigs.k8s.io/kustomize/api => github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9
 )
 
 require (
 	cloud.google.com/go v0.52.0 // indirect
 	cloud.google.com/go/storage v1.5.0 // indirect
-	github.com/Masterminds/semver/v3 v3.0.3
 	github.com/Shopify/ejson v1.2.1
 	github.com/aws/aws-sdk-go v1.28.9 // indirect
 	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
@@ -32,36 +31,30 @@ require (
 	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/mattn/go-colorable v0.1.4
-	github.com/mattn/go-tty v0.0.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/otiai10/copy v1.1.1
+	github.com/qlik-oss/k-apis v0.0.19
-	github.com/pkg/errors v0.8.1
-	github.com/qlik-oss/k-apis v0.1.0
-	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.5.2 // indirect
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.1
-	github.com/src-d/go-git v4.7.0+incompatible
 	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
-	golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 // indirect
+	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect
 	golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a // indirect
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
 	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
-	golang.org/x/tools v0.0.0-20200312194400-c312e98713c2 // indirect
+	golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f // indirect
 	google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
 	google.golang.org/grpc v1.27.0 // indirect
-	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.2.8
 	gopkg.in/yaml.v3 v3.0.0-20190924164351-c8b7dadae555
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0
-	k8s.io/client-go v11.0.0+incompatible
 	sigs.k8s.io/kustomize/api v0.3.2
 	sigs.k8s.io/yaml v1.1.0
 )

go.sum

@@ -131,8 +131,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
@@ -563,8 +561,6 @@ github.com/hashicorp/go-retryablehttp v0.6.3/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.1 h1:DMo4fmknnz0E0evoNYnV48RjWndOsmd6OW+09R3cEP8=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
-github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
@@ -572,7 +568,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
@@ -701,13 +696,9 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.6 h1:V2iyH+aX9C5fsYCpK60U8BYIvmhqxuOL3JZcqc1NB7k=
-github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.6 h1:9Jok5pILi5S1MnDirGVTufYGtksUs/V2BWUP3ZkeUUI=
 github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
-github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI=
-github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -792,14 +783,6 @@ github.com/opencontainers/selinux v1.3.0 h1:xsI95WzPZu5exzA6JzkLSfdr/DilzOhCJOqG
 github.com/opencontainers/selinux v1.3.0/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
-github.com/otiai10/copy v1.1.1 h1:PH7IFlRQ6Fv9vYmuXbDRLdgTHoP1w483kPNUP2bskpo=
-github.com/otiai10/copy v1.1.1/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
-github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
-github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI=
-github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
-github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
-github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
-github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -860,22 +843,17 @@ 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.0.35 h1:LdxfN43UE4Fy4LAmFcsv2nXCuxfxowKY66rpUQHAyDU=
+github.com/qlik-oss/k-apis v0.0.16/go.mod h1:KOFzKVIdRqp47ytnHg3+9zb8fTlnrQjO6aKiwcrCJUE=
-github.com/qlik-oss/k-apis v0.0.35/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
+github.com/qlik-oss/k-apis v0.0.17 h1:tOdrEe9gfb9CXq0+uowFnXIsI781qz/zgeN8xqupXYw=
-github.com/qlik-oss/k-apis v0.0.36 h1:Ztd31rKn4uR3AQRb9QxYf1KEll4+Ku1E8DzCpplBw/g=
+github.com/qlik-oss/k-apis v0.0.17/go.mod h1:KOFzKVIdRqp47ytnHg3+9zb8fTlnrQjO6aKiwcrCJUE=
-github.com/qlik-oss/k-apis v0.0.36/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
+github.com/qlik-oss/k-apis v0.0.19 h1:yrMgALQ08vMDi5hN6fnvIfyNsEaXA5fZjB1YhyIdTfg=
-github.com/qlik-oss/k-apis v0.0.39 h1:fIGCC7f9kU7319VTSJKr3fLoA9E4MjusRFmOjX3ypis=
+github.com/qlik-oss/k-apis v0.0.19/go.mod h1:DNiWYqCqPIN216l7+1rccArNIYPb1Le7kYDcPSyNp+Q=
-github.com/qlik-oss/k-apis v0.0.39/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9 h1:iqeqTS4zjp6rPEaxmFB7pemA2CMjOEN5dYSXZaQ82uw=
-github.com/qlik-oss/k-apis v0.1.0 h1:uMl1316SNYy5Hm6jy1U7wiCMkut0tKqdP8mBpSuXXp8=
+github.com/qlik-oss/kustomize/api v0.3.3-0.20200206224201-2e697eccbad9/go.mod h1:OCt7FTrRVHj4kmR2xLJJUIqu00BTr6GeF09hSmM17Kw=
-github.com/qlik-oss/k-apis v0.1.0/go.mod h1:yoYGgPJ/H0t9H3NSq64dWfyQY6QWi2L9c+hCJoVO03U=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36 h1:BuT+cnXPQ6mcOWTDS1S8GXy65LAEMdPuNQCC36rMq28=
-github.com/qlik-oss/kustomize/api v0.3.3-0.20200402170547-2e8140160c36/go.mod h1:tSQaDZ4Jt9KwYvD7LlMUPi5nkiGOno3PAKl5/XqEfxs=
 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=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -953,8 +931,6 @@ github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
 github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
-github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlorMfQehQbcE=
-github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -982,7 +958,6 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
@@ -1017,8 +992,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMx
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
-github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
@@ -1070,8 +1043,10 @@ golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
-golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1233,8 +1208,8 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c h1:2EA2K0k9bcvvEDlqD8xdlOhCOqq+O/p9Voqi4x9W1YU=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200312194400-c312e98713c2 h1:6TB4+MaZlkcSsJDu+BS5yxSEuZIYhjWz+jhbSLEZylI=
+golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f h1:NbrfHxef+IfdI86qCgO/1Siq1BuMH2xG0NqgvCguRhQ=
-golang.org/x/tools v0.0.0-20200312194400-c312e98713c2/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200309202150-20ab64c0d93f/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

mkdocs.yml

@@ -10,15 +10,9 @@ markdown_extensions:
   - toc:
       permalink: true
   - admonition
-  - codehilite
-  - pymdownx.inlinehilite
-  - pymdownx.superfences
-  - pymdownx.details
 nav:
   - Overview: index.md
   - getting_started.md
-  - command_reference.md
   - concepts.md
-  - preflight_checks.md
   - air_gap.md
   - Releases ⧉: https://github.com/qlik-oss/sense-installer/releases

pkg/api/apis.go

@@ -1,9 +1,11 @@
 package api
 
 import (
+	"crypto/rsa"
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -21,44 +23,34 @@ const (
 	qliksenseContextsDirName = "contexts"
 	qliksenseSecretsDirName  = "secrets"
 	qliksenseEjsonDirName    = "ejson"
-	QLIK_GIT_REPO            = "https://github.com/qlik-oss/qliksense-k8s"
 )
 
 // NewQConfig create QliksenseConfig object from file ~/.qliksense/config.yaml
 func NewQConfig(qsHome string) *QliksenseConfig {
-	qc, err := NewQConfigE(qsHome)
-	if err != nil {
-		fmt.Println("yaml unmarshalling error ", err)
-		os.Exit(1)
-	}
-	return qc
-}
-
-func NewQConfigE(qsHome string) (*QliksenseConfig, error) {
 	configFile := filepath.Join(qsHome, "config.yaml")
 	qc := &QliksenseConfig{}
 
 	err := ReadFromFile(qc, configFile)
 	if err != nil {
-		return nil, err
+		fmt.Println("yaml unmarshalling error ", err)
+		os.Exit(1)
 	}
 	qc.QliksenseHomePath = qsHome
-	return qc, nil
+	return qc
-}
-func NewQConfigEmpty(qsHome string) *QliksenseConfig {
-	return &QliksenseConfig{
-		QliksenseHomePath: qsHome,
-	}
 }
 
 // GetCR create a QliksenseCR object for a particular context
 // from file ~/.qliksense/contexts/<contx-name>/<contx-name>.yaml
 func (qc *QliksenseConfig) GetCR(contextName string) (*QliksenseCR, error) {
-	crFilePath := qc.GetCRFilePath(contextName)
+	crFilePath := qc.getCRFilePath(contextName)
 	if crFilePath == "" {
 		return nil, errors.New("context name " + contextName + " not found")
 	}
-	return qc.GetAndTransformCrObject(crFilePath)
+	return getCRObject(crFilePath)
+}
+
+func getUnencryptedCR() {
+
 }
 
 // GetCurrentCR create a QliksenseCR object for current context
@@ -67,14 +59,14 @@ func (qc *QliksenseConfig) GetCurrentCR() (*QliksenseCR, error) {
 }
 
 // SetCrLocation sets the CR location for a context. Helpful during test
-func (qc *QliksenseConfig) SetCrLocation(contextName, filePath string) (*QliksenseConfig, error) {
+func (qc *QliksenseConfig) SetCrLocation(contextName, filepath string) (*QliksenseConfig, error) {
 	tempQc := &QliksenseConfig{}
 	copier.Copy(tempQc, qc)
 	found := false
 	tempQc.Spec.Contexts = []Context{}
 	for _, c := range qc.Spec.Contexts {
 		if c.Name == contextName {
-			c.CrFile = filePath
+			c.CrFile = filepath
 			found = true
 		}
 		tempQc.Spec.Contexts = append(tempQc.Spec.Contexts, []Context{c}...)
@@ -85,8 +77,7 @@ func (qc *QliksenseConfig) SetCrLocation(contextName, filePath string) (*Qliksen
 	return nil, errors.New("cannot find the context")
 }
 
-// GetCRObject create a qliksense CR object from file
+func getCRObject(crfile string) (*QliksenseCR, error) {
-func GetCRObject(crfile string) (*QliksenseCR, error) {
 	cr := &QliksenseCR{}
 	err := ReadFromFile(cr, crfile)
 	if err != nil {
@@ -97,112 +88,16 @@ func GetCRObject(crfile string) (*QliksenseCR, error) {
 	return cr, nil
 }
 
-func (qc *QliksenseConfig) GetAndTransformCrObject(crfile string) (*QliksenseCR, error) {
+func (qc *QliksenseConfig) getCRFilePath(contextName string) string {
-	cr, err := GetCRObject(crfile)
-	if err != nil {
-		return nil, err
-	}
-	if cr.Spec.ManifestsRoot != "" && !filepath.IsAbs(cr.Spec.ManifestsRoot) {
-		cr.Spec.ManifestsRoot = filepath.Join(qc.QliksenseHomePath, cr.Spec.ManifestsRoot)
-	}
-	return cr, nil
-}
-
-//CreateCRObjectFromString create a QliksenseCR from string content
-func CreateCRObjectFromString(crContent string) (*QliksenseCR, error) {
-	if crContent == "" {
-		return nil, errors.New("empty string cannot qliksensecr")
-	}
-	cr := &QliksenseCR{}
-	err := ReadFromStream(cr, strings.NewReader(crContent))
-	if err != nil {
-		fmt.Println("cannot unmarshal cr ", err)
-		return nil, err
-	}
-	return cr, nil
-}
-
-func (qc *QliksenseConfig) GetCRFilePath(contextName string) string {
 	crFilePath := ""
 	for _, ctx := range qc.Spec.Contexts {
 		if ctx.Name == contextName {
-			crFilePath = filepath.Join(qc.QliksenseHomePath, ctx.CrFile)
+			crFilePath = ctx.CrFile
 			break
 		}
 	}
 	return crFilePath
 }
-
-func (cr *QliksenseCR) IsRepoExist() bool {
-	if cr.Spec.ManifestsRoot == "" {
-		return false
-	}
-	if _, err := os.Lstat(cr.Spec.ManifestsRoot); err != nil {
-		return false
-	}
-	return true
-}
-
-func (cr *QliksenseCR) GetFetchUrl() string {
-	if cr.Spec.FetchSource == nil || cr.Spec.FetchSource.Repository == "" {
-		return QLIK_GIT_REPO
-	}
-	return cr.Spec.FetchSource.Repository
-}
-
-func (cr *QliksenseCR) GetFetchAccessToken(encryptionKey string) string {
-	if cr.Spec.FetchSource == nil {
-		return ""
-	}
-	if tok, err := cr.Spec.FetchSource.GetAccessToken(); err != nil {
-		fmt.Println(err)
-		return ""
-	} else {
-		by, _ := b64.StdEncoding.DecodeString(tok)
-		res, err := DecryptData(by, encryptionKey)
-		if err != nil {
-			fmt.Println(err)
-			return ""
-		}
-		return string(res)
-	}
-}
-
-func (cr *QliksenseCR) SetFetchUrl(url string) {
-	if cr.Spec.FetchSource == nil {
-		cr.Spec.FetchSource = &config.Repo{}
-	}
-	cr.Spec.FetchSource.Repository = url
-}
-
-func (cr *QliksenseCR) SetFetchAccessToken(token, encryptionKey string) error {
-	if cr.Spec.FetchSource == nil {
-		cr.Spec.FetchSource = &config.Repo{}
-	}
-	res, err := EncryptData([]byte(token), encryptionKey)
-	if err != nil {
-		return err
-	}
-	cr.Spec.FetchSource.AccessToken = b64.StdEncoding.EncodeToString(res)
-	return nil
-}
-
-func (cr *QliksenseCR) SetFetchAccessSecretName(sec string) {
-	if cr.Spec.FetchSource == nil {
-		cr.Spec.FetchSource = &config.Repo{}
-	}
-	cr.Spec.FetchSource.SecretName = sec
-}
-
-//DeleteRepo delete the manifest repo and unset manifestsRoot
-func (cr *QliksenseCR) DeleteRepo() error {
-	if err := os.RemoveAll(cr.Spec.ManifestsRoot); err != nil {
-		return err
-	}
-	cr.Spec.ManifestsRoot = ""
-	return nil
-}
-
 func (qc *QliksenseConfig) IsRepoExist(contextName, version string) bool {
 	if _, err := os.Lstat(qc.BuildRepoPathForContext(contextName, version)); err != nil {
 		return false
@@ -217,81 +112,28 @@ func (qc *QliksenseConfig) IsRepoExistForCurrent(version string) bool {
 	return true
 }
 
-func (qc *QliksenseConfig) DeleteRepoForCurrent(version string) error {
-	path := qc.BuildRepoPath(version)
-	return os.RemoveAll(path)
-}
-
 func (qc *QliksenseConfig) BuildRepoPath(version string) string {
 	return qc.BuildRepoPathForContext(qc.Spec.CurrentContext, version)
 }
 
 func (qc *QliksenseConfig) BuildRepoPathForContext(contextName, version string) string {
-	return filepath.Join(qc.GetContextPath(contextName), "qlik-k8s", version)
+	return filepath.Join(qc.QliksenseHomePath, qliksenseContextsDirName, contextName, "qlik-k8s", version)
 }
 
 func (qc *QliksenseConfig) BuildCurrentManifestsRoot(version string) string {
 	return qc.BuildRepoPath(version)
 }
 
-func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR) error {
+func (qc *QliksenseConfig) WriteCR(cr *QliksenseCR, contextName string) error {
-	crf := qc.GetCRFilePath(cr.GetName())
+	crf := qc.getCRFilePath(contextName)
 	if crf == "" {
-		return errors.New("context name " + cr.GetName() + " not found")
+		return errors.New("context name " + contextName + " not found")
 	}
-
+	return WriteToFile(cr, crf)
-	return qc.TransformAndWriteCr(cr, crf)
 }
 
-//CreateOrWriteCrAndContext create necessary folder structure, update config.yaml and context yaml files
-func (qc *QliksenseConfig) CreateOrWriteCrAndContext(cr *QliksenseCR) error {
-	if qc.QliksenseHomePath == "" {
-		return errors.New("qliksense home is not set")
-	}
-	crf := qc.GetCRFilePath(cr.GetName())
-	if crf == "" {
-		// create direcotry structure for context
-		cDir := filepath.Join(qc.QliksenseHomePath, "contexts", cr.GetName())
-		if err := os.MkdirAll(cDir, os.ModePerm); err != nil {
-			return err
-		}
-		crf = filepath.Join(cDir, cr.GetName()+".yaml")
-		ctx := Context{
-			Name:   cr.GetName(),
-			CrFile: "contexts/" + cr.GetName() + "/" + cr.GetName() + ".yaml", //filepath.Join("contexts", cr.GetName(), cr.GetName()+".yaml"),
-		}
-		qc.AddToContexts(ctx)
-
-		if err := qc.Write(); err != nil {
-			return err
-		}
-	}
-
-	return qc.TransformAndWriteCr(cr, crf)
-}
-
-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
-	}
-	if cr.Spec.ManifestsRoot != "" {
-		cr.Spec.ManifestsRoot = filepath.Join(qc.QliksenseHomePath, cr.Spec.ManifestsRoot)
-	}
-	return nil
-}
-func (qc *QliksenseConfig) AddToContexts(ctx Context) error {
-	//TODO: additional duplicate check may be added latter
-	qc.Spec.Contexts = append(qc.Spec.Contexts, ctx)
-
-	return nil
-}
 func (qc *QliksenseConfig) WriteCurrentContextCR(cr *QliksenseCR) error {
-	return qc.WriteCR(cr)
+	return qc.WriteCR(cr, qc.Spec.CurrentContext)
 }
 
 func (qc *QliksenseConfig) IsContextExist(ctxName string) bool {
@@ -322,9 +164,9 @@ func (qc *QliksenseConfig) GetCurrentContextSecretsDir() (string, error) {
 func (qc *QliksenseConfig) setDockerConfigJsonSecret(filename string, dockerConfigJsonSecret *DockerConfigJsonSecret) error {
 	if secretsDir, err := qc.GetCurrentContextSecretsDir(); err != nil {
 		return err
-	} else if encryptionKey, err := qc.GetEncryptionKeyForCurrent(); err != nil {
+	} else if publicKey, _, err := qc.GetCurrentContextEncryptionKeyPair(); err != nil {
 		return err
-	} else if dockerConfigJsonSecretYaml, err := dockerConfigJsonSecret.ToYaml(encryptionKey); err != nil {
+	} else if dockerConfigJsonSecretYaml, err := dockerConfigJsonSecret.ToYaml(publicKey); err != nil {
 		return err
 	} else if err := os.MkdirAll(secretsDir, os.ModePerm); err != nil {
 		return err
@@ -371,24 +213,15 @@ func (qc *QliksenseConfig) getDockerConfigJsonSecret(name string) (*DockerConfig
 		return nil, err
 	} else if dockerConfigJsonSecretYaml, err := ioutil.ReadFile(filepath.Join(secretsDir, name)); err != nil {
 		return nil, err
-	} else if encryptionKey, err := qc.GetEncryptionKeyForCurrent(); err != nil {
+	} else if _, privateKey, err := qc.GetCurrentContextEncryptionKeyPair(); err != nil {
 		return nil, err
-	} else if err := dockerConfigJsonSecret.FromYaml(dockerConfigJsonSecretYaml, encryptionKey); err != nil {
+	} else if err := dockerConfigJsonSecret.FromYaml(dockerConfigJsonSecretYaml, privateKey); err != nil {
 		return nil, err
 	}
 	return dockerConfigJsonSecret, nil
 }
 
 func (qc *QliksenseConfig) getCurrentContextEncryptionKeyPairLocation() (string, error) {
-
-	if qcr, err := qc.GetCurrentCR(); err != nil {
-		return "", err
-	} else {
-		return qc.getContextEncryptionKeyLocation(qcr.GetName())
-	}
-}
-
-func (qc *QliksenseConfig) getContextEncryptionKeyLocation(contextName string) (string, error) {
 	// Check env var: QLIKSENSE_KEY_LOCATION to determine location to store keypair
 	var secretKeyPairLocation string
 	if os.Getenv("QLIKSENSE_KEY_LOCATION") != "" {
@@ -397,10 +230,14 @@ func (qc *QliksenseConfig) getContextEncryptionKeyLocation(contextName string) (
 	} else {
 		// QLIKSENSE_KEY_LOCATION has not been set, hence storing key pair in default location:
 		// /.qliksense/secrets/contexts/<current-context>/secrets/
-		secretKeyPairLocation = filepath.Join(qc.QliksenseHomePath, qliksenseSecretsDirName, qliksenseContextsDirName, contextName, qliksenseSecretsDirName)
+		if qcr, err := qc.GetCurrentCR(); err != nil {
+			return "", err
+		} else {
+			secretKeyPairLocation = filepath.Join(qc.QliksenseHomePath, qliksenseSecretsDirName, qliksenseContextsDirName, qcr.GetObjectMeta().GetName(), qliksenseSecretsDirName)
+		}
 	}
-
+	LogDebugMessage("SecretKeyLocation to store key pair: %s", secretKeyPairLocation)
-	return secretKeyPairLocation, os.MkdirAll(secretKeyPairLocation, os.ModePerm)
+	return secretKeyPairLocation, nil
 }
 
 func (qc *QliksenseConfig) GetCurrentContextEjsonKeyDir() (string, error) {
@@ -415,25 +252,44 @@ func (qc *QliksenseConfig) GetCurrentContextEjsonKeyDir() (string, error) {
 	}
 }
 
-func (qc *QliksenseConfig) GetEncryptionKeyForCurrent() (string, error) {
+func (qc *QliksenseConfig) GetCurrentContextEncryptionKeyPair() (*rsa.PublicKey, *rsa.PrivateKey, error) {
-	if qcr, err := qc.GetCurrentCR(); err != nil {
+	secretKeyPairLocation, err := qc.getCurrentContextEncryptionKeyPairLocation()
-		return "", err
-	} else {
-		return qc.GetEncryptionKeyFor(qcr.GetName())
-	}
-}
-
-func (qc *QliksenseConfig) GetEncryptionKeyFor(contextName string) (string, error) {
-	secretKeyLocation, err := qc.getContextEncryptionKeyLocation(contextName)
 	if err != nil {
-		return "", err
+		return nil, nil, err
 	}
-	key, err := LoadSecretKey(secretKeyLocation)
+
-	if key != "" {
+	publicKeyFilePath := filepath.Join(secretKeyPairLocation, QliksensePublicKey)
-		return key, nil
+	privateKeyFilePath := filepath.Join(secretKeyPairLocation, QliksensePrivateKey)
+	// try to create the dir if it doesn't exist
+	if !FileExists(publicKeyFilePath) || !FileExists(privateKeyFilePath) {
+		LogDebugMessage("Qliksense secretKeyLocation dir does not exist, creating it now: %s", secretKeyPairLocation)
+		if err := os.MkdirAll(secretKeyPairLocation, os.ModePerm); err != nil {
+			err = fmt.Errorf("Not able to create %s dir: %v", secretKeyPairLocation, err)
+			log.Println(err)
+			return nil, nil, err
+		}
+		// generating and storing key-pair
+		err1 := GenerateAndStoreSecretKeypair(secretKeyPairLocation)
+		if err1 != nil {
+			err1 = fmt.Errorf("Not able to generate and store key pair for encryption")
+			log.Println(err1)
+			return nil, nil, err1
+		}
+	}
+
+	if publicKeyBytes, err := ReadKeys(publicKeyFilePath); err != nil {
+		LogDebugMessage("Not able to read public key")
+		return nil, nil, err
+	} else if privateKeyBytes, err := ReadKeys(privateKeyFilePath); err != nil {
+		LogDebugMessage("Not able to read private key")
+		return nil, nil, err
+	} else if rsaPublicKey, err := DecodeToPublicKey(publicKeyBytes); err != nil {
+		return nil, nil, err
+	} else if rsaPrivateKey, err := DecodeToPrivateKey(privateKeyBytes); err != nil {
+		return nil, nil, err
+	} else {
+		return rsaPublicKey, rsaPrivateKey, nil
 	}
-	fmt.Println("Generating new encryption key for the context: " + contextName)
-	return GenerateAndStoreSecretKey(secretKeyLocation)
 }
 
 func (cr *QliksenseCR) AddLabelToCr(key, value string) {
@@ -486,27 +342,11 @@ func (cr *QliksenseCR) IsEULA() bool {
 	return false
 }
 
-func (cr *QliksenseCR) SetEULA(value string) {
-	cr.Spec.AddToConfigs("qliksense", "acceptEULA", value)
-}
-
-// GetCustomCrdsPath get crds path if exist in the profile dir
-func (cr *QliksenseCR) GetCustomCrdsPath() string {
-	if cr.Spec.ManifestsRoot == "" || cr.Spec.Profile == "" {
-		return ""
-	}
-	crdsPath := filepath.Join(cr.Spec.GetManifestsRoot(), "manifests", cr.Spec.Profile, "crds")
-	if _, err := os.Lstat(crdsPath); err != nil {
-		return ""
-	}
-	return crdsPath
-}
-
 // GetDecryptedCr it decrypts all the encrypted value and return a new CR
 func (qc *QliksenseConfig) GetDecryptedCr(cr *QliksenseCR) (*QliksenseCR, error) {
 	newCr := &QliksenseCR{}
 	copier.Copy(newCr, cr)
-	encryptionKey, err := qc.GetEncryptionKeyFor(cr.GetName())
+	_, rsaPrivateKey, err := qc.GetCurrentContextEncryptionKeyPair()
 	if err != nil {
 		return nil, err
 	}
@@ -519,7 +359,7 @@ func (qc *QliksenseConfig) GetDecryptedCr(cr *QliksenseCR) (*QliksenseCR, error)
 				if err != nil {
 					return nil, err
 				}
-				db, err := DecryptData(b, encryptionKey)
+				db, err := Decrypt(b, rsaPrivateKey)
 				if err != nil {
 					return nil, err
 				}
@@ -532,52 +372,5 @@ func (qc *QliksenseConfig) GetDecryptedCr(cr *QliksenseCR) (*QliksenseCR, error)
 		finalSecrets[k] = newNvs
 	}
 	newCr.Spec.Secrets = finalSecrets
-
-	if newCr.Spec.FetchSource != nil && newCr.Spec.FetchSource.AccessToken != "" {
-		decData := cr.GetFetchAccessToken(encryptionKey)
-		newCr.Spec.FetchSource.AccessToken = decData
-	}
 	return newCr, nil
 }
-
-//Validate validate CR
-func (cr *QliksenseCR) Validate() bool {
-	return true
-}
-
-//CreateContextDirs create context dir structure ~/.qliksense/contexts/contextName
-func (qc *QliksenseConfig) CreateContextDirs(contextName string) error {
-	return os.MkdirAll(qc.GetContextPath(contextName), os.ModePerm)
-}
-
-func (qc *QliksenseConfig) GetContextPath(contextName string) string {
-	return filepath.Join(qc.QliksenseHomePath, qliksenseContextsDirName, contextName)
-}
-
-//BuildCrFileAbsolutePath build absolute path for a cr ie. ~/.qliksense/contexts/qlik-defautl/qlik-default.yaml
-func (qc *QliksenseConfig) BuildCrFileAbsolutePath(contextName string) string {
-	return filepath.Join(qc.GetContextPath(contextName), contextName+".yaml")
-}
-
-//BuildCrFilePath build cr file path i.e. contexts/qlik-default/qlik-default.yaml
-func (qc *QliksenseConfig) BuildCrFilePath(contextName string) string {
-	return filepath.Join(qc.GetContextPath(contextName), contextName+".yaml")
-}
-
-//AddToContexts add the context into qc.Spec.Contexts
-func (qc *QliksenseConfig) AddToContextsRaw(crName, crFile string) {
-	qc.Spec.Contexts = append(qc.Spec.Contexts, []Context{
-		{CrFile: crFile,
-			Name: crName},
-	}...)
-}
-
-//SetCurrentContextName set the qc.Spec.CurrentContext
-func (qc *QliksenseConfig) SetCurrentContextName(name string) {
-	qc.Spec.CurrentContext = name
-}
-
-//Write write QliksenseConfig into config.yaml
-func (qc *QliksenseConfig) Write() error {
-	return WriteToFile(qc, filepath.Join(qc.QliksenseHomePath, "config.yaml"))
-}

pkg/api/apis_test.go

@@ -1,7 +1,6 @@
 package api
 
 import (
-	b64 "encoding/base64"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -53,6 +52,12 @@ spec:
     qliksense:
       - name: acceptEULA
         value: "yes"
+  secrets:
+    qliksense:
+    - name: mongoDbUri
+      # this is rsa encrypted value, the pub and pri keys are in setuPublicAndPrivateKey() method
+      # actual value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
+      value: n/pDi7Z/A3i16cAHFFwMp19/egNKc8WZxm6MKHLT/B1DMv3U6pDXWyXT5fYYDV1wDTO3Vk43yECST1UgZYmMpgUOwgSfGgqTVi2VqS0JQsnwI+Twwhnvha8RJANX8b/XIoSFVWaOgy7+RP35ZkvOqHdCfC2aT8JMIHgBQqqCbsNgimCuRSxi0klR000ic/Tp5PYSz5mD+WLrkPw2FbS0OVBsQ/hIp5GZrmVpvEOZdbT63Sz+n/G4Br6GTv2LkZcU7JBuKQm2wfB+mRjJmJnNrPawLfn2UZ89Rz0BLwIy+6b24/RoIUgoNowfGkJreGiwItGK8fjCcx11oavK/yAo6pYZXCcru46pmHbxxle1OlkdTKkG6EVtJuKjSZXtVmBHZYRFzsR7HnAiXnL7QzSEcS7ieZlQvTmNLfpidJhK199oSbyKREqXGl2S8DzPKM9RLccVbQTy6X8qWimP3MYCnO4K0KoQnNQAgfuV8ZxnvdDecByLDPIpmFMGy0Xm9pUZWxmSoDBq+p5WBI2HdCX2gCYVv5yxS2iBqO5SMKo8iOglHtPI9NIMvloERdN1vZtxSRkY5uDEfrU9ysYwfayEXxvXmdWv0HxlotcgUinP02j7k+OfIapTmY/jGfvF4euyCGRKuJ9JlSD9pIiRdAcekjL6hCxXLJLdajCV4sL/YDo=
 `
 	ctx1Dir := filepath.Join(homeDir, "contexts", "contx1")
 	crFile := filepath.Join(ctx1Dir, "contx1.yaml")
@@ -69,7 +74,7 @@ func TestGetCR(t *testing.T) {
 	// create CR
 	createCRFile(dir)
 
-	crFile := filepath.Join("contexts", "contx1", "contx1.yaml")
+	crFile := filepath.Join(dir, "contexts", "contx1", "contx1.yaml")
 	qct, e := qc.SetCrLocation("contx1", crFile)
 	if e != nil {
 		t.Fail()
@@ -95,22 +100,19 @@ func TestGetDecryptedCr(t *testing.T) {
 	// create CR
 	createCRFile(dir)
 
-	crFile := filepath.Join("contexts", "contx1", "contx1.yaml")
+	crFile := filepath.Join(dir, "contexts", "contx1", "contx1.yaml")
 	qct, e := qc.SetCrLocation("contx1", crFile)
 	if e != nil {
 		t.Fail()
 		t.Log(e)
 	}
-
 	qcr, err := qct.GetCurrentCR()
+	if err != nil {
+		t.Fail()
+		t.Log(err)
+	}
 
-	key, _ := setupGenerateKey(dir)
+	setuPublicAndPrivateKey(dir)
-	ecn, _ := EncryptData([]byte("mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"), key)
-	b := b64.StdEncoding.EncodeToString(ecn)
-	qcr.Spec.AddToSecrets("qliksense", "mongoDbUri", b, "")
-
-	qcr.SetFetchAccessToken("mytoken", key)
-
 	newCr, err := qct.GetDecryptedCr(qcr)
 	if err != nil {
 		t.Fail()
@@ -127,12 +129,77 @@ func TestGetDecryptedCr(t *testing.T) {
 	if decryptedValue == orignalValue {
 		t.Fail()
 	}
-	if newCr.Spec.FetchSource.AccessToken != "mytoken" {
-		t.Fail()
-	}
 	td()
 }
-func setupGenerateKey(homeDir string) (string, error) {
+func setuPublicAndPrivateKey(homeDir string) ([]byte, []byte, error) {
+	privKeyBytes := []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIIJJwIBAAKCAgEAwUCimKCidbF3UxEHPy8K+hvhklRB9JYhj5sJy0if4lTVibkK
+1MrYCykOnmC40pPU9GLY1b8HxAg9tvyRn0YHUxOra6vVQaVcOVJhTM8D18d+lSr3
+Lp1yiX+UGT4nzWI9+R1CCbwXrqeQVoZs6QZKynEXMkFI9/wNMOwPOvQFOSTuoEoC
+O+zyTyUWEkNbUq825ELUQdIsjgmlWUOONudxsAr7ESRXW9QTHVh6uWmr3VRKZHby
+1JdU3I/wjdlGg5M2dDuXy5nQO9w/nYLjJXiw+zzOetZ/+t7/VOkOpNTeJQhwTM1W
+F7Y2VLetbi9FHgyzHatrduh07+XEiTbgDf3GIx2bp2p6oh0G3N2zpiLcK/aZj8ro
+uWWydfFfsU3MZ4FfJDP8I6b9awxjmKYqIr6hiPQCJaLBED8mwK+I5evIbnKv6E6u
+K+BApWA/R7ElragoFYbqQ1VpvntVMtJt9Dy5ZrI+IQARdXD3bb34oh0IPBhClnvv
+MUc1cWxDoXEX6oJ4I+LzxE87Zkwnan9qOwengolMVKFwPx1o37qrbmrXID21kKt7
+FL6xN4HxHLkItr1fKzdyWDFRHgASTAWfx5BIwvPuUW0vZHkvO80VyV2L63whVhPn
+PASmFkbviomrBttYfpr2aGQqF/qR1Nlxe834MFxk1pS9LMa/WnzvFr0gWakCAwEA
+AQKCAgARSp9B2N2wejibDiL/3E23I1eDqFZedDB8kPrHXbAwqDaTJCN79spt9TaB
+pVXkQaYEV/Pe7EDdoX8kKGU/QxzUqiXkdHOYdBtUZbKfFMbbP9ZrsnR7j0r4UpoF
+yDH3hprU93E5PcNAtW2M0GpeT1nR01yn+n908PCdOAIE3GC7RDq1zOl2QzVLL55R
+9ATv2Q2oTvJ/ETc7XlGVMx4+e2cIwXLFjeLjLI6pSYlxnarrGuetJZeEviWxto9n
+odFVZI6yx8JFTXX8ZTCr/1IjwDDVyhMPmrHI2Lsv9cqBpSpbVe32cUkKxhsGaYjz
+GvesQKamOPhco2ATNxPm0yopFlPsGKMfVl0BK0J6BqFh1BvU/SYJmXfnFuUNO3vV
+4u2Saa0q1iddxV0rXDwIqUfn+S6rwzK0G7y8bH2yvpB2VwiG3TFPnULep4wsefNq
+Fj92kqFBjacGpQLEEslUY0CMgeZ2+NuBQSUTscP3wBRsottMR6YXJtINdvfHBx+e
+EcN71z8D00w3mYqIQ7qb4Ml6HOqknunn58g43L9sACMUMTlEBXa9pUnScNYgWBAz
+W2q2mH37cIydM2JRZPpA8B4yTHt5ugJmChwyNFM7941arjKrebH+6AzLkofGedOP
+zg+vZQuPEXWs+3MBBnkWoyJW3Y0fbQdjsuQTtnd+7iyoxoBroQKCAQEA4dIiFlIS
+MDfRhQQWSiDvaw9aneDEJ3uo63ZRH5tm/IynLgtjYgEm/ZxlBCQgqRKLYELBxhu8
+SaF0uPK8pmpFJt0mIwSlsdeVhuE2obQeKUCczaqrKeaHS3PdWLjTlwph81BGRkHy
+qfqtNylyyMxrdEbnR51EtsWgFq6anTUAui1Q09JMuMNZRMOzDs1F4gExgD22rc0V
+c9YQ+jHJRxBGtNKMpMEqc8cvaxBidbItrN9SMTSWog7uYPBuEuaJ6K9vpgyJMOzJ
+SYcQEFGqgIqIDCg+ABE4d/4YROMKZ1DV/bJCind9brUHSx6XALsF0nC5c1Q9TnUL
+qI2khOwts4KYKwKCAQEA2xRC6Az97Vkdzu7BjLJ1FKmx4S2nEEgVS12ds82U+5Xf
+BHKAJnjqlqmmpzzJG+d77IYktz0+mey1QCNkqlm2fhuKs8LZMnpZRf0l8VcoBsUP
+/xKz7wfiE7RRFZtLJhPp4hhe43GzX5/JFMWMnC6UykwQbj4t1E/GNM/Suqwvg12M
+wktAJ6nqLgfhjQSO4xWo+nPzcbX+fNtrPCZVrBhYXihhcwRRNImWUCGJ6J4LMdPY
+Y9Z59qhOvE9cReH/Xw1av46omyiSyAqlgPyZ/kzA2IJSqYCjiQR/2+RD/g13jpcJ
+jatXLVZ8MJSL5OTS40G/HHTNNpNHbKKh0GOyxBA3ewKCAQBAn8UXhCcmW2L/YPsL
+/b7mcX9qPP+FmRLvR23R0MQ5M/tH5wRq8I969n3GIJykJeVzB8eybQ+GNslTgEvS
+iAkAJTubu+G7MkndTqg2wHf9MDtvdA8Fr646Po8yq7oJuHPtkKR7yLWsRUu6xIbP
+xgheP0hCq1QVxhqZQyCGKrvpi7xc0gsYuPbcAfFFJCOCmPrUi1SzCkTAYJt9LjA+
+wP6rErIjGBCRD4iXaBn1OqdtmH9KC5WsDP/VCBlIGWeQCly2NVIxiSHVg+xp7yUP
+IhXq/L05gbQaSsIhPKQmivCiaJg4The8TdwneDqYf+0bmxzHT203/bD3bImPbJNr
+ksz/AoIBAEwu4Y1cZzkQUmNRd5D7xecnk6ngfEYXKwCIT3zlMrfCSEl9n77BMaKu
+4Dsr0iuX9eosQ7xM2eYhAG6LYEg05lc4MKWOToVVMpI6E+W3Dz47bPKgiF3I+f8s
+Jz5CQIG/TwfGvciOE3hfUkec4ua09BzdEqGjkcBQ9XYMBxXPJr6h2379OBQS7FKR
+fwfQ2/dv4tElXTTfut2kV8gU9Jnh5Wjo1epvR+XjKpg28YQo4W+0YX1magcyRB8L
+4eSTUIC3XiVa8Jr0IwbZXPBb5xkdi7o+p4w2JahSHjxTRqmj+T1mnHXdbXVgq9Mg
+9Pzl7cgFZvX4UBx4XtASRf73jITNtt0CggEADH9K+O7FrIOSQly0sMvsRCMtejp3
+o+MDh1Q+vEg2kEgNXjS4ZFVljUpM2kg1OdUz7feS4dLXUJiIQ8ZWtZPedcq7wjHd
+02he5+s06l0jPifN3tX1ADfXGpXg5R2fbkrIzakkPP5/RO/aDxIUo7qhklNsVTXO
+VlGGfWLdk0ekA4upKm02Q1+YOlbIcAicEYYY8K7IffUwnohzKwL9yfuGi1VKTXpE
+4fzdegsHI03FSqR7V+LvtBpIupQ7RO4kuBmCEyI4E9FVknchg4te4gO3qwd9y0rJ
+Gu7HNIOrwOHzviI7J6Nd/l9MmeKqklHSgJvko/f5TmiXuQQ8xDZf84rcjQ==
+-----END RSA PRIVATE KEY-----
+`)
+
+	publicKeyBytes := []byte(`-----BEGIN RSA PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwUCimKCidbF3UxEHPy8K
++hvhklRB9JYhj5sJy0if4lTVibkK1MrYCykOnmC40pPU9GLY1b8HxAg9tvyRn0YH
+UxOra6vVQaVcOVJhTM8D18d+lSr3Lp1yiX+UGT4nzWI9+R1CCbwXrqeQVoZs6QZK
+ynEXMkFI9/wNMOwPOvQFOSTuoEoCO+zyTyUWEkNbUq825ELUQdIsjgmlWUOONudx
+sAr7ESRXW9QTHVh6uWmr3VRKZHby1JdU3I/wjdlGg5M2dDuXy5nQO9w/nYLjJXiw
++zzOetZ/+t7/VOkOpNTeJQhwTM1WF7Y2VLetbi9FHgyzHatrduh07+XEiTbgDf3G
+Ix2bp2p6oh0G3N2zpiLcK/aZj8rouWWydfFfsU3MZ4FfJDP8I6b9awxjmKYqIr6h
+iPQCJaLBED8mwK+I5evIbnKv6E6uK+BApWA/R7ElragoFYbqQ1VpvntVMtJt9Dy5
+ZrI+IQARdXD3bb34oh0IPBhClnvvMUc1cWxDoXEX6oJ4I+LzxE87Zkwnan9qOwen
+golMVKFwPx1o37qrbmrXID21kKt7FL6xN4HxHLkItr1fKzdyWDFRHgASTAWfx5BI
+wvPuUW0vZHkvO80VyV2L63whVhPnPASmFkbviomrBttYfpr2aGQqF/qR1Nlxe834
+MFxk1pS9LMa/WnzvFr0gWakCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+`)
 	secretKeyPairDir := filepath.Join(homeDir, "secrets", "contexts", "contx1", "secrets")
 	if err := os.MkdirAll(secretKeyPairDir, 0777); err != nil {
 		err = fmt.Errorf("Not able to create directories")
@@ -140,33 +207,19 @@ func setupGenerateKey(homeDir string) (string, error) {
 	}
 	os.Setenv("QLIKSENSE_KEY_LOCATION", secretKeyPairDir)
 
-	key, _ := LoadSecretKey(secretKeyPairDir)
+	privKeyFile := filepath.Join(secretKeyPairDir, "qliksensePriv")
-
+	// construct and write priv key file into secretsDir location
-	if key == "" {
+	err := ioutil.WriteFile(privKeyFile, privKeyBytes, 0777)
-		return GenerateAndStoreSecretKey(secretKeyPairDir)
+	if err != nil {
+		log.Printf("Error while creating file: %v", err)
+		return nil, nil, err
 	}
-	return key, nil
+	pubKeyFile := filepath.Join(secretKeyPairDir, "qliksensePub")
-}
+	// construct and write pub key file into secretsDir location
-
+	err = ioutil.WriteFile(pubKeyFile, publicKeyBytes, 0777)
-func Test_set_and_get_fetch_access_token(t *testing.T) {
+	if err != nil {
-	td, homeDir := setup()
+		log.Printf("Error while creating file: %v", err)
-	defer td()
+		return nil, nil, err
-	createCRFile(homeDir)
+	}
-	crFile := filepath.Join("contexts", "contx1", "contx1.yaml")
+	return publicKeyBytes, privKeyBytes, nil
-	qConfig := NewQConfig(homeDir)
-	newQ, _ := qConfig.SetCrLocation("contx1", crFile)
-	newQ.Write()
-	qConfig = NewQConfig(homeDir)
-	qcr, _ := qConfig.GetCurrentCR()
-	key, _ := qConfig.GetEncryptionKeyFor(qcr.GetName())
-	if err := qcr.SetFetchAccessToken("mytokenbeforeencryption", key); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	tok := qcr.GetFetchAccessToken(key)
-	if tok != "mytokenbeforeencryption" {
-		t.Log("Expected: mytokenbeforeencryption, got: " + tok)
-		t.Fail()
-	}
-
 }

pkg/api/context_apis.go

@@ -3,10 +3,8 @@ package api
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"log"
-	"os"
 
 	"github.com/qlik-oss/k-apis/pkg/config"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -105,22 +103,14 @@ func ReadFromFile(content interface{}, sourceFile string) error {
 	if content == nil || sourceFile == "" {
 		return nil
 	}
-	file, e := os.Open(sourceFile)
+	contents, err := ioutil.ReadFile(sourceFile)
-	if e != nil {
-		return e
-	}
-	return ReadFromStream(content, file)
-}
-
-// ReadFromStream reads from input stream and creat yaml struct of type content
-func ReadFromStream(content interface{}, reader io.Reader) error {
-	contents, err := ioutil.ReadAll(reader)
 	if err != nil {
-		err = fmt.Errorf("There was an error reading from reader: %v", err)
+		err = fmt.Errorf("There was an error reading from file: %s, %v", sourceFile, err)
 		return err
 	}
 	// reading k8s style object
 	// https://stackoverflow.com/questions/44306554/how-to-deserialize-kubernetes-yaml-file
 	dec := machine_yaml.NewYAMLOrJSONDecoder(bytes.NewReader(contents), 10000)
-	return dec.Decode(content)
+	dec.Decode(content)
+	return nil
 }

pkg/api/copy.go

@@ -1,8 +0,0 @@
-package api
-
-import "github.com/otiai10/copy"
-
-//copy source directory to destination
-func CopyDirectory(source string, dest string) error {
-	return copy.Copy(source, dest)
-}

pkg/api/copy_test.go

@@ -1,101 +0,0 @@
-package api
-
-import (
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-
-	kapis_git "github.com/qlik-oss/k-apis/pkg/git"
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/krusty"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestCopyDirectory(t *testing.T) {
-	src, _ := ioutil.TempDir("", "")
-	f1, _ := ioutil.TempFile(src, "")
-	ioutil.TempFile(src, "")
-
-	dest, _ := ioutil.TempDir("", "")
-	CopyDirectory(src, dest)
-	if _, err := os.Lstat(filepath.Join(dest, filepath.Base(f1.Name()))); err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-}
-
-func TestCopyDirectory_withGit_withKuz(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping in short test mode")
-	}
-
-	tmpDir1, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	defer os.RemoveAll(tmpDir1)
-
-	tmpDir2, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	defer os.RemoveAll(tmpDir2)
-
-	repoPath1 := path.Join(tmpDir1, "repo")
-	repo1, err := kapis_git.CloneRepository(repoPath1, "https://github.com/qlik-oss/qliksense-k8s", nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := CopyDirectory(repoPath1, tmpDir2); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	repoPath2 := tmpDir2
-	repo2, err := kapis_git.OpenRepository(repoPath2)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := kapis_git.Checkout(repo2, "v0.0.2", "", nil); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	repo2Manifest, err := kuz(path.Join(repoPath2, "manifests", "docker-desktop"))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := kapis_git.Checkout(repo1, "v0.0.2", "", nil); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	repo1Manifest, err := kuz(path.Join(repoPath1, "manifests", "docker-desktop"))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if string(repo2Manifest) != string(repo1Manifest) {
-		t.Logf("manifest generated on the original config:\n%v", string(repo1Manifest))
-		t.Logf("manifest generated on the copied config:\n%v", string(repo2Manifest))
-		t.Fatal("expected manifests to be equal, but they were not")
-	}
-}
-
-func kuz(directory string) ([]byte, error) {
-	options := &krusty.Options{
-		DoLegacyResourceSort: false,
-		LoadRestrictions:     types.LoadRestrictionsNone,
-		DoPrune:              false,
-		PluginConfig:         konfig.DisabledPluginConfig(),
-	}
-	k := krusty.MakeKustomizer(filesys.MakeFsOnDisk(), options)
-	resMap, err := k.Run(directory)
-	if err != nil {
-		return nil, err
-	}
-	return resMap.AsYaml()
-}

pkg/api/docker_registry_secret.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"crypto/rsa"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -26,14 +27,14 @@ func (kdcjt *k8sDockerConfigJsonType) GenerateAuth() {
 }
 
 type DockerConfigJsonSecret struct {
-	Name     string
+	Name      string
-	Uri      string
+	Uri       string
-	Username string
+	Username  string
-	Password string
+	Password  string
-	Email    string
+	Email     string
 }
 
-func (d *DockerConfigJsonSecret) ToYaml(encryptionKey string) ([]byte, error) {
+func (d *DockerConfigJsonSecret) ToYaml(encryptionKey *rsa.PublicKey) ([]byte, error) {
 	k8sDockerConfigJson := k8sDockerConfigJsonType{
 		Username: d.Username,
 		Password: d.Password,
@@ -50,8 +51,8 @@ func (d *DockerConfigJsonSecret) ToYaml(encryptionKey string) ([]byte, error) {
 		return nil, err
 	}
 	var k8sDockerConfigJsonMapMaybeEncryptedBytes []byte
-	if encryptionKey != "" {
+	if encryptionKey != nil {
-		if k8sDockerConfigJsonMapMaybeEncryptedBytes, err = EncryptData(k8sDockerConfigJsonMapBytes, encryptionKey); err != nil {
+		if k8sDockerConfigJsonMapMaybeEncryptedBytes, err = Encrypt(k8sDockerConfigJsonMapBytes, encryptionKey); err != nil {
 			return nil, err
 		}
 	} else {
@@ -64,7 +65,7 @@ func (d *DockerConfigJsonSecret) ToYaml(encryptionKey string) ([]byte, error) {
 			Kind:       "Secret",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: d.Name,
+			Name:      d.Name,
 		},
 		Type: v1.SecretTypeDockerConfigJson,
 		Data: map[string][]byte{
@@ -75,7 +76,7 @@ func (d *DockerConfigJsonSecret) ToYaml(encryptionKey string) ([]byte, error) {
 	return K8sSecretToYaml(k8sSecret)
 }
 
-func (d *DockerConfigJsonSecret) FromYaml(secretBytes []byte, decryptionKey string) error {
+func (d *DockerConfigJsonSecret) FromYaml(secretBytes []byte, decryptionKey *rsa.PrivateKey) error {
 	k8sDockerConfigJsonMap := k8sDockerConfigJsonMapType{}
 	if k8sSecret, err := K8sSecretFromYaml(secretBytes); err != nil {
 		return err
@@ -85,7 +86,7 @@ func (d *DockerConfigJsonSecret) FromYaml(secretBytes []byte, decryptionKey stri
 		return errors.New("not a kubernetes.io/dockerconfigjson type")
 	} else if k8sDockerConfigJsonMapEncryptedBytes, ok := k8sSecret.Data[".dockerconfigjson"]; !ok {
 		return errors.New("secret data is missing a value for the .dockerconfigjson key")
-	} else if k8sDockerConfigJsonMapBytes, err := DecryptData(k8sDockerConfigJsonMapEncryptedBytes, decryptionKey); err != nil {
+	} else if k8sDockerConfigJsonMapBytes, err := Decrypt(k8sDockerConfigJsonMapEncryptedBytes, decryptionKey); err != nil {
 		return errors.New("secret data is missing a value for the .dockerconfigjson key")
 	} else if err := json.Unmarshal(k8sDockerConfigJsonMapBytes, &k8sDockerConfigJsonMap); err != nil {
 		return err

pkg/api/docker_registry_secret_test.go

@@ -1,6 +1,8 @@
 package api
 
 import (
+	"crypto/rand"
+	"crypto/rsa"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -12,21 +14,21 @@ import (
 
 func TestDockerConfigJsonSecret(t *testing.T) {
 	dockerConfigJsonSecret := DockerConfigJsonSecret{
-		Name:     "some-name",
+		Name:      "some-name",
-		Uri:      "some-uri",
+		Uri:       "some-uri",
-		Username: "some-username",
+		Username:  "some-username",
-		Password: "some-password",
+		Password:  "some-password",
-		Email:    "some-email",
+		Email:     "some-email",
 	}
 	dockerConfigJsonSecretFromYaml := DockerConfigJsonSecret{}
 	validYamlMap := map[string]interface{}{}
 
-	encryptionKey, err := GenerateKey()
+	privateKey, err := rsa.GenerateKey(rand.Reader, RSA_KEY_LENGTH)
 	if err != nil {
 		t.Fatalf("error generating RSA private key: %v\n", err)
 	}
 
-	dockerConfigJsonSecretYamlBytes, err := dockerConfigJsonSecret.ToYaml(encryptionKey)
+	dockerConfigJsonSecretYamlBytes, err := dockerConfigJsonSecret.ToYaml(&privateKey.PublicKey)
 	dockerConfigJsonMap := map[string]interface{}{}
 	if err != nil {
 		t.Fatalf("error converting secret to yaml: %v", err)
@@ -41,7 +43,7 @@ func TestDockerConfigJsonSecret(t *testing.T) {
 		t.Fatalf("no .dockerconfigjson data key in the secret yaml: %v", string(dockerConfigJsonSecretYamlBytes))
 	} else if dockerConfigJsonEncryptedBytes, err := base64.StdEncoding.DecodeString(dockerConfigJsonBytesBase64.(string)); err != nil {
 		t.Fatalf("error decoding dockerConfigJsonBytes from base64: %v", err)
-	} else if dockerConfigJsonBytes, err := DecryptData(dockerConfigJsonEncryptedBytes, encryptionKey); err != nil {
+	} else if dockerConfigJsonBytes, err := Decrypt(dockerConfigJsonEncryptedBytes, privateKey); err != nil {
 		t.Fatalf("error decrypting dockerConfigJsonBytes: %v", err)
 	} else if err := json.Unmarshal(dockerConfigJsonBytes, &dockerConfigJsonMap); err != nil {
 		t.Fatalf("error unmarshalling dockerConfigJson from json: %v", err)
@@ -61,7 +63,7 @@ func TestDockerConfigJsonSecret(t *testing.T) {
 	}
 
 	t.Logf("dockerConfigJsonSecretYaml: \n%v\n", string(dockerConfigJsonSecretYamlBytes))
-	if err := dockerConfigJsonSecretFromYaml.FromYaml(dockerConfigJsonSecretYamlBytes, encryptionKey); err != nil {
+	if err := dockerConfigJsonSecretFromYaml.FromYaml(dockerConfigJsonSecretYamlBytes, privateKey); err != nil {
 		t.Fatalf("error reading secret in from yaml: %v", err)
 	} else if !reflect.DeepEqual(dockerConfigJsonSecret, dockerConfigJsonSecretFromYaml) {
 		t.Fatalf("secret: %v does not equal secret: %v", dockerConfigJsonSecret, dockerConfigJsonSecretFromYaml)

pkg/api/encryption.go

@@ -1,42 +1,58 @@
 package api
 
 import (
-	"crypto/aes"
-	"crypto/cipher"
 	"crypto/rand"
-	"encoding/hex"
+	"crypto/rsa"
-	"errors"
+	"crypto/x509"
+	"encoding/pem"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"log"
 	"path/filepath"
 )
 
 const (
-	key_file_name = "user_secret_key"
+	RSA_KEY_LENGTH = 4096
+
+	QliksensePublicKey  = "qliksensePub"
+	QliksensePrivateKey = "qliksensePriv"
 )
 
-// GenerateAndStoreSecretKey generates and stores key
+// GenerateAndStoreSecretKeypair generates and stores key pairs
-func GenerateAndStoreSecretKey(secretsDir string) (string, error) {
+func GenerateAndStoreSecretKeypair(secretsPath string) error {
-	// creating contexts/qlik-default/secrets/user_secret_key
+	LogDebugMessage("%s exists", secretsPath)
-	keyFile := filepath.Join(secretsDir, key_file_name)
+	// creating contexts/qlik-default/secrets/qliksensePub and contexts/qlik-default/secrets/qliksensePriv files
-	key, err := GenerateKey()
+	publicKeyFilePath := filepath.Join(secretsPath, QliksensePublicKey)
-	if err != nil {
+	privateKeyFilePath := filepath.Join(secretsPath, QliksensePrivateKey)
-		return "", err
+	LogDebugMessage("Generating public-private key pair.....")
-	}
+	GenerateRSAEncryptionKeys(publicKeyFilePath, privateKeyFilePath)
-	if err := writeContentToFile([]byte(key), keyFile); err != nil {
+	LogDebugMessage("Generated public-private key pairs")
-		return "", err
+
-	}
+	return nil
-	return key, nil
 }
-func LoadSecretKey(secretsDir string) (string, error) {
+
-	keyFile := filepath.Join(secretsDir, key_file_name)
+// GenerateRSAEncryptionKeys is used to generate a new public-private key pair
-	by, err := ioutil.ReadFile(keyFile)
+func GenerateRSAEncryptionKeys(publicKeyFilePath, privateKeyFilePath string) error {
+	LogDebugMessage("Generating new RSA key pair")
+	privateKey, err := rsa.GenerateKey(rand.Reader, RSA_KEY_LENGTH)
 	if err != nil {
-		return "", err
+		log.Printf("error generating RSA private key: %v\n", err)
+		return err
 	}
-	return string(by), nil
+
+	privateKeyPEM := EncodePrivateKey(privateKey)
+	if err := writeContentToFile(privateKeyPEM, privateKeyFilePath); err != nil {
+		return err
+	}
+	pubKeyPEM, err2 := EncodePublicKey(&privateKey.PublicKey)
+	if err2 != nil {
+		log.Printf("error occurred when encoding public key: %v\n", err2)
+		return err2
+	}
+	if err := writeContentToFile(pubKeyPEM, publicKeyFilePath); err != nil {
+		return err
+	}
+	return nil
 }
 
 // writeContentToFile writes keys to a file
@@ -49,54 +65,104 @@ func writeContentToFile(keyData []byte, fileName string) error {
 	return nil
 }
 
-func GenerateKey() (string, error) {
+// Encrypt encrypts data with public key
-	salt := make([]byte, 32)
+func Encrypt(pt []byte, pub *rsa.PublicKey) ([]byte, error) {
-	if _, err := rand.Read(salt); err != nil {
+	//hash := sha512.New()
-		return "", err
+	//ct, err := rsa.EncryptOAEP(hash, rand.Reader, pub, pt, nil)
+	ct, err := rsa.EncryptPKCS1v15(rand.Reader, pub, pt)
+	if err != nil {
+		log.Println(err)
+		return nil, err
 	}
-	s := fmt.Sprintf("%x", salt)
+	return ct, nil
-	return s, nil
 }
 
-func EncryptData(plaintext []byte, userKey string) ([]byte, error) {
+// Decrypt decrypts data with private key
-	key, _ := hex.DecodeString(userKey)
+func Decrypt(ct []byte, priv *rsa.PrivateKey) ([]byte, error) {
-
+	// hash := sha512.New()
-	block, err := aes.NewCipher(key)
+	// plaintext, err := rsa.DecryptOAEP(hash, rand.Reader, priv, ciphertext, nil)
+	pt, err := rsa.DecryptPKCS1v15(rand.Reader, priv, ct)
 	if err != nil {
+		log.Println(err)
 		return nil, err
 	}
-
+	return pt, nil
-	aesgcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, err
-	}
-	nonce := make([]byte, aesgcm.NonceSize())
-	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
-		return nil, err
-	}
-
-	return aesgcm.Seal(nonce, nonce, plaintext, nil), nil
 }
 
-func DecryptData(ciphertext []byte, userKey string) ([]byte, error) {
+// EncodePrivateKey private key to bytes
-	key, _ := hex.DecodeString(userKey)
+func EncodePrivateKey(priv *rsa.PrivateKey) []byte {
-	block, err := aes.NewCipher(key)
+	privBytes := pem.EncodeToMemory(
+		&pem.Block{
+			Type:  "RSA PRIVATE KEY",
+			Bytes: x509.MarshalPKCS1PrivateKey(priv),
+		},
+	)
+
+	return privBytes
+}
+
+// EncodePublicKey public key to bytes
+func EncodePublicKey(pub *rsa.PublicKey) ([]byte, error) {
+	pubASN1, err := x509.MarshalPKIXPublicKey(pub)
 	if err != nil {
+		log.Println(err)
 		return nil, err
 	}
 
-	aesgcm, err := cipher.NewGCM(block)
+	pubBytes := pem.EncodeToMemory(&pem.Block{
-	if err != nil {
+		Type:  "RSA PUBLIC KEY",
-		return nil, err
+		Bytes: pubASN1,
-	}
+	})
-	nonceSize := aesgcm.NonceSize()
+
-	if len(ciphertext) < nonceSize {
+	return pubBytes, nil
-		return nil, errors.New("ciphertext too short")
+}
-	}
+
-	nonce, ciphertext := ciphertext[:nonceSize], ciphertext[nonceSize:]
+// DecodeToPrivateKey bytes to private key
-	plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil)
+func DecodeToPrivateKey(priv []byte) (*rsa.PrivateKey, error) {
-	if err != nil {
+	block, _ := pem.Decode(priv)
-		return nil, err
+	enc := x509.IsEncryptedPEMBlock(block)
-	}
+	b := block.Bytes
-	return plaintext, nil
+	var err error
+	if enc {
+		log.Println("is encrypted pem block")
+		b, err = x509.DecryptPEMBlock(block, nil)
+		if err != nil {
+			log.Println(err)
+			return nil, err
+		}
+	}
+	key, err := x509.ParsePKCS1PrivateKey(b)
+	if err != nil {
+		log.Println(err)
+		return nil, err
+	}
+	return key, nil
+}
+
+// DecodeToPublicKey bytes to public key
+func DecodeToPublicKey(pub []byte) (*rsa.PublicKey, error) {
+	block, _ := pem.Decode(pub)
+	enc := x509.IsEncryptedPEMBlock(block)
+	b := block.Bytes
+	var err error
+	if enc {
+		log.Println("is encrypted pem block")
+		b, err = x509.DecryptPEMBlock(block, nil)
+		if err != nil {
+			log.Println(err)
+			return nil, err
+		}
+	}
+	iface, err := x509.ParsePKIXPublicKey(b)
+	if err != nil {
+		log.Println(err)
+		return nil, err
+	}
+	key, ok := iface.(*rsa.PublicKey)
+	if !ok {
+		err := fmt.Errorf("Unable to decode public key")
+		log.Println(err)
+		return nil, err
+	}
+	return key, nil
 }

pkg/api/encryption_test.go

@@ -1,29 +1,128 @@
 package api
 
 import (
+	"encoding/base64"
+	"log"
+	"os"
 	"testing"
 )
 
-func Test_encrypt_decrypt(t *testing.T) {
+func Test_generateRSAEncryptionKeys(t *testing.T) {
-	key, err := GenerateKey()
+	tests := []struct {
-	if err != nil {
+		name    string
-		t.Log(err)
+		wantErr bool
-		t.FailNow()
+	}{
+		{
+			name:    "valid case",
+			wantErr: false,
+		},
 	}
-	testData := "this is a secret value"
+	for _, tt := range tests {
-	enc, err := EncryptData([]byte(testData), key)
+		t.Run(tt.name, func(t *testing.T) {
-	if err != nil {
+			if err := GenerateAndStoreSecretKeypair(os.TempDir()); (err != nil) != tt.wantErr {
-		t.Log(err)
+				t.Errorf("generateRSAEncryptionKeys() error = %v, wantErr %v", err, tt.wantErr)
-		t.FailNow()
+			}
-	}
+		})
-	dec, err := DecryptData(enc, key)
+	}
-	if err != nil {
+}
-		t.Log(err)
+
-		t.FailNow()
+func Test_encryption_decryption(t *testing.T) {
-	}
+	privKeyBytes := []byte(`-----BEGIN RSA PRIVATE KEY-----
-	if testData != string(dec) {
+MIIJJwIBAAKCAgEAwUCimKCidbF3UxEHPy8K+hvhklRB9JYhj5sJy0if4lTVibkK
-		t.Log("expected: " + testData)
+1MrYCykOnmC40pPU9GLY1b8HxAg9tvyRn0YHUxOra6vVQaVcOVJhTM8D18d+lSr3
-		t.Log("actual: " + string(dec))
+Lp1yiX+UGT4nzWI9+R1CCbwXrqeQVoZs6QZKynEXMkFI9/wNMOwPOvQFOSTuoEoC
-		t.Fail()
+O+zyTyUWEkNbUq825ELUQdIsjgmlWUOONudxsAr7ESRXW9QTHVh6uWmr3VRKZHby
+1JdU3I/wjdlGg5M2dDuXy5nQO9w/nYLjJXiw+zzOetZ/+t7/VOkOpNTeJQhwTM1W
+F7Y2VLetbi9FHgyzHatrduh07+XEiTbgDf3GIx2bp2p6oh0G3N2zpiLcK/aZj8ro
+uWWydfFfsU3MZ4FfJDP8I6b9awxjmKYqIr6hiPQCJaLBED8mwK+I5evIbnKv6E6u
+K+BApWA/R7ElragoFYbqQ1VpvntVMtJt9Dy5ZrI+IQARdXD3bb34oh0IPBhClnvv
+MUc1cWxDoXEX6oJ4I+LzxE87Zkwnan9qOwengolMVKFwPx1o37qrbmrXID21kKt7
+FL6xN4HxHLkItr1fKzdyWDFRHgASTAWfx5BIwvPuUW0vZHkvO80VyV2L63whVhPn
+PASmFkbviomrBttYfpr2aGQqF/qR1Nlxe834MFxk1pS9LMa/WnzvFr0gWakCAwEA
+AQKCAgARSp9B2N2wejibDiL/3E23I1eDqFZedDB8kPrHXbAwqDaTJCN79spt9TaB
+pVXkQaYEV/Pe7EDdoX8kKGU/QxzUqiXkdHOYdBtUZbKfFMbbP9ZrsnR7j0r4UpoF
+yDH3hprU93E5PcNAtW2M0GpeT1nR01yn+n908PCdOAIE3GC7RDq1zOl2QzVLL55R
+9ATv2Q2oTvJ/ETc7XlGVMx4+e2cIwXLFjeLjLI6pSYlxnarrGuetJZeEviWxto9n
+odFVZI6yx8JFTXX8ZTCr/1IjwDDVyhMPmrHI2Lsv9cqBpSpbVe32cUkKxhsGaYjz
+GvesQKamOPhco2ATNxPm0yopFlPsGKMfVl0BK0J6BqFh1BvU/SYJmXfnFuUNO3vV
+4u2Saa0q1iddxV0rXDwIqUfn+S6rwzK0G7y8bH2yvpB2VwiG3TFPnULep4wsefNq
+Fj92kqFBjacGpQLEEslUY0CMgeZ2+NuBQSUTscP3wBRsottMR6YXJtINdvfHBx+e
+EcN71z8D00w3mYqIQ7qb4Ml6HOqknunn58g43L9sACMUMTlEBXa9pUnScNYgWBAz
+W2q2mH37cIydM2JRZPpA8B4yTHt5ugJmChwyNFM7941arjKrebH+6AzLkofGedOP
+zg+vZQuPEXWs+3MBBnkWoyJW3Y0fbQdjsuQTtnd+7iyoxoBroQKCAQEA4dIiFlIS
+MDfRhQQWSiDvaw9aneDEJ3uo63ZRH5tm/IynLgtjYgEm/ZxlBCQgqRKLYELBxhu8
+SaF0uPK8pmpFJt0mIwSlsdeVhuE2obQeKUCczaqrKeaHS3PdWLjTlwph81BGRkHy
+qfqtNylyyMxrdEbnR51EtsWgFq6anTUAui1Q09JMuMNZRMOzDs1F4gExgD22rc0V
+c9YQ+jHJRxBGtNKMpMEqc8cvaxBidbItrN9SMTSWog7uYPBuEuaJ6K9vpgyJMOzJ
+SYcQEFGqgIqIDCg+ABE4d/4YROMKZ1DV/bJCind9brUHSx6XALsF0nC5c1Q9TnUL
+qI2khOwts4KYKwKCAQEA2xRC6Az97Vkdzu7BjLJ1FKmx4S2nEEgVS12ds82U+5Xf
+BHKAJnjqlqmmpzzJG+d77IYktz0+mey1QCNkqlm2fhuKs8LZMnpZRf0l8VcoBsUP
+/xKz7wfiE7RRFZtLJhPp4hhe43GzX5/JFMWMnC6UykwQbj4t1E/GNM/Suqwvg12M
+wktAJ6nqLgfhjQSO4xWo+nPzcbX+fNtrPCZVrBhYXihhcwRRNImWUCGJ6J4LMdPY
+Y9Z59qhOvE9cReH/Xw1av46omyiSyAqlgPyZ/kzA2IJSqYCjiQR/2+RD/g13jpcJ
+jatXLVZ8MJSL5OTS40G/HHTNNpNHbKKh0GOyxBA3ewKCAQBAn8UXhCcmW2L/YPsL
+/b7mcX9qPP+FmRLvR23R0MQ5M/tH5wRq8I969n3GIJykJeVzB8eybQ+GNslTgEvS
+iAkAJTubu+G7MkndTqg2wHf9MDtvdA8Fr646Po8yq7oJuHPtkKR7yLWsRUu6xIbP
+xgheP0hCq1QVxhqZQyCGKrvpi7xc0gsYuPbcAfFFJCOCmPrUi1SzCkTAYJt9LjA+
+wP6rErIjGBCRD4iXaBn1OqdtmH9KC5WsDP/VCBlIGWeQCly2NVIxiSHVg+xp7yUP
+IhXq/L05gbQaSsIhPKQmivCiaJg4The8TdwneDqYf+0bmxzHT203/bD3bImPbJNr
+ksz/AoIBAEwu4Y1cZzkQUmNRd5D7xecnk6ngfEYXKwCIT3zlMrfCSEl9n77BMaKu
+4Dsr0iuX9eosQ7xM2eYhAG6LYEg05lc4MKWOToVVMpI6E+W3Dz47bPKgiF3I+f8s
+Jz5CQIG/TwfGvciOE3hfUkec4ua09BzdEqGjkcBQ9XYMBxXPJr6h2379OBQS7FKR
+fwfQ2/dv4tElXTTfut2kV8gU9Jnh5Wjo1epvR+XjKpg28YQo4W+0YX1magcyRB8L
+4eSTUIC3XiVa8Jr0IwbZXPBb5xkdi7o+p4w2JahSHjxTRqmj+T1mnHXdbXVgq9Mg
+9Pzl7cgFZvX4UBx4XtASRf73jITNtt0CggEADH9K+O7FrIOSQly0sMvsRCMtejp3
+o+MDh1Q+vEg2kEgNXjS4ZFVljUpM2kg1OdUz7feS4dLXUJiIQ8ZWtZPedcq7wjHd
+02he5+s06l0jPifN3tX1ADfXGpXg5R2fbkrIzakkPP5/RO/aDxIUo7qhklNsVTXO
+VlGGfWLdk0ekA4upKm02Q1+YOlbIcAicEYYY8K7IffUwnohzKwL9yfuGi1VKTXpE
+4fzdegsHI03FSqR7V+LvtBpIupQ7RO4kuBmCEyI4E9FVknchg4te4gO3qwd9y0rJ
+Gu7HNIOrwOHzviI7J6Nd/l9MmeKqklHSgJvko/f5TmiXuQQ8xDZf84rcjQ==
+-----END RSA PRIVATE KEY-----
+`)
+
+	publicKeyBytes := []byte(`-----BEGIN RSA PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwUCimKCidbF3UxEHPy8K
++hvhklRB9JYhj5sJy0if4lTVibkK1MrYCykOnmC40pPU9GLY1b8HxAg9tvyRn0YH
+UxOra6vVQaVcOVJhTM8D18d+lSr3Lp1yiX+UGT4nzWI9+R1CCbwXrqeQVoZs6QZK
+ynEXMkFI9/wNMOwPOvQFOSTuoEoCO+zyTyUWEkNbUq825ELUQdIsjgmlWUOONudx
+sAr7ESRXW9QTHVh6uWmr3VRKZHby1JdU3I/wjdlGg5M2dDuXy5nQO9w/nYLjJXiw
++zzOetZ/+t7/VOkOpNTeJQhwTM1WF7Y2VLetbi9FHgyzHatrduh07+XEiTbgDf3G
+Ix2bp2p6oh0G3N2zpiLcK/aZj8rouWWydfFfsU3MZ4FfJDP8I6b9awxjmKYqIr6h
+iPQCJaLBED8mwK+I5evIbnKv6E6uK+BApWA/R7ElragoFYbqQ1VpvntVMtJt9Dy5
+ZrI+IQARdXD3bb34oh0IPBhClnvvMUc1cWxDoXEX6oJ4I+LzxE87Zkwnan9qOwen
+golMVKFwPx1o37qrbmrXID21kKt7FL6xN4HxHLkItr1fKzdyWDFRHgASTAWfx5BI
+wvPuUW0vZHkvO80VyV2L63whVhPnPASmFkbviomrBttYfpr2aGQqF/qR1Nlxe834
+MFxk1pS9LMa/WnzvFr0gWakCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+`)
+	origStr := "Value1234"
+
+	pubKey, err := DecodeToPublicKey(publicKeyBytes)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	privKey, err := DecodeToPrivateKey(privKeyBytes)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	encData, err := Encrypt([]byte(origStr), pubKey)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+
+	encDataStr := base64.StdEncoding.EncodeToString(encData)
+	log.Println("Encoded text:", encDataStr)
+	dec, _ := base64.StdEncoding.DecodeString(encDataStr)
+	data, err := Decrypt(dec, privKey)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	if string(data) != origStr {
+		t.Error("original string and decrypted string don't match")
+		t.FailNow()
 	}
 }

pkg/api/kubectl.go

@@ -97,22 +97,3 @@ func kubectlOperation(manifests string, oprName string, namespace string) error
 	os.Remove(tempYaml.Name())
 	return nil
 }
-
-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 = &out
-	if err := cmd.Run(); err != nil {
-		return "", fmt.Errorf("kubectl %v failed with: %v, %v\n", opr, err, sterrBuffer.String())
-	}
-	s := out.String()
-	return s, nil
-}

pkg/api/kubectl_test.go

@@ -1,8 +1,6 @@
 package api
 
 import (
-	"fmt"
-	"strings"
 	"testing"
 )
 
@@ -17,16 +15,3 @@ func TestGetKubectlNamespace(t *testing.T) {
 	}
 	SetKubectlNamespace(ns)
 }
-
-func TestKubectlDirectOps(t *testing.T) {
-	t.Skip()
-	SetKubectlNamespace("test")
-	ns := GetKubectlNamespace()
-	opr := fmt.Sprintf("version")
-	opr1 := strings.Fields(opr)
-	_, err := KubectlDirectOps(opr1, ns)
-	if err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-}

pkg/api/preflight_apis.go

@@ -1,109 +0,0 @@
-package api
-
-import (
-	"os"
-	"path/filepath"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type PreflightConfig struct {
-	metav1.TypeMeta   `json:",inline" yaml:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Spec              *PreflightSpec `json:"spec" yaml:"spec"`
-	QliksenseHomePath string         `json:"-" yaml:"-"`
-}
-
-type PreflightSpec struct {
-	MinK8sVersion string            `json:"minK8sVersion,omitempty" yaml:"minK8sVersion,omitempty"`
-	Images        map[string]string `json:"images,omitempty" yaml:"images,omitempty"`
-}
-
-//NewPreflightConfigEmpty create empty PreflightConfig object
-func NewPreflightConfigEmpty(qHome string) *PreflightConfig {
-	p := &PreflightConfig{
-		QliksenseHomePath: qHome,
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "config.qlik.com/v1",
-			Kind:       "PreflightConfig",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "PreflightConfigMetadata",
-		},
-		Spec: &PreflightSpec{},
-	}
-	return p
-}
-
-//NewPreflightConfig create empty PreflightConfig object if preflit/preflight-config.yaml not exist
-func NewPreflightConfig(qHome string) *PreflightConfig {
-	p := NewPreflightConfigEmpty(qHome)
-	conFile := p.GetConfigFilePath()
-	if _, err := os.Lstat(conFile); err != nil {
-		return p
-	}
-	p = &PreflightConfig{}
-	if err := ReadFromFile(p, conFile); err != nil {
-		return nil
-	}
-	return p
-}
-
-//GetConfigFilePath return preflight-config.yaml file path
-func (p *PreflightConfig) GetConfigFilePath() string {
-	return filepath.Join(p.QliksenseHomePath, "preflight", "preflight-config.yaml")
-}
-
-//Write write PreflightConfig object into the ~/.qliksense/preflight/preflight-config.yaml file
-func (p *PreflightConfig) Write() error {
-	pDir := filepath.Join(p.QliksenseHomePath, "preflight")
-	if err := os.MkdirAll(pDir, os.ModePerm); err != nil {
-		return err
-	}
-	return WriteToFile(p, p.GetConfigFilePath())
-}
-
-func (p *PreflightConfig) AddMinK8sV(version string) {
-	if p.Spec == nil {
-		p.Spec = &PreflightSpec{}
-	}
-	p.Spec.MinK8sVersion = version
-}
-
-func (p *PreflightConfig) AddImage(imageFor, imageName string) {
-	if p.Spec.Images == nil {
-		p.Spec.Images = make(map[string]string)
-	}
-	p.Spec.Images[imageFor] = imageName
-}
-
-func (p *PreflightConfig) GetImageName(imageFor string) string {
-	if p.Spec.Images == nil {
-		return ""
-	}
-	return p.Spec.Images[imageFor]
-}
-func (p *PreflightConfig) GetMinK8sVersion() string {
-	return p.Spec.MinK8sVersion
-}
-func (p *PreflightConfig) IsExistOnDisk() bool {
-	if _, err := os.Lstat(p.GetConfigFilePath()); err != nil {
-		return false
-	}
-	return true
-}
-
-func (p *PreflightConfig) GetImageMap() map[string]string {
-	return p.Spec.Images
-}
-
-func (p *PreflightConfig) Initialize() error {
-	if p.IsExistOnDisk() {
-		return nil
-	}
-	p.AddMinK8sV("1.15")
-	p.AddImage("nginx", "nginx")
-	p.AddImage("netcat", "subfuzion/netcat")
-	p.AddImage("mongo", "mongo")
-	return p.Write()
-}

pkg/api/preflight_apis_test.go

@@ -1,39 +0,0 @@
-package api
-
-import (
-	"io/ioutil"
-	"testing"
-)
-
-func Test_Initalize(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	pf := NewPreflightConfig(tempDir)
-	if err := pf.Initialize(); err != nil {
-		t.Log()
-		t.FailNow()
-	}
-	p := &PreflightConfig{
-		QliksenseHomePath: tempDir,
-	}
-	if err := ReadFromFile(p, pf.GetConfigFilePath()); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	if p.GetMinK8sVersion() != "1.15" {
-		t.Log("expected k8 version: 1.15, but got " + p.GetMinK8sVersion())
-		t.Fail()
-	}
-	p.AddImage("test", "testimage")
-	if err := p.Write(); err != nil {
-		t.Log(err)
-		t.Fail()
-	}
-	p2 := NewPreflightConfig(tempDir)
-	if p2.GetImageName("test") != "testimage" {
-		t.Log("expected image name: testimage, got: " + p2.GetImageName("test"))
-	}
-}

pkg/api/utils.go

@@ -1,21 +1,13 @@
 package api
 
 import (
-	"archive/tar"
-	"archive/zip"
-	"compress/gzip"
-	b64 "encoding/base64"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"log"
-	"net/http"
 	"os"
-	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 func checkExists(filename string) os.FileInfo {
@@ -62,38 +54,27 @@ func ReadKeys(keyFile string) ([]byte, error) {
 }
 
 // ProcessConfigArgs processes args and returns an service, key, value slice
-func ProcessConfigArgs(args []string, base64Encoded bool) ([]*ServiceKeyValue, error) {
+func ProcessConfigArgs(args []string) ([]*ServiceKeyValue, error) {
 	// prepare received args
 	// split args[0] into key and value
 	if len(args) == 0 {
 		err := fmt.Errorf("No args were provided. Please provide args to configure the current context")
 		return nil, err
 	}
-	notValidErr := fmt.Errorf("Please provide valid args for this command")
 	resultSvcKV := make([]*ServiceKeyValue, len(args))
-	// qliksense.mongodb=somethig
+	re1 := regexp.MustCompile(`(\w{1,}).(\w{1,})=("*[\w\-?=_/:0-9]+"*)`)
 	for i, arg := range args {
 		LogDebugMessage("Arg received: %s", arg)
-		first := strings.SplitN(arg, "=", 2)
+		result := re1.FindStringSubmatch(arg)
-		if len(first) != 2 {
+		// check if result array's length is == 4 (index 0 - is the full match & indices 1,2,3- are the fields we need)
-			return nil, notValidErr
+		if len(result) != 4 {
-		}
+			err := fmt.Errorf("Please provide valid args for this command")
-		second := strings.SplitN(first[0], ".", 2)
+			return nil, err
-		if len(second) != 2 {
-			return nil, notValidErr
-		}
-		resultValue := strings.Trim(first[1], "\"")
-		if base64Encoded {
-			if decodeByte, err := b64.StdEncoding.DecodeString(resultValue); err != nil {
-				return nil, err
-			} else {
-				resultValue = strings.Trim(string(decodeByte), "\n ")
-			}
 		}
 		resultSvcKV[i] = &ServiceKeyValue{
-			SvcName: second[0],
+			SvcName: result[1],
-			Key:     second[1],
+			Key:     result[2],
-			Value:   resultValue,
+			Value:   strings.ReplaceAll(result[3], `"`, ""),
 		}
 	}
 	return resultSvcKV, nil
@@ -128,151 +109,3 @@ func ExecuteTaskWithBlinkingStdoutFeedback(task func() (interface{}, error), fee
 		}
 	}
 }
-
-func DownloadFile(url, baseFolder, installerName string) error {
-	var (
-		out  *os.File
-		err  error
-		resp *http.Response
-	)
-	// Create the file
-	fileName := filepath.Join(baseFolder, installerName)
-	LogDebugMessage("Installer Filename: %s\n", fileName)
-	if out, err = os.Create(fileName); err != nil {
-		return err
-	}
-	defer out.Close()
-
-	// Get the data
-	if resp, err = http.Get(url); err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("unable to download the file from URL: %s, status: %s", url, resp.Status)
-		log.Println(err)
-		return err
-	}
-
-	// Write the body to file
-	if _, err = io.Copy(out, resp.Body); err != nil {
-		return err
-	}
-	err = os.Chmod(fileName, os.ModePerm)
-	if err != nil {
-		log.Println(err)
-	}
-	return nil
-}
-
-func ExplodePackage(destination, fileToUntar string) error {
-	LogDebugMessage("Destination: %s\n", destination)
-	LogDebugMessage("fileToUntar: %s\n", fileToUntar)
-
-	if strings.HasSuffix(fileToUntar, "zip") {
-		LogDebugMessage("This is a windows file : %s", fileToUntar)
-		err := UnZipFile(destination, fileToUntar)
-		if err != nil {
-			return nil
-		}
-	} else if strings.HasSuffix(fileToUntar, "tar.gz") {
-		LogDebugMessage("This is a mac/linux file: %s", fileToUntar)
-		err := UntarGzFile(destination, fileToUntar)
-		if err != nil {
-			return nil
-		}
-	}
-	return nil
-}
-
-func UntarGzFile(destination, fileToUntar string) error {
-	lFile, err := os.Open(fileToUntar)
-	if err != nil {
-		err = errors.Wrapf(err, "unable to read the local file %s", fileToUntar)
-		log.Fatal(err)
-		return err
-	}
-
-	gzReader, err := gzip.NewReader(lFile)
-	if err != nil {
-		err = errors.Wrap(err, "unable to load the file into a gz reader")
-		log.Fatal(err)
-		return err
-	}
-	defer gzReader.Close()
-
-	tarReader := tar.NewReader(gzReader)
-	for {
-		header, err := tarReader.Next()
-		switch {
-		case err == io.EOF:
-			return nil
-		case err != nil:
-			err = errors.Wrap(err, "error during untar")
-			log.Fatal(err)
-			return err
-		case header == nil:
-			continue
-		}
-
-		fileInLoop := filepath.Join(destination, header.Name)
-		switch header.Typeflag {
-		case tar.TypeDir:
-			if _, err := os.Stat(fileInLoop); err != nil {
-				if err := os.MkdirAll(fileInLoop, 0755); err != nil {
-					err = errors.Wrapf(err, "error creating directory %s", fileInLoop)
-					log.Fatal(err)
-					return err
-				}
-			}
-		case tar.TypeReg:
-			fileAtLoc, err := os.OpenFile(fileInLoop, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
-			if err != nil {
-				err = errors.Wrapf(err, "error opening file %s", fileInLoop)
-				log.Fatal(err)
-				return err
-			}
-
-			if _, err := io.Copy(fileAtLoc, tarReader); err != nil {
-				err = errors.Wrapf(err, "error writing file %s", fileInLoop)
-				log.Fatal(err)
-				return err
-			}
-			fileAtLoc.Close()
-			fileAtLoc.Chmod(os.ModePerm)
-		}
-	}
-}
-
-func UnZipFile(destination, fileToUnzip string) error {
-	zipReader, _ := zip.OpenReader(fileToUnzip)
-	for _, file := range zipReader.Reader.File {
-
-		zippedFile, err := file.Open()
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer zippedFile.Close()
-		extractedFilePath := filepath.Join(
-			destination,
-			file.Name,
-		)
-		outputFile, err := os.OpenFile(
-			extractedFilePath,
-			os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
-			file.Mode(),
-		)
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer outputFile.Close()
-
-		_, err = io.Copy(outputFile, zippedFile)
-		if err != nil {
-			log.Fatal(err)
-		}
-		LogDebugMessage("File extracted: %s, Extracted file path: %s\n", file.Name, extractedFilePath)
-	}
-	return nil
-}

pkg/api/utils_test.go

@@ -1,47 +0,0 @@
-package api
-
-import (
-	"testing"
-)
-
-func TestProcessConfigArgs(t *testing.T) {
-	args := []string{
-		"qliksense.mongodb=mongouri://something?ffall",
-		"test_under.test=value_under",
-		"test-dash.dash-key=value-dash",
-		"test-dot.dot-key=127.0.0.1",
-		"test123.key123=value123",
-		"test-equal.keyequal=newvalue=@hj",
-	}
-	expectedKeys := []string{"mongodb", "test", "dash-key", "dot-key", "key123", "keyequal"}
-	expectedValue := []string{"mongouri://something?ffall", "value_under", "value-dash", "127.0.0.1", "value123", "newvalue=@hj"}
-	exppectedSvc := []string{"qliksense", "test_under", "test-dash", "test-dot", "test123", "test-equal"}
-	sv, err := ProcessConfigArgs(args, false)
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	for _, v := range sv {
-		if !contains(expectedKeys, v.Key) {
-			t.Fail()
-			t.Log("expectd key " + v.Key + " not found")
-		}
-		if !contains(expectedValue, v.Value) {
-			t.Fail()
-			t.Log("expectd Value " + v.Value + " not found")
-		}
-		if !contains(exppectedSvc, v.SvcName) {
-			t.Fail()
-			t.Log("expectd service " + v.SvcName + " not found")
-		}
-	}
-}
-
-func contains(arr []string, str string) bool {
-	for _, a := range arr {
-		if a == str {
-			return true
-		}
-	}
-	return false
-}

pkg/preflight/all_checks.go

@@ -1,107 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-)
-
-func (qp *QliksensePreflight) RunAllPreflightChecks(namespace string, kubeConfigContents []byte, mongodbUrl string) {
-
-	checkCount := 0
-	totalCount := 0
-	// Preflight minimum kuberenetes version check
-	fmt.Printf("\nPreflight kubernetes minimum version check\n")
-	fmt.Println("------------------------------------------")
-	if err := qp.CheckK8sVersion(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight kubernetes minimum version check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight deployment check
-	fmt.Printf("\nPreflight deployment check\n")
-	fmt.Println("--------------------------")
-	if err := qp.CheckDeployment(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight deployment check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight service check
-	fmt.Printf("\nPreflight service check\n")
-	fmt.Println("-----------------------")
-	if err := qp.CheckService(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight service check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight pod check
-	fmt.Printf("\nPreflight pod check\n")
-	fmt.Println("-----------------------")
-	if err := qp.CheckPod(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight pod check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight role check
-	fmt.Printf("\nPreflight role check\n")
-	fmt.Println("--------------------------")
-	if err := qp.CheckCreateRole(namespace); err != nil {
-		fmt.Printf("Preflight role check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight rolebinding check
-	fmt.Printf("\nPreflight rolebinding check\n")
-	fmt.Println("---------------------------------")
-	if err := qp.CheckCreateRoleBinding(namespace); err != nil {
-		fmt.Printf("Preflight rolebinding check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight serviceaccount check
-	fmt.Printf("\nPreflight serviceaccount check\n")
-	fmt.Println("------------------------------------")
-	if err := qp.CheckCreateServiceAccount(namespace); err != nil {
-		fmt.Printf("Preflight serviceaccount check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight mongo check
-	fmt.Printf("\nPreflight mongo check\n")
-	fmt.Println("---------------------")
-	if err := qp.CheckMongo(kubeConfigContents, namespace, mongodbUrl); err != nil {
-		fmt.Printf("Preflight mongo check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	// Preflight DNS check
-	fmt.Printf("\nPreflight DNS check\n")
-	fmt.Println("-------------------")
-	if err := qp.CheckDns(namespace, kubeConfigContents); err != nil {
-		fmt.Printf("Preflight DNS check: FAILED\n")
-	} else {
-		checkCount++
-	}
-	totalCount++
-
-	if checkCount == totalCount {
-		fmt.Printf("\nAll preflight checks have PASSED\n")
-	} else {
-		fmt.Printf("\n1 or more preflight checks have FAILED\n")
-	}
-	fmt.Println("Completed running all preflight checks")
-}

pkg/preflight/deployability.go

@@ -1,119 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-
-	"k8s.io/client-go/kubernetes"
-)
-
-func (qp *QliksensePreflight) CheckDeployment(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("Kube config error: %v\n", err)
-		fmt.Print(err)
-		return err
-	}
-
-	// Deployment check
-	fmt.Printf("Preflight deployment check: \n")
-	err = qp.checkPfDeployment(clientset, namespace, "deployment-preflight-check")
-	if err != nil {
-		fmt.Println("Preflight Deployment check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight deployment check")
-
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckService(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	// Service check
-	fmt.Printf("\nPreflight service check: \n")
-	err = checkPfService(clientset, namespace)
-	if err != nil {
-		fmt.Println("Preflight Service check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight service check")
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckPod(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Print(err)
-		return err
-	}
-	// Pod check
-	fmt.Printf("\nPreflight pod check: \n")
-
-	err = qp.checkPfPod(clientset, namespace)
-	if err != nil {
-		fmt.Println("Preflight Pod check: FAILED")
-		return err
-	}
-	fmt.Println("Completed preflight pod check")
-	return nil
-}
-
-func (qp *QliksensePreflight) checkPfPod(clientset *kubernetes.Clientset, namespace string) error {
-	// create a pod
-	podName := "pod-pf-check"
-	commandToRun := []string{}
-	pod, err := createPreflightTestPod(clientset, namespace, podName, qp.GetPreflightConfigObj().GetImageName(nginx), commandToRun)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create pod %s - %v\n", podName, err)
-		return err
-	}
-	defer deletePod(clientset, namespace, podName)
-
-	if err := waitForPod(clientset, namespace, pod); err != nil {
-		return err
-	}
-
-	fmt.Println("Preflight pod creation check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}
-
-func checkPfService(clientset *kubernetes.Clientset, namespace string) error {
-	// creating service
-	serviceName := "svc-pf-check"
-	pfService, err := createPreflightTestService(clientset, namespace, serviceName)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create service : %s\n", serviceName)
-		return err
-	}
-	defer deleteService(clientset, namespace, serviceName)
-	_, err = getService(clientset, namespace, pfService.GetName())
-	if err != nil {
-		err = fmt.Errorf("error: unable to retrieve service: %s\n", serviceName)
-		return err
-	}
-	fmt.Println("Preflight service creation check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}
-
-func (qp *QliksensePreflight) checkPfDeployment(clientset *kubernetes.Clientset, namespace, depName string) error {
-	// check if we are able to create a deployment
-	pfDeployment, err := createPreflightTestDeployment(clientset, namespace, depName, qp.GetPreflightConfigObj().GetImageName(nginx))
-	if err != nil {
-		err = fmt.Errorf("error: unable to create deployment: %v\n", err)
-		return err
-	}
-	defer deleteDeployment(clientset, namespace, depName)
-	if err := waitForDeployment(clientset, namespace, pfDeployment); err != nil {
-		return err
-	}
-	fmt.Println("Preflight Deployment check: PASSED")
-	fmt.Println("Cleaning up resources...")
-	return nil
-}

pkg/preflight/dns_check.go

@@ -1,84 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-	"strings"
-)
-
-const (
-	nginx  = "nginx"
-	netcat = "netcat"
-)
-
-func (qp *QliksensePreflight) CheckDns(namespace string, kubeConfigContents []byte) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-
-	// creating deployment
-	depName := "dep-dns-preflight-check"
-	dnsDeployment, err := createPreflightTestDeployment(clientset, namespace, depName, qp.GetPreflightConfigObj().GetImageName(nginx))
-	if err != nil {
-		err = fmt.Errorf("error: unable to create deployment: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	defer deleteDeployment(clientset, namespace, depName)
-
-	if err := waitForDeployment(clientset, namespace, dnsDeployment); err != nil {
-		return err
-	}
-
-	// creating service
-	serviceName := "svc-dns-pf-check"
-	dnsService, err := createPreflightTestService(clientset, namespace, serviceName)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create service : %s\n", serviceName)
-		return err
-	}
-	defer deleteService(clientset, namespace, serviceName)
-
-	// create a pod
-	podName := "pf-pod-1"
-	commandToRun := []string{"sh", "-c", "sleep 10; nc -z -v -w 1 " + dnsService.Name + " 80"}
-	dnsPod, err := createPreflightTestPod(clientset, namespace, podName, qp.GetPreflightConfigObj().GetImageName(netcat), commandToRun)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create pod : %s\n", podName)
-		return err
-	}
-
-	defer deletePod(clientset, namespace, podName)
-
-	if err := waitForPod(clientset, namespace, dnsPod); err != nil {
-		return err
-	}
-	if len(dnsPod.Spec.Containers) == 0 {
-		err := fmt.Errorf("error: there are no containers in the pod")
-		fmt.Println(err)
-		return err
-	}
-
-	waitForPodToDie(clientset, namespace, dnsPod)
-
-	logStr, err := getPodLogs(clientset, dnsPod)
-	if err != nil {
-		err = fmt.Errorf("error: unable to execute dns check in the cluster: %v", err)
-		fmt.Println(err)
-		return err
-	}
-
-	if strings.HasSuffix(strings.TrimSpace(logStr), "succeeded!") {
-		fmt.Println("Preflight DNS check: PASSED")
-	} else {
-		err = fmt.Errorf("Expected response not found\n")
-		return err
-	}
-
-	fmt.Println("Completed preflight DNS check")
-	fmt.Println("Cleaning up resources...")
-
-	return nil
-}

pkg/preflight/mongo_check.go

@@ -1,83 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-	"strings"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-const (
-	mongo = "mongo"
-)
-
-func (qp *QliksensePreflight) CheckMongo(kubeConfigContents []byte, namespace, mongodbUrl string) error {
-	fmt.Printf("Preflight mongodb check: \n")
-
-	if mongodbUrl == "" {
-		// infer mongoDbUrl from currentCR
-		fmt.Println("MongoDbUri is empty, infer from CR")
-		qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
-		var currentCR *qapi.QliksenseCR
-
-		var err error
-		qConfig.SetNamespace(namespace)
-		currentCR, err = qConfig.GetCurrentCR()
-		if err != nil {
-			fmt.Printf("Unable to retrieve current CR: %v\n", err)
-			return err
-		}
-		decryptedCR, err := qConfig.GetDecryptedCr(currentCR)
-		mongodbUrl = decryptedCR.Spec.GetFromSecrets("qliksense", "mongoDbUri")
-	}
-
-	fmt.Printf("mongodbUrl: %s\n", mongodbUrl)
-	if err := qp.mongoConnCheck(kubeConfigContents, namespace, mongodbUrl); err != nil {
-		return err
-	}
-	fmt.Println("Completed preflight mongodb check")
-	return nil
-}
-
-func (qp *QliksensePreflight) mongoConnCheck(kubeConfigContents []byte, namespace, mongodbUrl string) error {
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("error: unable to create a kubernetes client: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	// create a pod
-	podName := "pf-mongo-pod"
-	commandToRun := []string{"sh", "-c", "sleep 10;mongo " + mongodbUrl}
-	mongoPod, err := createPreflightTestPod(clientset, namespace, podName, qp.GetPreflightConfigObj().GetImageName(mongo), commandToRun)
-	if err != nil {
-		err = fmt.Errorf("error: unable to create pod : %v\n", err)
-		return err
-	}
-	defer deletePod(clientset, namespace, podName)
-
-	if err := waitForPod(clientset, namespace, mongoPod); err != nil {
-		return err
-	}
-	if len(mongoPod.Spec.Containers) == 0 {
-		err := fmt.Errorf("error: there are no containers in the pod- %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-	waitForPodToDie(clientset, namespace, mongoPod)
-	logStr, err := getPodLogs(clientset, mongoPod)
-	if err != nil {
-		err = fmt.Errorf("error: unable to execute mongo check in the cluster: %v\n", err)
-		fmt.Println(err)
-		return err
-	}
-
-	stringToCheck := "Implicit session:"
-	if strings.Contains(logStr, stringToCheck) {
-		fmt.Println("Preflight mongo check: PASSED")
-	} else {
-		err = fmt.Errorf("Expected response not found\n")
-		return err
-	}
-	return nil
-}

pkg/preflight/preflight_utils.go

@@ -1,645 +0,0 @@
-package preflight
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/mitchellh/go-homedir"
-	"github.com/pkg/errors"
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-	appsv1 "k8s.io/api/apps/v1"
-	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/api/rbac/v1beta1"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/retry"
-)
-
-var gracePeriod int64 = 0
-
-type QliksensePreflight struct {
-	Q *qliksense.Qliksense
-}
-
-func (qp *QliksensePreflight) GetPreflightConfigObj() *api.PreflightConfig {
-	return api.NewPreflightConfig(qp.Q.QliksenseHome)
-}
-
-func InitPreflight() (string, []byte, error) {
-	api.LogDebugMessage("Reading .kube/config file...")
-
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir\n")
-		return "", nil, err
-	}
-	api.LogDebugMessage("Kube config location: %s\n\n", filepath.Join(homeDir, ".kube", "config"))
-
-	kubeConfig := filepath.Join(homeDir, ".kube", "config")
-	kubeConfigContents, err := ioutil.ReadFile(kubeConfig)
-	if err != nil {
-		err = fmt.Errorf("Unable to deduce home dir\n")
-		return "", nil, err
-	}
-	// retrieve namespace
-	namespace := api.GetKubectlNamespace()
-	// if namespace comes back empty, we will run checks in the default namespace
-	if namespace == "" {
-		namespace = "default"
-	}
-	api.LogDebugMessage("Namespace: %s\n", namespace)
-	return namespace, kubeConfigContents, nil
-}
-
-func initiateK8sOps(opr, namespace string) error {
-	opr1 := strings.Fields(opr)
-	_, err := api.KubectlDirectOps(opr1, namespace)
-	if err != nil {
-		fmt.Println(err)
-		return err
-	}
-	return nil
-}
-
-func int32Ptr(i int32) *int32 { return &i }
-
-func retryOnError(mf func() error) error {
-	return retry.OnError(wait.Backoff{
-		Duration: 1 * time.Second,
-		Factor:   1,
-		Jitter:   0.1,
-		Steps:    5,
-	}, func(err error) bool {
-		return k8serrors.IsConflict(err) || k8serrors.IsGone(err) || k8serrors.IsServerTimeout(err) ||
-			k8serrors.IsServiceUnavailable(err) || k8serrors.IsTimeout(err) || k8serrors.IsTooManyRequests(err)
-	}, mf)
-}
-
-func getK8SClientSet(kubeconfig []byte, contextName string) (*kubernetes.Clientset, *rest.Config, error) {
-	var clientConfig *rest.Config
-	var err error
-	if len(kubeconfig) == 0 {
-		clientConfig, err = rest.InClusterConfig()
-		if err != nil {
-			err = errors.Wrap(err, "Unable to load in-cluster kubeconfig")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-	} else {
-		config, err := clientcmd.Load(kubeconfig)
-		if err != nil {
-			err = errors.Wrap(err, "Unable to load kubeconfig")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-		if contextName != "" {
-			config.CurrentContext = contextName
-		}
-		clientConfig, err = clientcmd.NewDefaultClientConfig(*config, &clientcmd.ConfigOverrides{}).ClientConfig()
-		if err != nil {
-			err = errors.Wrap(err, "Unable to create client config from config")
-			fmt.Println(err)
-			return nil, nil, err
-		}
-	}
-	clientset, err := kubernetes.NewForConfig(clientConfig)
-	if err != nil {
-		err = errors.Wrap(err, "Unable to create clientset")
-		fmt.Println(err)
-		return nil, nil, err
-	}
-	return clientset, clientConfig, nil
-}
-
-func createPreflightTestDeployment(clientset *kubernetes.Clientset, namespace string, depName string, imageName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	deployment := &appsv1.Deployment{
-		ObjectMeta: v1.ObjectMeta{
-			Name: depName,
-		},
-		Spec: appsv1.DeploymentSpec{
-			Replicas: int32Ptr(1),
-			Selector: &v1.LabelSelector{
-				MatchLabels: map[string]string{
-					"app": "preflight-check",
-				},
-			},
-			Template: apiv1.PodTemplateSpec{
-				ObjectMeta: v1.ObjectMeta{
-					Labels: map[string]string{
-						"app":   "preflight-check",
-						"label": "preflight-check-label",
-					},
-				},
-				Spec: apiv1.PodSpec{
-					Containers: []apiv1.Container{
-						{
-							Name:  "dep",
-							Image: imageName,
-							Ports: []apiv1.ContainerPort{
-								{
-									Name:          "http",
-									Protocol:      apiv1.ProtocolTCP,
-									ContainerPort: 80,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	// Create Deployment
-	var result *appsv1.Deployment
-	if err := retryOnError(func() (err error) {
-		result, err = deploymentsClient.Create(deployment)
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "error: unable to create deployments in the %s namespace", namespace)
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created deployment %q\n", result.GetObjectMeta().GetName())
-
-	return deployment, nil
-}
-
-func getDeployment(clientset *kubernetes.Clientset, namespace, depName string) (*appsv1.Deployment, error) {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	var deployment *appsv1.Deployment
-	if err := retryOnError(func() (err error) {
-		deployment, err = deploymentsClient.Get(depName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "error: unable to get deployments in the %s namespace", namespace)
-		api.LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return deployment, nil
-}
-
-func deleteDeployment(clientset *kubernetes.Clientset, namespace, name string) error {
-	deploymentsClient := clientset.AppsV1().Deployments(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-
-	if err := retryOnError(func() (err error) {
-		return deploymentsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	if err := waitForDeploymentToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	fmt.Printf("Deleted deployment: %s\n", name)
-	return nil
-}
-
-func createPreflightTestService(clientset *kubernetes.Clientset, namespace string, svcName string) (*apiv1.Service, error) {
-	iptr := int32Ptr(80)
-	servicesClient := clientset.CoreV1().Services(namespace)
-	service := &apiv1.Service{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      svcName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight-check",
-			},
-		},
-		Spec: apiv1.ServiceSpec{
-			Ports: []apiv1.ServicePort{
-				{Name: "port1",
-					Port: *iptr,
-				},
-			},
-			Selector: map[string]string{
-				"app": "preflight-check",
-			},
-			ClusterIP: "",
-		},
-	}
-	var result *apiv1.Service
-	if err := retryOnError(func() (err error) {
-		result, err = servicesClient.Create(service)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created service %q\n", result.GetObjectMeta().GetName())
-
-	return service, nil
-}
-
-func getService(clientset *kubernetes.Clientset, namespace, svcName string) (*apiv1.Service, error) {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	var svc *apiv1.Service
-	if err := retryOnError(func() (err error) {
-		svc, err = servicesClient.Get(svcName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		err = errors.Wrapf(err, "unable to get services in the %s namespace", namespace)
-		fmt.Println(err)
-		return nil, err
-	}
-
-	return svc, nil
-}
-
-func deleteService(clientset *kubernetes.Clientset, namespace, name string) error {
-	servicesClient := clientset.CoreV1().Services(namespace)
-	// Create Deployment
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	if err := retryOnError(func() (err error) {
-		return servicesClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	fmt.Printf("Deleted service: %s\n", name)
-	return nil
-}
-
-func deletePod(clientset *kubernetes.Clientset, namespace, name string) error {
-
-	podsClient := clientset.CoreV1().Pods(namespace)
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy:  &deletePolicy,
-		GracePeriodSeconds: &gracePeriod,
-	}
-	if err := retryOnError(func() (err error) {
-		return podsClient.Delete(name, &deleteOptions)
-	}); err != nil {
-		fmt.Println(err)
-		return err
-	}
-	if err := waitForPodToDelete(clientset, namespace, name); err != nil {
-		return err
-	}
-	fmt.Printf("Deleted pod: %s\n", name)
-	return nil
-}
-
-func createPreflightTestPod(clientset *kubernetes.Clientset, namespace string, podName string, imageName string, commandToRun []string) (*apiv1.Pod, error) {
-	// build the pod definition we want to deploy
-	pod := &apiv1.Pod{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      podName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight",
-			},
-		},
-		Spec: apiv1.PodSpec{
-			RestartPolicy: apiv1.RestartPolicyNever,
-			Containers: []apiv1.Container{
-				{
-					Name:            "cnt",
-					Image:           imageName,
-					ImagePullPolicy: apiv1.PullIfNotPresent,
-					Command:         commandToRun,
-				},
-			},
-		},
-	}
-
-	// now create the pod in kubernetes cluster using the clientset
-	if err := retryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Create(pod)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created pod: %s\n", pod.Name)
-	return pod, nil
-}
-
-func getPod(clientset *kubernetes.Clientset, namespace, podName string) (*apiv1.Pod, error) {
-	api.LogDebugMessage("Fetching pod: %s\n", podName)
-	var pod *apiv1.Pod
-	if err := retryOnError(func() (err error) {
-		pod, err = clientset.CoreV1().Pods(namespace).Get(podName, v1.GetOptions{})
-		return err
-	}); err != nil {
-		api.LogDebugMessage("%v\n", err)
-		return nil, err
-	}
-	return pod, nil
-}
-
-func getPodLogs(clientset *kubernetes.Clientset, pod *apiv1.Pod) (string, error) {
-	podLogOpts := apiv1.PodLogOptions{}
-
-	api.LogDebugMessage("Retrieving logs for pod: %s   namespace: %s\n", pod.GetName(), pod.Namespace)
-	req := clientset.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &podLogOpts)
-	podLogs, err := req.Stream()
-	if err != nil {
-		return "", err
-	}
-	defer podLogs.Close()
-	time.Sleep(15 * time.Second)
-	buf := new(bytes.Buffer)
-	_, err = io.Copy(buf, podLogs)
-	if err != nil {
-		return "", err
-	}
-	api.LogDebugMessage("Log from pod: %s\n", buf.String())
-	return buf.String(), nil
-}
-
-func waitForResource(checkFunc func() (interface{}, error), validateFunc func(interface{}) bool) error {
-	timeout := time.NewTicker(2 * time.Minute)
-	defer timeout.Stop()
-OUT:
-	for {
-		r, err := checkFunc()
-		if err != nil {
-			return err
-		}
-		select {
-		case <-timeout.C:
-			break OUT
-		default:
-			if validateFunc(r) {
-				break OUT
-			}
-		}
-		time.Sleep(5 * time.Second)
-	}
-	return nil
-}
-
-func waitForDeployment(clientset *kubernetes.Clientset, namespace string, pfDeployment *appsv1.Deployment) error {
-	var err error
-	depName := pfDeployment.GetName()
-	checkFunc := func() (interface{}, error) {
-		pfDeployment, err = getDeployment(clientset, namespace, depName)
-		if err != nil {
-			err = fmt.Errorf("error: unable to retrieve deployment: %s\n", depName)
-			fmt.Println(err)
-			return nil, err
-		}
-		return pfDeployment, nil
-	}
-	validateFunc := func(data interface{}) bool {
-		d := data.(*appsv1.Deployment)
-		return int(d.Status.ReadyReplicas) > 0
-	}
-	if err := waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	if int(pfDeployment.Status.ReadyReplicas) == 0 {
-		err = fmt.Errorf("error: deployment took longer than expected to spin up pods")
-		fmt.Println(err)
-		return err
-	}
-	return nil
-}
-
-func waitForPod(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Pod) error {
-	var err error
-	if len(pod.Spec.Containers) == 0 {
-		err = fmt.Errorf("error: there are no containers in the pod")
-		fmt.Println(err)
-		return err
-	}
-	podName := pod.Name
-	checkFunc := func() (interface{}, error) {
-		pod, err = getPod(clientset, namespace, podName)
-		if err != nil {
-			err = fmt.Errorf("error: unable to retrieve %s pod by name", podName)
-			fmt.Println(err)
-			return nil, err
-		}
-		return pod, nil
-	}
-	validateFunc := func(data interface{}) bool {
-		po := data.(*apiv1.Pod)
-		return len(po.Status.ContainerStatuses) > 0 && po.Status.ContainerStatuses[0].Ready
-	}
-
-	if err := waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	if len(pod.Status.ContainerStatuses) == 0 || !pod.Status.ContainerStatuses[0].Ready {
-		err = fmt.Errorf("error: container is taking much longer than expected")
-		fmt.Println(err)
-		return err
-	}
-	return nil
-}
-
-func waitForPodToDie(clientset *kubernetes.Clientset, namespace string, pod *apiv1.Pod) error {
-	podName := pod.Name
-	checkFunc := func() (interface{}, error) {
-		po, err := getPod(clientset, namespace, podName)
-		if err != nil {
-			err = fmt.Errorf("error: unable to retrieve %s pod by name", podName)
-			fmt.Println(err)
-			return nil, err
-		}
-		api.LogDebugMessage("pod status: %v\n", po.Status.Phase)
-		return po, nil
-	}
-	validateFunc := func(r interface{}) bool {
-		po := r.(*apiv1.Pod)
-		return po.Status.Phase == apiv1.PodFailed || po.Status.Phase == apiv1.PodSucceeded
-	}
-	if err := waitForResource(checkFunc, validateFunc); err != nil {
-		return err
-	}
-	return nil
-}
-
-func waitForPodToDelete(clientset *kubernetes.Clientset, namespace, podName string) error {
-	checkFunc := func() (interface{}, error) {
-		po, err := getPod(clientset, namespace, podName)
-		if err != nil {
-			return nil, err
-		}
-		return po, nil
-	}
-	validateFunc := func(po interface{}) bool {
-		return false
-	}
-	if err := waitForResource(checkFunc, validateFunc); err != nil {
-		return nil
-	}
-	err := fmt.Errorf("error: delete pod is taking unusually long")
-	fmt.Println(err)
-	return err
-}
-
-func waitForDeploymentToDelete(clientset *kubernetes.Clientset, namespace, deploymentName string) error {
-	checkFunc := func() (interface{}, error) {
-		dep, err := getDeployment(clientset, namespace, deploymentName)
-		if err != nil {
-			return nil, err
-		}
-		return dep, nil
-	}
-	validateFunc := func(po interface{}) bool {
-		return false
-	}
-	if err := waitForResource(checkFunc, validateFunc); err != nil {
-		return nil
-	}
-	err := fmt.Errorf("error: delete deployment is taking unusually long")
-	fmt.Println(err)
-	return err
-}
-
-func createPfRole(clientset *kubernetes.Clientset, namespace, roleName string) (*v1beta1.Role, error) {
-	// build the role defination we want to create
-	var role *v1beta1.Role
-	roleSpec := &v1beta1.Role{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      roleName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "preflight",
-			},
-		},
-		Rules: []v1beta1.PolicyRule{},
-	}
-
-	// now create the role in kubernetes cluster using the clientset
-	if err := retryOnError(func() (err error) {
-		role, err = clientset.RbacV1beta1().Roles(namespace).Create(roleSpec)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-
-	fmt.Printf("Created role: %s\n", role.Name)
-
-	return role, nil
-}
-
-func deleteRole(clientset *kubernetes.Clientset, namespace string, role *v1beta1.Role) {
-	rolesClient := clientset.RbacV1beta1().Roles(namespace)
-
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	err := rolesClient.Delete(role.GetName(), &deleteOptions)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Deleted role: %s\n\n", role.Name)
-}
-
-func createPfRoleBinding(clientset *kubernetes.Clientset, namespace, roleBindingName string) (*v1beta1.RoleBinding, error) {
-	var roleBinding *v1beta1.RoleBinding
-	// build the rolebinding defination we want to create
-	roleBindingSpec := &v1beta1.RoleBinding{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      roleBindingName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "demo",
-			},
-		},
-		Subjects: []v1beta1.Subject{
-			{
-				Kind:      "ServiceAccount",
-				APIGroup:  "",
-				Name:      "preflight-check-subject",
-				Namespace: namespace,
-			},
-		},
-		RoleRef: v1beta1.RoleRef{
-			APIGroup: "",
-			Kind:     "Role",
-			Name:     "preflight-check-roleref",
-		},
-	}
-
-	// now create the roleBinding in kubernetes cluster using the clientset
-	if err := retryOnError(func() (err error) {
-		roleBinding, err = clientset.RbacV1beta1().RoleBindings(namespace).Create(roleBindingSpec)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created RoleBinding: %s\n", roleBindingSpec.Name)
-	return roleBinding, nil
-}
-
-func deleteRoleBinding(clientset *kubernetes.Clientset, namespace string, roleBinding *v1beta1.RoleBinding) {
-	roleBindingClient := clientset.RbacV1beta1().RoleBindings(namespace)
-
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	err := roleBindingClient.Delete(roleBinding.GetName(), &deleteOptions)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Deleted RoleBinding: %s\n\n", roleBinding.Name)
-}
-
-func createPfServiceAccount(clientset *kubernetes.Clientset, namespace, serviceAccountName string) (*apiv1.ServiceAccount, error) {
-	var serviceAccount *apiv1.ServiceAccount
-	// build the serviceAccount defination we want to create
-	serviceAccountSpec := &apiv1.ServiceAccount{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      "preflight-check-test-serviceaccount",
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app": "demo",
-			},
-		},
-	}
-
-	// now create the serviceAccount in kubernetes cluster using the clientset
-	if err := retryOnError(func() (err error) {
-		serviceAccount, err = clientset.CoreV1().ServiceAccounts(namespace).Create(serviceAccountSpec)
-		return err
-	}); err != nil {
-		fmt.Println(err)
-		return nil, err
-	}
-	fmt.Printf("Created Service Account: %s\n", serviceAccountSpec.Name)
-	return serviceAccount, nil
-}
-
-func deleteServiceAccount(clientset *kubernetes.Clientset, namespace string, serviceAccount *apiv1.ServiceAccount) {
-	serviceAccountClient := clientset.CoreV1().ServiceAccounts(namespace)
-
-	deletePolicy := v1.DeletePropagationForeground
-	deleteOptions := v1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	}
-	err := serviceAccountClient.Delete(serviceAccount.GetName(), &deleteOptions)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Deleted ServiceAccount: %s\n\n", serviceAccount.Name)
-}

pkg/preflight/preflight_utils_test.go

@@ -1,43 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-	"testing"
-)
-
-func Test_initiateK8sOps(t *testing.T) {
-	t.Skip()
-	type args struct {
-		opr       string
-		namespace string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-	}{
-		{
-			name: "valid case",
-			args: args{
-				opr:       fmt.Sprintf("version"),
-				namespace: "test-ns",
-			},
-			wantErr: false,
-		},
-		{
-			name: "invalid case",
-			args: args{
-				opr:       fmt.Sprintf("versions"),
-				namespace: "test-ns",
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := initiateK8sOps(tt.args.opr, tt.args.namespace); (err != nil) != tt.wantErr {
-				t.Errorf("initiateK8sOps() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}

pkg/preflight/role_check.go

@@ -1,137 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/qlik-oss/sense-installer/pkg/api"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/qlik-oss/sense-installer/pkg/qliksense"
-)
-
-var resultYamlBytes = []byte("")
-
-func (qp *QliksensePreflight) CheckCreateRole(namespace string) error {
-	// create a Role
-	fmt.Printf("Preflight role check: \n")
-	err := qp.checkCreateEntity(namespace, "Role")
-	if err != nil {
-		return err
-	}
-	fmt.Println("Completed preflight role check")
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckCreateRoleBinding(namespace string) error {
-	// create a RoleBinding
-	fmt.Printf("Preflight rolebinding check: \n")
-	err := qp.checkCreateEntity(namespace, "RoleBinding")
-	if err != nil {
-		return err
-	}
-	fmt.Println("Completed preflight rolebinding check")
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckCreateServiceAccount(namespace string) error {
-	// create a service account
-	fmt.Printf("Preflight serviceaccount check: \n")
-	err := qp.checkCreateEntity(namespace, "ServiceAccount")
-	if err != nil {
-		return err
-	}
-	fmt.Println("Completed preflight serviceaccount check")
-	return nil
-}
-func (qp *QliksensePreflight) checkCreateEntity(namespace, entityToTest string) error {
-	qConfig := qapi.NewQConfig(qp.Q.QliksenseHome)
-	var currentCR *qapi.QliksenseCR
-	mfroot := ""
-	kusDir := ""
-	var err error
-	currentCR, err = qConfig.GetCurrentCR()
-	if err != nil {
-		fmt.Printf("Unable to retrieve current CR: %v\n", err)
-		return err
-	}
-	if currentCR.IsRepoExist() {
-		mfroot = currentCR.Spec.GetManifestsRoot()
-	} else if tempDownloadedDir, err := qliksense.DownloadFromGitRepoToTmpDir(qliksense.QLIK_GIT_REPO, "master"); err != nil {
-		fmt.Printf("Unable to Download from git repo to tmp dir: %v\n", err)
-		return err
-	} else {
-		mfroot = tempDownloadedDir
-	}
-
-	if currentCR.Spec.Profile == "" {
-		kusDir = filepath.Join(mfroot, "manifests", "docker-desktop")
-	} else {
-		kusDir = filepath.Join(mfroot, "manifests", currentCR.Spec.Profile)
-	}
-	if len(resultYamlBytes) == 0 {
-		resultYamlBytes, err = qliksense.ExecuteKustomizeBuild(kusDir)
-		if err != nil {
-			fmt.Printf("Unable to retrieve manifests from executing kustomize: %v\n", err)
-			return err
-		}
-	}
-	sa := qliksense.GetYamlsFromMultiDoc(string(resultYamlBytes), entityToTest)
-	if sa != "" {
-		sa = strings.Replace(sa, "name: qliksense", "name: preflight", -1)
-	} else {
-		err := fmt.Errorf("Unable to retrieve yamls to apply on cluster")
-		fmt.Println(err)
-		return err
-	}
-	namespace = "" // namespace is handled when generating the manifests
-
-	defer func() {
-		fmt.Println("Cleaning up resources")
-		api.KubectlDelete(sa, namespace)
-		if err != nil {
-			fmt.Println("Preflight cleanup failed!")
-		}
-	}()
-
-	err = api.KubectlApply(sa, namespace)
-	if err != nil {
-		err := fmt.Errorf("Failed to create entity on the cluster: %v", err)
-		fmt.Println(err)
-		return err
-	}
-
-	fmt.Printf("Preflight %s check: PASSED\n", entityToTest)
-	return nil
-}
-
-func (qp *QliksensePreflight) CheckCreateRB(namespace string, kubeConfigContents []byte) error {
-
-	// create a role
-	fmt.Printf("Preflight createRole check: \n")
-	err := qp.checkCreateEntity(namespace, "Role")
-	if err != nil {
-		fmt.Println("Preflight role check: FAILED")
-	}
-	fmt.Printf("Completed preflight role check\n\n")
-
-	// create a roleBinding
-	fmt.Printf("Preflight rolebinding check: \n")
-	err = qp.checkCreateEntity(namespace, "RoleBinding")
-	if err != nil {
-		fmt.Println("Preflight rolebinding check: FAILED")
-	}
-	fmt.Printf("Completed preflight rolebinding check\n\n")
-
-	// create a service account
-	fmt.Printf("Preflight serviceaccount check: \n")
-	err = qp.checkCreateEntity(namespace, "ServiceAccount")
-	if err != nil {
-		fmt.Println("Preflight serviceaccount check: FAILED")
-	}
-	fmt.Printf("Completed preflight serviceaccount check\n\n")
-
-	fmt.Println("Preflight RB check: PASSED")
-	fmt.Println("Completed preflight CreateRB check")
-	return nil
-}

pkg/preflight/version_check.go

@@ -1,56 +0,0 @@
-package preflight
-
-import (
-	"fmt"
-
-	"github.com/Masterminds/semver/v3"
-	"k8s.io/apimachinery/pkg/version"
-)
-
-func (qp *QliksensePreflight) CheckK8sVersion(namespace string, kubeConfigContents []byte) error {
-
-	var currentVersion *semver.Version
-
-	clientset, _, err := getK8SClientSet(kubeConfigContents, "")
-	if err != nil {
-		err = fmt.Errorf("Unable to create clientset: %v\n", err)
-		return err
-	}
-	var serverVersion *version.Info
-	if err := retryOnError(func() (err error) {
-		serverVersion, err = clientset.ServerVersion()
-		return err
-	}); err != nil {
-		err = fmt.Errorf("Unable to get server version: %v\n", err)
-		//fmt.Println(err)
-		return err
-	}
-	fmt.Printf("Kubernetes API Server version: %s\n", serverVersion.String())
-
-	// Compare K8s version on the cluster with minimum supported k8s version
-	currentVersion, err = semver.NewVersion(serverVersion.String())
-	if err != nil {
-		err = fmt.Errorf("Unable to convert server version into semver version: %v\n", err)
-		//fmt.Println(err)
-		return err
-	}
-	//fmt.Printf("Current K8s Version: %v\n", currentVersion)
-
-	minK8sVersionSemver, err := semver.NewVersion(qp.GetPreflightConfigObj().GetMinK8sVersion())
-	if err != nil {
-		err = fmt.Errorf("Unable to convert minimum Kubernetes version into semver version:%v\n", err)
-		fmt.Println(err)
-		return err
-	}
-
-	if currentVersion.GreaterThan(minK8sVersionSemver) {
-		//fmt.Printf("\n\nCurrent %s Component version: %s is less than minimum required version:%s\n", component, currentComponentVersion, componentVersionFromDependenciesYaml)
-		fmt.Printf("Current %s is greater than minimum required version:%s\n", currentVersion, minK8sVersionSemver)
-		fmt.Println("Preflight minimum kubernetes version check: PASSED")
-	} else {
-		fmt.Printf("Current %s is less than minimum required version:%s\n", currentVersion, minK8sVersionSemver)
-		fmt.Println("Preflight minimum kubernetes version check: FAILED")
-	}
-	fmt.Printf("Completed Preflight kubernetes minimum version check\n")
-	return nil
-}

pkg/qliksense/about.go

@@ -94,7 +94,7 @@ func (q *Qliksense) getConfigDirectory(gitUrl, gitRef, profileEntered string) (d
 	}
 
 	if gitRef != "" {
-		if dir, err = DownloadFromGitRepoToTmpDir(gitUrl, gitRef); err != nil {
+		if dir, err = downloadFromGitRepoToTmpDir(gitUrl, gitRef); err != nil {
 			return "", false, "", err
 		} else {
 			return dir, true, profile, nil
@@ -120,15 +120,14 @@ func (q *Qliksense) getConfigDirectory(gitUrl, gitRef, profileEntered string) (d
 		return dir, false, profile, nil
 	}
 
-	if dir, err = DownloadFromGitRepoToTmpDir(gitUrl, "master"); err != nil {
+	if dir, err = downloadFromGitRepoToTmpDir(gitUrl, "master"); err != nil {
 		return "", false, "", err
 	} else {
 		return dir, true, profile, nil
 	}
 }
 
-//DownloadFromGitRepoToTmpDir download git repo to a temporary directory
+func downloadFromGitRepoToTmpDir(gitUrl, gitRef string) (string, error) {
-func DownloadFromGitRepoToTmpDir(gitUrl, gitRef string) (string, error) {
 	if tmpDir, err := ioutil.TempDir("", ""); err != nil {
 		return "", err
 	} else {
@@ -194,10 +193,8 @@ func getImageList(yamlContent []byte) ([]string, error) {
 		})
 	}
 	var sortedImageList []string
-	for image, v := range imageMap {
+	for image, _ := range imageMap {
 		sortedImageList = append(sortedImageList, image)
-		// a warning "simplify range expression" if written like this 'for image _ :=range imageMap'
-		_ = v
 	}
 	sort.Strings(sortedImageList)
 	return sortedImageList, nil

pkg/qliksense/about_test.go

@@ -525,16 +525,12 @@ func Test_About_getConfigDirectory(t *testing.T) {
 					if err := q.SetUpQliksenseDefaultContext(); err != nil {
 						t.Fatalf("error setting up default context in the tmp dir: %v\n", err)
 						return nil, "", "", ""
-					} else if qConfig, err := qapi.NewQConfigE(q.QliksenseHome); err != nil {
+					} else if err := q.FetchQK8s("master"); err != nil {
-						t.Fatalf("cannot initiallize qConfig: %v\n", err)
+						t.Fatalf("error fetching master config to the tmp dir: %v\n", err)
 						return nil, "", "", ""
-					} else if !qConfig.IsRepoExistForCurrent("master") {
+					} else {
-						if err := q.FetchQK8s("master"); err != nil {
+						return q, "no-git-clone-for-you", "", ""
-							t.Fatalf("error fetching master config to the tmp dir: %v\n", err)
-							return nil, "", "", ""
-						}
 					}
-					return q, "no-git-clone-for-you", "", ""
 				}
 			},
 			verify: func(q *Qliksense, configDir string, isTemporary bool, profile string) (ok bool, reason string, err error) {

pkg/qliksense/apply.go

@@ -1,46 +0,0 @@
-package qliksense
-
-import (
-	"io"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func (q *Qliksense) ApplyCRFromReader(r io.Reader, opts *InstallCommandOptions, keepPatchFiles, overwriteExistingContext bool) error {
-	if err := q.LoadCr(r, overwriteExistingContext); err != nil {
-		return err
-	}
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	cr, err := qConfig.GetCurrentCR()
-	if 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 {
-			v := cr.GetLabelFromCr("version")
-			if !qConfig.IsRepoExistForCurrent(v) {
-				if err := q.FetchQK8s(v); err != nil {
-					return err
-				}
-			}
-		}
-		return q.UpgradeQK8s(keepPatchFiles)
-	}
-	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/config.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -18,7 +17,7 @@ import (
 )
 
 const (
-	Q_INIT_CRD_PATH   = "manifests/base/crds"
+	Q_INIT_CRD_PATH   = "manifests/base/manifests/qliksense-init"
 	agreementTempalte = `
 	Please read the agreement at https://www.qlik.com/us/legal/license-terms
 	Accept the end user license agreement by providing acceptEULA=yes
@@ -89,7 +88,7 @@ func (q *Qliksense) applyConfigToK8s(qcr *qapi.QliksenseCR) error {
 	cr.GeneratePatches(&qcr.KApiCr, path.Join(userHomeDir, ".kube", "config"))
 	// apply generated manifests
 	profilePath := filepath.Join(qcr.Spec.GetManifestsRoot(), qcr.Spec.GetProfileDir())
-	mByte, err := ExecuteKustomizeBuild(profilePath)
+	mByte, err := executeKustomizeBuild(profilePath)
 	if err != nil {
 		fmt.Println("cannot generate manifests for "+profilePath, err)
 		return err
@@ -107,6 +106,7 @@ func (q *Qliksense) ConfigViewCR() error {
 	if err != nil {
 		return err
 	}
+	fmt.Println(r)
 	oth, err := q.getCurrentCrDependentResourceAsString()
 	if err != nil {
 		return err
@@ -146,76 +146,21 @@ func (q *Qliksense) getCurrentCrDependentResourceAsString() (string, error) {
 	var crString strings.Builder
 
 	for svcName, v := range qcr.Spec.Secrets {
-		hasFile := false
 		for _, item := range v {
 			if item.ValueFrom != nil && item.ValueFrom.SecretKeyRef != nil {
-				hasFile = true
+				secretFilePath := filepath.Join(q.QliksenseHome, QliksenseContextsDir, qcr.GetName(), QliksenseSecretsDir, svcName+".yaml")
-				break
+
-			}
+				if api.FileExists(secretFilePath) {
-		}
+					secretFile, err := ioutil.ReadFile(secretFilePath)
-		if hasFile {
+					if err != nil {
-			secretFilePath := filepath.Join(q.QliksenseHome, QliksenseContextsDir, qcr.GetName(), QliksenseSecretsDir, svcName+".yaml")
+						return "", err
-			if api.FileExists(secretFilePath) {
+					}
-				secretFile, err := ioutil.ReadFile(secretFilePath)
+					crString.WriteString("\n---\n")
-				if err != nil {
+					crString.Write(secretFile)
-					return "", err
 				}
-				crString.WriteString("\n---\n")
-				crString.Write(secretFile)
 			}
 		}
 	}
 	crString.WriteString("\n---\n")
 	return crString.String(), nil
 }
-
-func (q *Qliksense) EditCR(contextName string) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if contextName == "" {
-		cr, err := qConfig.GetCurrentCR()
-		if err != nil {
-			return err
-		}
-		contextName = cr.GetName()
-	}
-	crFilePath := qConfig.GetCRFilePath(contextName)
-	tempFile, err := ioutil.TempFile("", "*.yaml")
-	if err != nil {
-		return err
-	}
-	crContent, err := ioutil.ReadFile(crFilePath)
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(tempFile.Name(), crContent, os.ModePerm); err != nil {
-		return nil
-	}
-	cmd := exec.Command(getKubeEditorTool(), tempFile.Name())
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-	newCr, err := qapi.GetCRObject(tempFile.Name())
-	if err != nil {
-		return errors.New("cannot save the cr. Someting wrong in the file format. It is not saved\n" + err.Error())
-	}
-	oldCr, err := qapi.GetCRObject(crFilePath)
-
-	if oldCr.GetName() != newCr.GetName() {
-		return errors.New("cr name cannot be chagned")
-	}
-	if newCr.Validate() {
-		return qConfig.WriteCR(newCr)
-	}
-	return nil
-}
-
-func getKubeEditorTool() string {
-	editor := os.Getenv("KUBE_EDITOR")
-	if editor == "" {
-		editor = "vim"
-	}
-	return editor
-}

pkg/qliksense/context_configs.go

@@ -1,23 +1,18 @@
 package qliksense
 
 import (
-	"errors"
+	"crypto/rsa"
 	"fmt"
-	"io"
-
-	"github.com/qlik-oss/k-apis/pkg/config"
-	"github.com/robfig/cron/v3"
-
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
-	"reflect"
 	"strings"
 	"text/tabwriter"
 
-	b64 "encoding/base64"
+	"github.com/qlik-oss/k-apis/pkg/config"
 
+	b64 "encoding/base64"
 	ansi "github.com/mattn/go-colorable"
 	"github.com/qlik-oss/sense-installer/pkg/api"
 	"github.com/ttacon/chalk"
@@ -34,58 +29,48 @@ const (
 	MaxContextNameLength    = 17
 	QliksenseSecretsDir     = "secrets"
 
-	imageRegistryConfigKey     = "imageRegistry"
+	imageRegistryConfigKey = "imageRegistry"
-	pullSecretName             = "artifactory-docker-secret"
+	pullSecretName         = "artifactory-docker-secret"
-	qliksenseOperatorImageRepo = "qlik-docker-oss.bintray.io"
-	qliksenseOperatorImageName = "qliksense-operator"
 )
 
-func (q *Qliksense) SetSecretsFromReader(arg string, reader io.Reader, createSecret, base64Encoded bool) error {
-	//take only name from the arguments, value should be from reader
-	argName := strings.SplitN(arg, "=", 1)
-	if len(argName) != 1 {
-		return errors.New("can only have one argument from pipe")
-	}
-	valueBytes, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-	return q.SetSecrets([]string{argName[0] + "=" + string(valueBytes)}, createSecret, base64Encoded)
-}
-
 // SetSecrets - set-secrets <key>=<value> commands
-func (q *Qliksense) SetSecrets(args []string, isSecretSet bool, base64Encoded bool) error {
+func (q *Qliksense) SetSecrets(args []string, isSecretSet bool) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
 
 	// Metadata name in qliksense CR is the name of the current context
 	api.LogDebugMessage("Current context: %s", qliksenseCR.GetName())
-	encryptionKey, err := qConfig.GetEncryptionKeyForCurrent()
+	rsaPublicKey, _, err := qConfig.GetCurrentContextEncryptionKeyPair()
 	if err != nil {
 		return err
 	}
-	resultArgs, err := api.ProcessConfigArgs(args, base64Encoded)
+	resultArgs, err := api.ProcessConfigArgs(args)
 	if err != nil {
 		return err
 	}
 	for _, ra := range resultArgs {
 		api.LogDebugMessage("value args to be encrypted: %s", ra.Value)
-		if err := q.processSecret(ra, encryptionKey, qliksenseCR, isSecretSet); err != nil {
+		if err := q.processSecret(ra, rsaPublicKey, qliksenseCR, isSecretSet); err != nil {
 			return err
 		}
 	}
 	// write modified content into context-yaml
-	return qConfig.WriteCR(qliksenseCR)
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+
+	return nil
 }
 
-func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, encryptionKey string, qliksenseCR *api.QliksenseCR, isSecretSet bool) error {
+func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, rsaPublicKey *rsa.PublicKey, qliksenseCR *api.QliksenseCR, isSecretSet bool) error {
-	cipherText, e2 := api.EncryptData([]byte(ra.Value), encryptionKey)
+	// encrypt value with RSA key pair
+	valueBytes := []byte(ra.Value)
+	cipherText, e2 := api.Encrypt(valueBytes, rsaPublicKey)
 	if e2 != nil {
 		return e2
 	}
+	base64EncodedSecret := b64.StdEncoding.EncodeToString(cipherText)
 	secretName := ""
 	if isSecretSet {
 		secretFolder := qliksenseCR.GetK8sSecretsFolder(q.QliksenseHome)
@@ -117,8 +102,7 @@ func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, encryptionKey string,
 		if k8sSecret.Data == nil {
 			k8sSecret.Data = map[string][]byte{}
 		}
-		// v1.Secret does enconding, so no need to encode again
+		k8sSecret.Data[ra.Key] = []byte(base64EncodedSecret)
-		k8sSecret.Data[ra.Key] = []byte(cipherText)
 
 		// Write secret to file
 		k8sSecretBytes, err := api.K8sSecretToYaml(k8sSecret)
@@ -131,36 +115,25 @@ func (q *Qliksense) processSecret(ra *api.ServiceKeyValue, encryptionKey string,
 			return err
 		}
 		api.LogDebugMessage("Created a Kubernetes secret")
+
+		// Prepare args to update CR in the next step
+		base64EncodedSecret = ""
 	}
-	base64EncodedSecret := b64.StdEncoding.EncodeToString([]byte(cipherText))
+
 	// write into CR the keyref of the secret
 	qliksenseCR.Spec.AddToSecrets(ra.SvcName, ra.Key, base64EncodedSecret, secretName)
 	return nil
 }
 
-func (q *Qliksense) SetConfigFromReader(arg string, reader io.Reader, base64Encoded bool) error {
-	//take only name from the arguments, value should be from reader
-	argName := strings.SplitN(arg, "=", 1)
-	if len(argName) != 1 {
-		return errors.New("can only have one argument from pipe")
-	}
-	valueBytes, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-	return q.SetConfigs([]string{argName[0] + "=" + string(valueBytes)}, base64Encoded)
-}
-
 // SetConfigs - set-configs <key>=<value> commands
-func (q *Qliksense) SetConfigs(args []string, base64Encoded bool) error {
+func (q *Qliksense) SetConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qConfig := api.NewQConfig(q.QliksenseHome)
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
-	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
 
-	resultArgs, err := api.ProcessConfigArgs(args, base64Encoded)
+	resultArgs, err := api.ProcessConfigArgs(args)
 	if err != nil {
 		return err
 	}
@@ -168,66 +141,55 @@ func (q *Qliksense) SetConfigs(args []string, base64Encoded bool) error {
 		qliksenseCR.Spec.AddToConfigs(ra.SvcName, ra.Key, ra.Value)
 	}
 	// write modified content into context.yaml
-	return qConfig.WriteCR(qliksenseCR)
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
+
+	return nil
 }
 
-func caseInsenstiveFieldByName(v reflect.Value, name string) reflect.Value {
+func retrieveCurrentContextInfo(q *Qliksense) (*api.QliksenseCR, string, error) {
-	name = strings.ToLower(name)
+	var qliksenseConfig api.QliksenseConfig
-	return v.FieldByNameFunc(func(n string) bool { return strings.ToLower(n) == name })
+	qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
-}
 
-func validateCR(key string, keySub string, value string, crSpec *api.QliksenseCR) (bool, *api.QliksenseCR) {
+	if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
-	cr := reflect.ValueOf(crSpec.Spec)
+		log.Println(err)
-	keyValid := caseInsenstiveFieldByName(reflect.Indirect(cr), key)
+		return nil, "", err
-	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
+	currentContext := qliksenseConfig.Spec.CurrentContext
-	if keySub != "" {
+	api.LogDebugMessage("Current-context from config.yaml: %s", currentContext)
-		if !keyValid.IsNil() {
+	if currentContext == "" {
-			if !caseInsenstiveFieldByName(reflect.Indirect(keyValid), keySub).IsValid() {
+		// current-context is empty
-				fmt.Println(keySub, "is an invalid key")
+		err := fmt.Errorf(`Please run the "qliksense config set-context <context-name>" first before viewing the current context info`)
-				return false, crSpec
+		log.Println(err)
-			} else {
+		return nil, "", err
-				// 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
+	// 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
+	}
+
+	api.LogDebugMessage("Read context file: %s, Read QliksenseCR: %v", qliksenseContextsFile, qliksenseCR)
+
+	return qliksenseCR, qliksenseContextsFile, nil
 }
 
 // SetOtherConfigs - set profile/storageclassname/git.repository/manifestRoot commands
 func (q *Qliksense) SetOtherConfigs(args []string) error {
 	// retieve current context from config.yaml
-	qConfig := api.NewQConfig(q.QliksenseHome)
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
-	qliksenseCR, err := qConfig.GetCurrentCR()
 	if err != nil {
 		return err
 	}
@@ -240,134 +202,77 @@ func (q *Qliksense) SetOtherConfigs(args []string) error {
 	}
 
 	for _, arg := range args {
-		if strings.HasPrefix(arg, "fetchSource.") {
+		argsString := strings.Split(arg, "=")
-			if err := q.processSetFetchSource(arg, qliksenseCR); err != nil {
+		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
 			}
-		} else if strings.HasPrefix(arg, "git.") {
+			qliksenseCR.Spec.RotateKeys = rotateKeys
-			if err := q.processSetGit(arg, qliksenseCR); err != nil {
+			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], "false") {
+				qliksenseCR.Spec.GitOps.Enabled = false
+			} else if strings.EqualFold(argsString[1], "true") {
+				qliksenseCR.Spec.GitOps.Enabled = true
+			} else {
+				err := fmt.Errorf("Please use a boolean value")
+				log.Println(err)
 				return err
 			}
-		} else if strings.HasPrefix(arg, "gitOps.") {
+			api.LogDebugMessage("Current gitOps enabled status : %s ", qliksenseCR.Spec.GitOps.Enabled)
-			if err := q.processSetGitOps(arg, qliksenseCR); err != nil {
+		case "gitops.schedule":
-				return err
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
 			}
-		} else {
+			qliksenseCR.Spec.GitOps.Schedule = argsString[1]
-			if err := processSetSingleArg(arg, qliksenseCR); err != nil {
+			api.LogDebugMessage("Current gitOps schedule is : %s ", qliksenseCR.Spec.GitOps.Schedule)
-				return err
+		case "gitops.watchbranch":
+			if qliksenseCR.Spec.GitOps == nil {
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
 			}
-		}
+			qliksenseCR.Spec.GitOps.WatchBranch = argsString[1]
-		fmt.Println(chalk.Green.Color("Successfully added to Custom Resource Spec"))
+			api.LogDebugMessage("Current gitOps watchbranch is : %s ", qliksenseCR.Spec.GitOps.WatchBranch)
-	}
+		case "gitops.image":
-
+			if qliksenseCR.Spec.GitOps == nil {
-	// write modified content into context.yaml
+				qliksenseCR.Spec.GitOps = &config.GitOps{}
-	return qConfig.WriteCR(qliksenseCR)
-}
-
-func processSetSingleArg(arg string, cr *api.QliksenseCR) error {
-	nv := strings.Split(arg, "=")
-	switch nv[0] {
-	case "manifestsRoot":
-		cr.Spec.ManifestsRoot = nv[1]
-	case "profile":
-		cr.Spec.Profile = nv[1]
-	case "storageClassName":
-		cr.Spec.StorageClassName = nv[1]
-	case "rotateKeys":
-		valid := false
-		for _, v := range []string{"yes", "no", "None"} {
-			if nv[1] == v {
-				valid = true
 			}
-		}
+			qliksenseCR.Spec.GitOps.Image = argsString[1]
-		if !valid {
+			api.LogDebugMessage("Current gitOps watchbranch is : %s ", qliksenseCR.Spec.GitOps.Image)
-			return errors.New("please povide rotateKeys=yes|no|None")
+		default:
-		}
+			err := fmt.Errorf("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot or git.repository arguments to configure the current context")
-		cr.Spec.RotateKeys = nv[1]
+			log.Println(err)
-	default:
-		return errors.New("Please enter one of: profile, storageClassName,rotateKeys, manifestRoot to configure the current context")
-	}
-	return nil
-}
-
-func (q *Qliksense) processSetFetchSource(arg string, cr *api.QliksenseCR) error {
-	args := strings.Split(arg, "=")
-	subs := strings.Split(args[0], ".")
-	if cr.Spec.FetchSource == nil {
-		cr.Spec.FetchSource = &config.Repo{}
-	}
-	switch subs[1] {
-	case "repository":
-		cr.Spec.FetchSource.Repository = args[1]
-	case "accessToken":
-		qConfig := api.NewQConfig(q.QliksenseHome)
-		key, err := qConfig.GetEncryptionKeyFor(cr.GetName())
-		if err != nil {
 			return err
 		}
-		return cr.SetFetchAccessToken(args[1], key)
-	case "secretName":
-		cr.Spec.FetchSource.SecretName = args[1]
-	case "userName":
-		cr.Spec.FetchSource.UserName = args[1]
-	default:
-		return errors.New(arg + " does not match any cr spec")
 	}
-	return nil
+	// write modified content into context.yaml
-}
+	api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
 
-func (q *Qliksense) processSetGit(arg string, cr *api.QliksenseCR) error {
-	args := strings.Split(arg, "=")
-	subs := strings.Split(args[0], ".")
-	if cr.Spec.Git == nil {
-		cr.Spec.Git = &config.Repo{}
-	}
-	switch subs[1] {
-	case "repository":
-		cr.Spec.Git.Repository = args[1]
-	case "accessToken":
-		cr.Spec.Git.AccessToken = args[1]
-	case "secretName":
-		cr.Spec.Git.SecretName = args[1]
-	case "userName":
-		cr.Spec.Git.UserName = args[1]
-	default:
-		return errors.New(arg + " does not match any cr spec")
-	}
-	return nil
-}
-
-func (q *Qliksense) processSetGitOps(arg string, cr *api.QliksenseCR) error {
-	args := strings.Split(arg, "=")
-	subs := strings.Split(args[0], ".")
-	if cr.Spec.Git == nil {
-		cr.Spec.GitOps = &config.GitOps{}
-	}
-	switch subs[1] {
-	case "enabled":
-		if args[1] != "yes" && args[1] != "no" {
-			return errors.New("Please use yes or no for key enabled")
-		}
-		cr.Spec.GitOps.Enabled = args[1]
-	case "schedule":
-		if _, err := cron.ParseStandard(args[1]); err != nil {
-			return errors.New("Please enter string with standard cron scheduling syntax ")
-		}
-		cr.Spec.GitOps.Schedule = args[1]
-	case "watchBranch":
-		cr.Spec.GitOps.WatchBranch = args[1]
-	case "image":
-		cr.Spec.GitOps.Image = args[1]
-	default:
-		return errors.New(arg + " does not match any cr spec")
-	}
 	return nil
 }
 
 // SetContextConfig - set the context for qliksense kubernetes resources to live in
 func (q *Qliksense) SetContextConfig(args []string) error {
 	if len(args) == 1 {
-		err := q.SetUpQliksenseContext(args[0])
+		err := q.SetUpQliksenseContext(args[0], false)
 		if err != nil {
 			return err
 		}
@@ -392,7 +297,7 @@ func (q *Qliksense) ListContextConfigs() error {
 	w.Flush()
 	if len(qliksenseConfig.Spec.Contexts) > 0 {
 		for _, cont := range qliksenseConfig.Spec.Contexts {
-			fmt.Fprintln(w, cont.Name, "\t", qliksenseConfig.GetCRFilePath(cont.Name), "\t")
+			fmt.Fprintln(w, cont.Name, "\t", cont.CrFile, "\t")
 		}
 		w.Flush()
 		fmt.Fprintln(out, "")
@@ -465,17 +370,11 @@ func (q *Qliksense) DeleteContextConfig(args []string) error {
 
 // SetUpQliksenseDefaultContext - to setup dir structure for default qliksense context
 func (q *Qliksense) SetUpQliksenseDefaultContext() error {
-	if api.FileExists(filepath.Join(q.QliksenseHome, "config.yaml")) {
+	return q.SetUpQliksenseContext(DefaultQliksenseContext, true)
-		qliksenseConfig := api.NewQConfig(q.QliksenseHome)
-		if qliksenseConfig.IsContextExist(DefaultQliksenseContext) {
-			return nil
-		}
-	}
-	return q.SetUpQliksenseContext(DefaultQliksenseContext)
 }
 
 // SetUpQliksenseContext - to setup qliksense context
-func (q *Qliksense) SetUpQliksenseContext(contextName string) error {
+func (q *Qliksense) SetUpQliksenseContext(contextName string, isDefaultContext bool) error {
 	if contextName == "" {
 		err := fmt.Errorf("Please enter a non-empty context-name")
 		log.Println(err)
@@ -489,30 +388,83 @@ func (q *Qliksense) SetUpQliksenseContext(contextName string) error {
 	}
 
 	qliksenseConfigFile := filepath.Join(q.QliksenseHome, QliksenseConfigFile)
-	qliksenseConfig := api.NewQConfigEmpty(q.QliksenseHome)
+	var qliksenseConfig api.QliksenseConfig
+	configFileTrack := false
 
 	if !api.FileExists(qliksenseConfigFile) {
 		qliksenseConfig.AddBaseQliksenseConfigs(contextName)
 	} else {
-		if err := api.ReadFromFile(qliksenseConfig, qliksenseConfigFile); err != nil {
+		if err := api.ReadFromFile(&qliksenseConfig, qliksenseConfigFile); err != nil {
+			log.Println(err)
+			return err
+		}
+		if isDefaultContext { // if config file exits but a default context is requested, we want to prevent writing to config file
+			configFileTrack = true
+		}
+	}
+	// creating a file in the name of the context if it does not exist/ opening it to append/modify content if it already exists
+
+	qliksenseContextsDir1 := filepath.Join(q.QliksenseHome, QliksenseContextsDir)
+	if !api.DirExists(qliksenseContextsDir1) {
+		if err := os.Mkdir(qliksenseContextsDir1, os.ModePerm); err != nil {
+			err = fmt.Errorf("Not able to create %s dir: %v", qliksenseContextsDir1, err)
 			log.Println(err)
 			return err
 		}
 	}
+	api.LogDebugMessage("%s exists", qliksenseContextsDir1)
 
-	if qliksenseConfig.IsContextExist(contextName) {
+	// creating contexts/qlik-default/qlik-default.yaml file
-		qliksenseConfig.Spec.CurrentContext = contextName
+	qliksenseContextFile := filepath.Join(qliksenseContextsDir1, contextName, contextName+".yaml")
-		return qliksenseConfig.Write()
+	//var qliksenseCR api.QliksenseCR
+
+	defaultContextsDir := filepath.Join(qliksenseContextsDir1, contextName)
+	if !api.DirExists(defaultContextsDir) {
+		if err := os.Mkdir(defaultContextsDir, os.ModePerm); err != nil {
+			err = fmt.Errorf("Not able to create %s: %v", defaultContextsDir, err)
+			log.Println(err)
+			return err
+		}
+	}
+	api.LogDebugMessage("%s exists", defaultContextsDir)
+	if !api.FileExists(qliksenseContextFile) {
+		qliksenseCR := &api.QliksenseCR{}
+		qliksenseCR.AddCommonConfig(contextName)
+		api.WriteToFile(&qliksenseCR, qliksenseContextFile)
+		api.LogDebugMessage("Added Context: %s", contextName)
+	}
+	// else {
+	// 	if err := api.ReadFromFile(&qliksenseCR, qliksenseContextFile); err != nil {
+	// 		log.Println(err)
+	// 		return err
+	// 	}
+	// }
+
+	//api.WriteToFile(&qliksenseCR, qliksenseContextFile)
+	ctxTrack := false
+	if len(qliksenseConfig.Spec.Contexts) > 0 {
+		for _, ctx := range qliksenseConfig.Spec.Contexts {
+			if ctx.Name == contextName {
+				ctx.CrFile = qliksenseContextFile
+				ctxTrack = true
+				break
+			}
+		}
+	}
+	if !ctxTrack {
+		qliksenseConfig.Spec.Contexts = append(qliksenseConfig.Spec.Contexts, api.Context{
+			Name:   contextName,
+			CrFile: qliksenseContextFile,
+		})
 	}
-	qliksenseCR := &api.QliksenseCR{}
-	qliksenseCR.AddCommonConfig(contextName)
 	qliksenseConfig.Spec.CurrentContext = contextName
-	if err := qliksenseConfig.CreateOrWriteCrAndContext(qliksenseCR); err != nil {
+	if !configFileTrack {
-		return err
+		api.WriteToFile(&qliksenseConfig, qliksenseConfigFile)
 	}
-
 	// set the encrypted default mongo
-	return q.SetSecrets([]string{`qliksense.mongoDbUri="mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"`}, false, false)
+	q.SetSecrets([]string{`qliksense.mongoDbUri="mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"`}, false)
+
+	return nil
 }
 
 func validateInput(input string) (string, error) {
@@ -533,8 +485,7 @@ func validateInput(input string) (string, error) {
 	return input, err
 }
 
-// PrepareK8sSecret targetFile contains base64 encoded value of encrypted value.
+// PrepareK8sSecret decodes and decrypts the secret value in the secret.yaml file and returns a B64encoded string
-// this method decodes and decrypts the secret value in the secret.yaml file and returns a B64encoded string
 func (q *Qliksense) PrepareK8sSecret(targetFile string) (string, error) {
 	// check if targetFile exists
 	if !api.FileExists(targetFile) {
@@ -543,7 +494,7 @@ func (q *Qliksense) PrepareK8sSecret(targetFile string) (string, error) {
 		return "", err
 	}
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	encryptionKey, err := qConfig.GetEncryptionKeyForCurrent()
+	_, rsaPrivateKey, err := qConfig.GetCurrentContextEncryptionKeyPair()
 	if err != nil {
 		return "", err
 	}
@@ -561,13 +512,17 @@ func (q *Qliksense) PrepareK8sSecret(targetFile string) (string, error) {
 	dataMap := k8sSecret1.Data
 	var resultMap = make(map[string][]byte)
 	for k, v := range dataMap {
-		//k8s secrets has already base64 decoed value
+		ba, err := b64.StdEncoding.DecodeString(string(v))
-		decryptedString, err := api.DecryptData(v, encryptionKey)
+		if err != nil {
+			err := fmt.Errorf("Not able to decode message: %v", err)
+			return "", err
+		}
+		decryptedString, err := api.Decrypt(ba, rsaPrivateKey)
 		if err != nil {
 			err := fmt.Errorf("Not able to decrypt message: %v", err)
 			return "", err
 		}
-		resultMap[k] = []byte(decryptedString)
+		resultMap[k] = decryptedString
 	}
 
 	// putting the above map back into the k8sSecret struct
@@ -591,7 +546,7 @@ func readTargetfile(targetFile string) ([]byte, error) {
 
 func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullUsername, pullPassword string) error {
 	qConfig := api.NewQConfig(q.QliksenseHome)
-	qliksenseCR, err := qConfig.GetCurrentCR()
+	qliksenseCR, qliksenseContextsFile, err := retrieveCurrentContextInfo(q)
 	if err != nil {
 		return err
 	}
@@ -618,18 +573,5 @@ func (q *Qliksense) SetImageRegistry(registry, pushUsername, pushPassword, pullU
 	}
 
 	qliksenseCR.Spec.AddToConfigs("qliksense", imageRegistryConfigKey, registry)
-	return qConfig.WriteCR(qliksenseCR)
+	return api.WriteToFile(&qliksenseCR, qliksenseContextsFile)
-}
-
-func (q *Qliksense) SetEulaAccepted() error {
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	if !qcr.IsEULA() {
-		qcr.SetEULA("yes")
-		return qConfig.WriteCurrentContextCR(qcr)
-	}
-	return nil
 }

pkg/qliksense/context_configs_test.go

@@ -35,40 +35,123 @@ metadata:
   name: testctx-qliksense-senseinstaller
 type: Opaque
 `
+var encText = "SFpVZ2t5SGsrN2lLQjlTYm9rbFUxSDFRcmVYdUxhTW9MUHlQOGtGditxMEcwZTlIZDl1dVRrV0tEYm5qUURSWFp3dStuNklueGk3anI2c1djSVdsbWlKTHdWQUJwdUg0a1NXd3llMUlMa2oxK3FRSFlMM2dQUExvN1pBYkVDeDROMUVvam12M0t0NmQwbkdhSXlWWEpmWWJUVVFDM1Y4L0ZTVXBVN0JUb0l4OVZWdmlPam5HTHk4RlF2a3RUaHJxWTUvZEh2N3pVUmhiOTc2Q2YwbEovZ3I2L2NwRk9RMUFXVXdodVhrTG9lYjVzNFdtTEZzNldqT3k0bWlKM1J6VllLaWVUSFJ2SE85eDB6dUthanRwSGEzWEZkaE5QNnpySVJJNTRFalUyblVYYUNlYXVnWnZEOUxjdWluOFhFcjExbkFINURCUDAycXhoZk5BejVoMlV2eFNWVmR0aW1QTDBhMVBJTUxGQTgyWUkrQkFOQkhkSUNnZGU5SkxIRFBoTzR6c0llaE1LRmhVQkNoOUhQa3kyRnhTeDJ3YWp3M1UycEsvcFJVZUxDazRUbkhmL25LN3h5ekdpV3dSUFFFZHdsWE5JbUhjVlVPV3gvNWh4WlJCUTZtb3pGYk1HbXR1Mkh5Z3RVV2gzNFYzd1BhS01TNFRsa0hyODFjRjVCWVpxenBFK1pKWnVyLy8zbzJsU0tFMjMxTG1pcGk1K0FqbXZvUVcyWHBocjFNVWJQY1pXUkJFRkkyQXBCM0FhQXFPa0k1MkRqNG43Mko5bCtaMzdydTk1aHk5K1lzY0FxMjZVbExYRlc0S3RUUkRLSjlMNnVmdlIrUUNudER3em5UTFRHUnEwZU5COWt6S0Q4MFlUdXozeHNXK3cxdjlHbDJaMnBZMTZWTCtEV1k9"
 var decText = "mongodb://qlik-default-mongodb:27017/qliksense?ssl=false"
 
-func setupTargetFileAndPrivateKey() (string, string, error) {
+func setupTargetFileAndPrivateKey() ([]byte, []byte, string, error) {
+	targetFileString := fmt.Sprintf(targetFileStringTemplate, encText)
+	privKeyBytes := []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIIJJwIBAAKCAgEApFf3qCQhAr2QLRRZdhLyB8exLjrQiXLr8hwDe0xHSLJX3w7v
+5z4ujJWrHUulQ2/hvS8uffxMVrp2YqeA4sjy/ku1KqZVQv/WNTdL2v9Z1ewbRnBj
+DQvmkWDKZ+cP8VPdHGzQ4iM2z6BZ4RQTkdQMKqsVwUsLO9amI2TOny/M696eFRW0
+pk4+W3QZZRawT0HqJPvKKXKqoO2+62W54rOV8glJi29Do06e4S6CZUl1hBUy0VlL
+trLlRSOHTois0dF2a9f7+GGgU11MHO6w1k1NesSlfZ0vnrrkW8WFLqewk+Jj+w1x
+eQnYHOeHjx6zi9f9DC96eSylSB3iJ71NmXcMc0IEZ2LiQIqTL83BLOgMBCsK3FSl
+GMakQUR2GJ+M0I/selYkRMhid6eOmhlsTNMPbpcTHxZ+ReIzS+5B1X0FZ7RIL+jS
+L9mFcxmD3dxurrrt/DkLpXcuWdi1s1bpVn3jIQhU0+bgA6hT0k8Kj2f3Q9QnvkHS
+Eff+XyLvLwQeSsSAcnM+1I7fNSPEo2cq0au6ZtjHcirXmMminAQ6cKW1XrEvJBef
+HHibtjJjIM4bHH7MKRA5H3km/J4CCwI1VogSTcE05Z6ypAFU2TCrnec9c9VXkRDP
+94h0GuoG8sdhmQudqvghr/8T7CV+sGRQbdeqrXwanfnGPrjcMVIO/dSOxOUCAwEA
+AQKCAgA5b2TmJnpC8u0IVCxPz582iNurRHLNFpTPMGsnFCl1hp6fHiFJt7mc+FGt
+E1rWjqtd6rdc4Gfth40IPXIV0BTcOqk+FpOFrtO2FXU1PDixQqrlmzGCxb324NTc
+KyyvMpf77yuxXI0zUt8WgmW0eV8nKlOYEhoC96lohTqQ96uuY0bsJ4HS/VVdsN2P
+Lra/fFHQSw8EHUb0pyIqMoscZ5bn18cUK/Z/hGKSYCbCL0Iavy3bbFHBsBPgbeJD
+2BBN4953Iiy1Sak2eUy4b9LtkmaZmVAc7mpOFxLn38gD3icgB+bZPoGBw6b7sw71
+Pc2R+hI9x/oNj0TUR11adhZApBJ9RhBbnSCUt8OUt9U5prNj+9qs8cHJGywtz1da
+ZT1M6mn2MFSsaOyOlJPzGUzSf4AhI7HiouDpLHtHDqLmc8Vv4rZUqrcFw6kZTCY5
+564yE8hh/UimOgQr7467/hADHZ0kBsupFEDWRqQ3qTIikHmGhTYZehDrSGL/3BMG
+rvsFdv0krUHyW4FfHqPN09jfP3LTqd5vVbzRhxcGsoGmP/1kXIDtO8Cp1s/K6Mse
+tInRCRla8ttZ3CZZ+Vf8HLi/n8XSRfbnMGYi7lVVxnp6kNsTEBgosbdU/r1zbMRJ
+8mMMHygyugaRLHmOD/8fkWLfyR88cxPH8u9NufTfvJgiFpZboQKCAQEA0uSU6IGZ
+pXIVZdmDWt4mxpS5T2UYarw3V9z/Isd3kkUU5YrC2XrvPRwmx5Jh9GXl9WENYJAR
+wH7PaJT0HpBwpxJa1RqHHDSka7DnDcy44oRXyM7e2AmcW8QvcDty/0HPo4oZq4IT
+m/+ot1R+bIpmJOweGRhVauzxJEUlQyt+kiH/ad8GiOS6LwqFPq42alnUxPQ106wF
+EZZ2WQdzkyV6tF9aMG18AT1fJsGwNjCLRxJ52t/aEUP5mYwlL2UTT5Acn8KbtrTO
+fFLAxGuB9LDdT1tGgIpzsXmxAaaeuPvSK4TDFdQyLAUdQJdz0GD9j9ciMPQH3UPe
+Vjt6qtpfY6QK2wKCAQEAx36Vys5BlQI0TG6qORI0fiOYpLG1GqmdbCNRgBUsMj5T
+LFe7uSd4qnDvGmns4MdkSSOlpF17bQiWhWKbjKRQpT0U/46zcIT4pWyajXJe+i9H
+M/DpSRkMq2kGkx6KX2u9L66QBzcxJjtS17amdSpDAfsrvJgOWkxxInzw9n1u6aTe
+ZjRDXdVX0KjPebEPOaoJToxne21Od3t+47TnDsQPsO1dvvrXX76IfH8cAlD5+0C/
+b2YvDqWDmh9ICjKShwuDWgi4KjCV5PMHCIxH0FQ2L6mSbwIb9YgGin3wjN3KbWqz
+dgEu7MeDxEwxZSSg4OstYVLQVgM39G/2ZA4YVJEbPwKCAQAo9FjymhBzb6c2Izp+
+D/wpvkIKaBCI0cpRlso5P9E5p466UOsr/tKs5GWnhgbdxlgVAebuJKw93KJ8pciO
+kvA9kbPwBHnOgW6Ytz73kBUrcBX4GixueddSftPTkMfxSB+Bm9UGWHlkZw6lo5P1
+kh7p9qyVpQMZg7AEoiTtWWn4CQAn2DbVqM17Syi7Fmvc1VsbcG1vkM1fMAAFpAvO
+vI2Kr6W9F9XoC7oJtb15mI3DnJPrbGNVzQSQzAWAoblRTyQv5kQFBDHBNPTYcCRJ
+l3sy6P/VAI4dHgvAzVGvjL+w0dRszct8fvXCUGceRWeYYmfyZ8GLN53a0ywsN8Ik
+gHvXAoIBACee5HEa9bt6bJihgf1DuFk1CKPtB2L8PN+1RAKEMfrolexAoG/tfvGa
+7GH6l6ks8KX2BnfWeST2h66GHw6Xs8ydjQYUeV7nidqQ70EYbfSSXznZpvt1liaU
+/VFKx4CcDT7jFIfaVlCZh6KADB9I/XXvRIh4SqF0fSO0XMcXsmeE7watapPAQ2iV
+nl804yk4tBB9oi/JTcQ9Kr5et2UfW15wRiYf+5ZwaPsQ46cyHfPgsCSXztDB3plF
+jTE5ShC4IKZJBQqcC6kk+0ifU8P0da6RpxuU96iUE3h9+sB/bCy+/FV7dq5gEbNy
+znygAbOqAaFKqUXr7bkGY5ELm5lwGFECggEACcyaF9mMqLGghR55ew+cMmdeYdK3
+meMLi5nrgtbQpVLlz+IV7Vdmrv7lZjeTr4nvU/5miU+p+If14CCFBiSucGq3Kmyp
+OSM5cNCjDhw8uIDfY2qWCrZ2NSMR3qaAoBAQyQ2ER1IL98TDF/Qui0ZatbPiM4Ns
+GErhkBZh3MCDSt24yiVKcUB79BxatWB4K7h7y8wqpX4Rj7rpfJMF7wz/I1cgyuCE
+7XFpRwj7F1B2MmXnvV3KAgAD0EqrJDLeM0vIlDhpOUEaFUkuqmQyeB8qQkWfyXbD
+jzloS3cNq0MBijB8oixwD2b4dVhBM7z8vQMX6OntN+97luWgO8OIukoYAg==
+-----END RSA PRIVATE KEY-----
+`)
 
-	secretKeyLocation := filepath.Join(testDir, secrets, contexts, qlikDefaultContext, secrets)
+	publicKeyBytes := []byte(`-----BEGIN RSA PUBLIC KEY-----
-	if err := os.MkdirAll(secretKeyLocation, 0777); err != nil {
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApFf3qCQhAr2QLRRZdhLy
+B8exLjrQiXLr8hwDe0xHSLJX3w7v5z4ujJWrHUulQ2/hvS8uffxMVrp2YqeA4sjy
+/ku1KqZVQv/WNTdL2v9Z1ewbRnBjDQvmkWDKZ+cP8VPdHGzQ4iM2z6BZ4RQTkdQM
+KqsVwUsLO9amI2TOny/M696eFRW0pk4+W3QZZRawT0HqJPvKKXKqoO2+62W54rOV
+8glJi29Do06e4S6CZUl1hBUy0VlLtrLlRSOHTois0dF2a9f7+GGgU11MHO6w1k1N
+esSlfZ0vnrrkW8WFLqewk+Jj+w1xeQnYHOeHjx6zi9f9DC96eSylSB3iJ71NmXcM
+c0IEZ2LiQIqTL83BLOgMBCsK3FSlGMakQUR2GJ+M0I/selYkRMhid6eOmhlsTNMP
+bpcTHxZ+ReIzS+5B1X0FZ7RIL+jSL9mFcxmD3dxurrrt/DkLpXcuWdi1s1bpVn3j
+IQhU0+bgA6hT0k8Kj2f3Q9QnvkHSEff+XyLvLwQeSsSAcnM+1I7fNSPEo2cq0au6
+ZtjHcirXmMminAQ6cKW1XrEvJBefHHibtjJjIM4bHH7MKRA5H3km/J4CCwI1VogS
+TcE05Z6ypAFU2TCrnec9c9VXkRDP94h0GuoG8sdhmQudqvghr/8T7CV+sGRQbdeq
+rXwanfnGPrjcMVIO/dSOxOUCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+`)
+
+	targetFile := filepath.Join(testDir, "targetfile.yaml")
+	// tests/config.yaml exists
+	err := ioutil.WriteFile(targetFile, []byte(targetFileString), 0777)
+	if err != nil {
+		log.Printf("Error while creating file: %v", err)
+		return nil, nil, "", err
+	}
+
+	secretKeyPairDir := filepath.Join(testDir, secrets, contexts, qlikDefaultContext, secrets)
+	if err := os.MkdirAll(secretKeyPairDir, 0777); err != nil {
 		err = fmt.Errorf("Not able to create directories")
 		log.Fatal(err)
 	}
-	os.Setenv("QLIKSENSE_KEY_LOCATION", secretKeyLocation)
+	os.Setenv("QLIKSENSE_KEY_LOCATION", secretKeyPairDir)
 
-	//privKeyFile := filepath.Join(secretKeyLocation, "user_secret_key")
+	privKeyFile := filepath.Join(secretKeyPairDir, "qliksensePriv")
-	key, err := api.LoadSecretKey(secretKeyLocation)
+	// construct and write priv key file into secretsDir location
-	if key == "" {
+	err = ioutil.WriteFile(privKeyFile, privKeyBytes, 0777)
-		key, err = api.GenerateAndStoreSecretKey(secretKeyLocation)
-	}
-	encData, _ := api.EncryptData([]byte(decText), key)
-	encText := b64.StdEncoding.EncodeToString(encData)
-
-	targetFileString := fmt.Sprintf(targetFileStringTemplate, encText)
-	targetFile := filepath.Join(testDir, "targetfile.yaml")
-	// tests/config.yaml exists
-	err = ioutil.WriteFile(targetFile, []byte(targetFileString), 0777)
 	if err != nil {
 		log.Printf("Error while creating file: %v", err)
-		return "", "", err
+		return nil, nil, "", err
 	}
+	pubKeyFile := filepath.Join(secretKeyPairDir, "qliksensePub")
+	api.LogDebugMessage("Test setup - \npub key path: %s\n, priv key path: %s\n", pubKeyFile, privKeyFile)
+	// construct and write pub key file into secretsDir location
+	err = ioutil.WriteFile(pubKeyFile, publicKeyBytes, 0777)
+	if err != nil {
+		log.Printf("Error while creating file: %v", err)
+		return nil, nil, "", err
+	}
+	return publicKeyBytes, privKeyBytes, targetFile, nil
+}
 
-	return targetFile, key, err
+func removePrivateKey() {
+	err := os.Remove(filepath.Join(testDir, secrets, contexts, qlikDefaultContext, secrets, "qliksensePriv"))
+	if err != nil {
+		log.Fatalf("Could not delete private key %v", err)
+	}
+	return
 }
 
 func setup() func() {
 	// create tests dir
-	os.RemoveAll(testDir)
 	if err := os.Mkdir(testDir, 0777); err != nil {
 		log.Printf("\nError occurred: %v", err)
 	}
@@ -81,7 +164,7 @@ metadata:
 spec:
   contexts:
   - name: qlik-default
-    crFile: contexts/qlik-default/qlik-default.yaml
+    crFile: /root/.qliksense/contexts/qlik-default.yaml
   currentContext: qlik-default
 `
 	configFile := filepath.Join(testDir, "config.yaml")
@@ -140,8 +223,7 @@ func Test_retrieveCurrentContextInfo(t *testing.T) {
 	q := &Qliksense{
 		QliksenseHome: testDir,
 	}
-	qConfig := api.NewQConfig(q.QliksenseHome)
+	_, _, err := retrieveCurrentContextInfo(q)
-	_, err := qConfig.GetCurrentCR()
 	if err != nil {
 		t.FailNow()
 	}
@@ -192,7 +274,7 @@ func TestSetUpQliksenseContext(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			q := New(tt.args.qlikSenseHome)
-			if err := q.SetUpQliksenseContext(tt.args.contextName); (err != nil) != tt.wantErr {
+			if err := q.SetUpQliksenseContext(tt.args.contextName, tt.args.isDefaultContext); (err != nil) != tt.wantErr {
 				t.Errorf("SetUpQliksenseContext() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
@@ -244,7 +326,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs", "gitOps.enabled=yes", "gitOps.schedule=30 * * * *", "git.repository=master", "git.userName=foo", "git.accessToken=1234"},
+				args: []string{"profile=minikube", "rotateKeys=yes", "storageClassName=efs"},
 			},
 			wantErr: false,
 		},
@@ -254,7 +336,7 @@ func TestSetOtherConfigs(t *testing.T) {
 				q: &Qliksense{
 					QliksenseHome: testDir,
 				},
-				args: []string{"someconfig=somevalue, gitOps.schedule=bar", "gitOps.enabled=bar", "git.foo=bar", "rotateKeys=bar"},
+				args: []string{"someconfig=somevalue"},
 			},
 			wantErr: true,
 		},
@@ -305,7 +387,7 @@ func TestSetConfigs(t *testing.T) {
 	defer tearDown()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := tt.args.q.SetConfigs(tt.args.args, false); (err != nil) != tt.wantErr {
+			if err := tt.args.q.SetConfigs(tt.args.args); (err != nil) != tt.wantErr {
 				t.Errorf("SetConfigs() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
@@ -314,7 +396,7 @@ func TestSetConfigs(t *testing.T) {
 
 func TestSetImageRegistry(t *testing.T) {
 	getQlikSense := func(tmpQlikSenseHome string) (*Qliksense, error) {
-		if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(`
+		if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(fmt.Sprintf(`
 apiVersion: config.qlik.com/v1
 kind: QliksenseConfig
 metadata:
@@ -322,9 +404,9 @@ metadata:
 spec:
   contexts:
   - name: qlik-default
-    crFile: contexts/qlik-default/qlik-default.yaml
+    crFile: %s/contexts/qlik-default/qlik-default.yaml
   currentContext: qlik-default
-`), os.ModePerm); err != nil {
+`, tmpQlikSenseHome)), os.ModePerm); err != nil {
 			return nil, err
 		}
 
@@ -424,14 +506,9 @@ spec:
 		})
 	}
 }
-func removePrivateKey() {
+
-	err := os.Remove(filepath.Join(testDir, secrets, contexts, qlikDefaultContext, secrets, "user_secret_key"))
-	if err != nil {
-		log.Fatalf("Could not delete private key %v", err)
-	}
-	return
-}
 func Test_PrepareK8sSecret(t *testing.T) {
+
 	type fields struct {
 		QliksenseHome string
 	}
@@ -451,7 +528,7 @@ func Test_PrepareK8sSecret(t *testing.T) {
 			wantErr: false,
 			setup: func() (string, func()) {
 				tearDown := setup()
-				targetFile, _, _ := setupTargetFileAndPrivateKey()
+				_, _, targetFile, _ := setupTargetFileAndPrivateKey()
 				return targetFile, tearDown
 			},
 		},
@@ -464,7 +541,7 @@ func Test_PrepareK8sSecret(t *testing.T) {
 			wantErr: true,
 			setup: func() (string, func()) {
 				tearDown := setup()
-				targetFile, _, _ := setupTargetFileAndPrivateKey()
+				_, _, targetFile, _ := setupTargetFileAndPrivateKey()
 				removePrivateKey()
 				return targetFile, tearDown
 			},
@@ -478,7 +555,8 @@ func Test_PrepareK8sSecret(t *testing.T) {
 			wantErr: true,
 			setup: func() (string, func()) {
 				tearDown := setup()
-				setupTargetFileAndPrivateKey()
+				_, _, _, _ = setupTargetFileAndPrivateKey()
+				removePrivateKey()
 				return "", tearDown
 			},
 		},
@@ -558,7 +636,6 @@ func Test_SetSecrets(t *testing.T) {
 	type args struct {
 		args        []string
 		isSecretSet bool
-		base64      bool
 	}
 	tests := []struct {
 		name    string
@@ -577,18 +654,6 @@ func Test_SetSecrets(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "valid secret secrets=false base64 encoded",
-			fields: fields{
-				QliksenseHome: testDir,
-			},
-			args: args{
-				args:        []string{"qliksense.mongoDbUri=bW9uZ29kYjovL3FsaWstZGVmYXVsdC1tb25nb2RiOjI3MDE3L3FsaWtzZW5zZT9zc2w9ZmFsc2U="},
-				isSecretSet: false,
-				base64:      true,
-			},
-			wantErr: false,
-		},
 		{
 			name: "test1 valid secret secrets=true",
 			fields: fields{
@@ -624,17 +689,22 @@ func Test_SetSecrets(t *testing.T) {
 		},
 	}
 	tearDown := setup()
-	_, encryptionKey, err := setupTargetFileAndPrivateKey()
+	_, privateKeyBytes, _, err := setupTargetFileAndPrivateKey()
 	if err != nil {
 		t.FailNow()
 	}
 	defer tearDown()
+
+	privKey, err := api.DecodeToPrivateKey(privateKeyBytes)
+	if err != nil {
+		t.FailNow()
+	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			q := &Qliksense{
 				QliksenseHome: tt.fields.QliksenseHome,
 			}
-			if err := q.SetSecrets(tt.args.args, tt.args.isSecretSet, tt.args.base64); (err != nil) != tt.wantErr {
+			if err := q.SetSecrets(tt.args.args, tt.args.isSecretSet); (err != nil) != tt.wantErr {
 				t.Errorf("SetSecrets() error = %v, wantErr %v", err, tt.wantErr)
 				t.FailNow()
 			}
@@ -645,10 +715,7 @@ func Test_SetSecrets(t *testing.T) {
 			// extract the value for testing
 			testValueArr := strings.SplitN(tt.args.args[0], "=", 2)
 			testValue := strings.ReplaceAll(testValueArr[1], "\"", "")
-			if tt.args.base64 {
+
-				d, _ := b64.StdEncoding.DecodeString(testValue)
-				testValue = strings.Trim(string(d), "\n ")
-			}
 			qliksenseCR, err := readCRFile()
 			if err != nil {
 				err = fmt.Errorf("Not able to read from context file: %v", err)
@@ -665,7 +732,13 @@ func Test_SetSecrets(t *testing.T) {
 							log.Printf("decode error: %v", err)
 							t.FailNow()
 						}
-						decryptedVal, err := api.DecryptData([]byte(valToBeEncrypted), encryptionKey)
+						decodedValue, err := b64.StdEncoding.DecodeString(valToBeEncrypted)
+						if err != nil {
+							err := fmt.Errorf("Error occurred while decoding: %v", err)
+							log.Printf("decode error: %v", err)
+							t.FailNow()
+						}
+						decryptedVal, err := api.Decrypt(decodedValue, privKey)
 						if err != nil {
 							err := fmt.Errorf("Error occurred while testing decryption: %v", err)
 							log.Printf("No Data in Secret: %v", err)
@@ -706,8 +779,7 @@ func getValueToBeDecodedForSetSecrets(item config.NameValue, qliksenseCR *api.Ql
 	}
 	// secret=false
 	if item.Value != "" {
-		b, err := b64.RawStdEncoding.DecodeString(item.Value)
+		return item.Value, nil
-		return string(b), err
 	}
 	err := fmt.Errorf("Both Value and ValueFrom are empty")
 	return "", err
@@ -726,11 +798,11 @@ metadata:
 spec:
   contexts:
   - name: qlik-default
-    crFile: contexts/qlik-default.yaml
+    crFile: /root/.qliksense/contexts/qlik-default.yaml
   - name: qlik1
-    crFile: contexts/qlik1.yaml
+    crFile: /root/.qliksense/contexts/qlik1.yaml
   - name: qlik2
-    crFile: contexts/qlik2.yaml
+    crFile: /root/.qliksense/contexts/qlik2.yaml
   currentContext: qlik1
 `
 	configFile := filepath.Join(testDir, "config.yaml")

pkg/qliksense/crds.go

@@ -2,7 +2,6 @@ package qliksense
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
@@ -20,24 +19,12 @@ func (q *Qliksense) ViewCrds(opts *CrdCommandOptions) error {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
-	engineCRD, err := getQliksenseInitCrd(qcr)
+	if engineCRD, err := getQliksenseInitCrd(qcr); err != nil {
-	if err != nil {
 		return err
-	}
+	} else if opts.All {
-	customCrd, err := getCustomCrd(qcr)
+		fmt.Printf("%s\n%s", q.GetOperatorCRDString(), engineCRD)
-	if err != nil {
+	} else {
-		return nil
+		fmt.Printf("%s", engineCRD)
-	}
-
-	fmt.Println(engineCRD)
-	if customCrd != "" {
-		fmt.Println("---")
-		fmt.Println(customCrd)
-	}
-
-	if opts.All {
-		fmt.Println("---")
-		fmt.Printf("%s", q.GetOperatorCRDString())
 	}
 	return nil
 }
@@ -56,14 +43,6 @@ func (q *Qliksense) InstallCrds(opts *CrdCommandOptions) error {
 	} else if err = qapi.KubectlApply(engineCRD, ""); err != nil {
 		return err
 	}
-	if customCrd, err := getCustomCrd(qcr); err != nil {
-		return err
-	} else if customCrd != "" {
-		if err = qapi.KubectlApply(customCrd, ""); err != nil {
-			return err
-		}
-	}
-
 	if opts.All { // install opeartor crd
 		if err := qapi.KubectlApply(q.GetOperatorCRDString(), ""); err != nil {
 			fmt.Println("cannot do kubectl apply on opeartor CRD", err)
@@ -80,33 +59,16 @@ func getQliksenseInitCrd(qcr *qapi.QliksenseCR) (string, error) {
 	if qcr.Spec.GetManifestsRoot() != "" {
 		repoPath = qcr.Spec.GetManifestsRoot()
 	} else {
-		if repoPath, err = DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master"); err != nil {
+		if repoPath, err = downloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master"); err != nil {
 			return "", err
 		}
 	}
 
 	qInitMsPath := filepath.Join(repoPath, Q_INIT_CRD_PATH)
-	if _, err := os.Lstat(qInitMsPath); err != nil {
+	qInitByte, err := executeKustomizeBuild(qInitMsPath)
-		// older version of qliksense-init used
-		qInitMsPath = filepath.Join(repoPath, "manifests/base/manifests/qliksense-init")
-	}
-	qInitByte, err := ExecuteKustomizeBuild(qInitMsPath)
 	if err != nil {
 		fmt.Println("cannot generate crds for qliksense-init", err)
 		return "", err
 	}
 	return string(qInitByte), nil
 }
-
-func getCustomCrd(qcr *qapi.QliksenseCR) (string, error) {
-	crdPath := qcr.GetCustomCrdsPath()
-	if crdPath == "" {
-		return "", nil
-	}
-	qInitByte, err := ExecuteKustomizeBuild(crdPath)
-	if err != nil {
-		fmt.Println("cannot generate custom crds", err)
-		return "", err
-	}
-	return string(qInitByte), nil
-}

pkg/qliksense/crds_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestGetQliksenseInitCrd(t *testing.T) {
-	someTmpRepoPath, err := DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
+	someTmpRepoPath, err := downloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

pkg/qliksense/docker.go

@@ -1,7 +1,6 @@
 package qliksense
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -28,31 +27,6 @@ const (
 	imageSharedBlobsDirName = "blobs"
 )
 
-func (q *Qliksense) PullImages(version, profile string) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if version != "" {
-		if !qConfig.IsRepoExistForCurrent(version) {
-			if err := q.FetchQK8s(version); err != nil {
-				return err
-			}
-		}
-	}
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	if !qcr.IsRepoExist() {
-		return errors.New("ManifestsRoot not found")
-	}
-	if profile != "" {
-		qcr.Spec.Profile = profile
-		if e := qConfig.WriteCR(qcr); e != nil {
-			return e
-		}
-	}
-	return q.PullImagesForCurrentCR()
-}
-
 // PullImages ...
 func (q *Qliksense) PullImagesForCurrentCR() error {
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
@@ -75,7 +49,7 @@ func (q *Qliksense) PullImagesForCurrentCR() error {
 	}
 
 	images := versionOut.Images
-	if err := q.appendAdditionalImages(&images, qcr); err != nil {
+	if err := q.appendOperatorImages(&images); err != nil {
 		return err
 	}
 
@@ -95,19 +69,6 @@ func (q *Qliksense) PullImagesForCurrentCR() error {
 	return nil
 }
 
-func (q *Qliksense) appendGitOpsImage(images *[]string, qcr *qapi.QliksenseCR) {
-	if qcr.Spec.GitOps != nil && qcr.Spec.GitOps.Image != "" {
-		*images = append(*images, qcr.Spec.GitOps.Image)
-	}
-}
-
-func (q *Qliksense) appendPreflightImages(images *[]string) {
-	pf := qapi.NewPreflightConfig(q.QliksenseHome)
-	for _, preflightImage := range pf.GetImageMap() {
-		*images = append(*images, preflightImage)
-	}
-}
-
 func (q *Qliksense) appendOperatorImages(images *[]string) error {
 	if operatorImages, err := getImageList([]byte(q.GetOperatorControllerString())); err != nil {
 		return err
@@ -188,7 +149,7 @@ func (q *Qliksense) PushImagesForCurrentCR() error {
 	}
 
 	images := versionOut.Images
-	if err := q.appendAdditionalImages(&images, qcr); err != nil {
+	if err := q.appendOperatorImages(&images); err != nil {
 		return err
 	}
 
@@ -209,15 +170,6 @@ func (q *Qliksense) PushImagesForCurrentCR() error {
 	return nil
 }
 
-func (q *Qliksense) appendAdditionalImages(images *[]string, qcr *qapi.QliksenseCR) error {
-	if err := q.appendOperatorImages(images); err != nil {
-		return err
-	}
-	q.appendGitOpsImage(images, qcr)
-	q.appendPreflightImages(images)
-	return nil
-}
-
 func pushImage(image, imagesDir string, dockerConfigJsonSecret *qapi.DockerConfigJsonSecret) error {
 	imageNameParts := getImageNameParts(image)
 	srcDir := filepath.Join(imagesDir, imageIndexDirName, imageNameParts.name, imageNameParts.tag)

pkg/qliksense/docker_test.go

@@ -68,9 +68,6 @@ const (
 )
 
 func Test_Pull_Push_ImagesForCurrentCR(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping pull/push tests in short mode")
-	}
 	var testCases = []struct {
 		name              string
 		registryAuth      bool
@@ -134,7 +131,7 @@ func Test_Pull_Push_ImagesForCurrentCR(t *testing.T) {
 			}
 			q := &Qliksense{
 				QliksenseHome: tmpQlikSenseHome,
-				CrdBox:        &packr.Box{},
+				CrdBox:        packr.New("crds", "./crds"),
 			}
 			var versionOut VersionOutput
 
@@ -173,88 +170,29 @@ func Test_Pull_Push_ImagesForCurrentCR(t *testing.T) {
 	}
 }
 
-func Test_appendAdditionalImages(t *testing.T) {
-	tmpQlikSenseHome, err := ioutil.TempDir("", "tmp-qlik-sense-home-")
-	if err != nil {
-		t.Fatalf("unexpected error creating tmp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpQlikSenseHome)
-
-	setupQliksenseTestDefaultContext(t, tmpQlikSenseHome, `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-spec:
-  gitOps:
-    image: some-gitops-image
-`)
-
-	q := &Qliksense{
-		QliksenseHome: tmpQlikSenseHome,
-		CrdBox:        packr.New("crds", "./crds"),
-	}
-
-	pf := api.NewPreflightConfig(q.QliksenseHome)
-	if err := pf.Initialize(); err != nil {
-		t.Fatalf("unexpected error initializing preflight: %v", err)
-	}
-
-	qConfig := api.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		t.Fatalf("unexpected error getting current CR: %v", err)
-	}
-
-	images := make([]string, 0)
-	if err := q.appendAdditionalImages(&images, qcr); err != nil {
-		t.Fatalf("unexpected error appending additional images: %v", err)
-	}
-
-	expectedNumberAdditionalImages := 5
-	if len(images) != expectedNumberAdditionalImages {
-		t.Fatalf("unexpected number of additional images: %v, expected: %v", len(images), expectedNumberAdditionalImages)
-	}
-
-	haveMatchingImage := func(test func(string) bool) bool {
-		for _, image := range images {
-			if test(image) {
-				return true
-			}
-		}
-		return false
-	}
-	if !haveMatchingImage(func(image string) bool {
-		return strings.Contains(image, "qlik-docker-oss.bintray.io/qliksense-operator:v")
-	}) {
-		t.Fatal("expected to find the operator image in the list, but it wasn't there")
-	}
-	if !haveMatchingImage(func(image string) bool {
-		return image == "some-gitops-image"
-	}) {
-		t.Fatal("expected to find the GitOps image in the list, but it wasn't there")
-	}
-	if !haveMatchingImage(func(image string) bool {
-		return image == "nginx"
-	}) {
-		t.Fatal("expected to find the nginx Preflight image in the list, but it wasn't there")
-	}
-	if !haveMatchingImage(func(image string) bool {
-		return image == "subfuzion/netcat"
-	}) {
-		t.Fatal("expected to find the netcat Preflight image in the list, but it wasn't there")
-	}
-	if !haveMatchingImage(func(image string) bool {
-		return image == "mongo"
-	}) {
-		t.Fatal("expected to find the mongo Preflight image in the list, but it wasn't there")
-	}
-}
-
 func setupQlikSenseHome(t *testing.T, tmpQlikSenseHome string, registry *testRegistryV2, clientAuth clientAuthType) error {
+	if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(fmt.Sprintf(`
+apiVersion: config.qlik.com/v1
+kind: QliksenseConfig
+metadata:
+  name: QliksenseConfigMetadata
+spec:
+  contexts:
+  - name: qlik-default
+    crFile: %s/contexts/qlik-default/qlik-default.yaml
+  currentContext: qlik-default
+`, tmpQlikSenseHome)), os.ModePerm); err != nil {
+		return err
+	}
+
+	defaultContextDir := path.Join(tmpQlikSenseHome, "contexts", "qlik-default")
+	if err := os.MkdirAll(defaultContextDir, os.ModePerm); err != nil {
+		return err
+	}
+
 	version := "foo"
-	manifestsRootDir := filepath.ToSlash(path.Join(tmpQlikSenseHome, "contexts", "qlik-default", "repo", version))
+	manifestsRootDir := fmt.Sprintf("%s/repo/%s", defaultContextDir, version)
-	cr := fmt.Sprintf(`
+	if err := ioutil.WriteFile(path.Join(defaultContextDir, "qlik-default.yaml"), []byte(fmt.Sprintf(`
 apiVersion: qlik.com/v1
 kind: Qliksense
 metadata:
@@ -270,8 +208,9 @@ spec:
   manifestsRoot: %s
   rotateKeys: "yes"
   releaseName: qlik-default
-`, version, registry.url, manifestsRootDir)
+`, version, registry.url, manifestsRootDir)), os.ModePerm); err != nil {
-	setupQliksenseTestDefaultContext(t, tmpQlikSenseHome, cr)
+		return err
+	}
 
 	if clientAuth == clientAuthProvided || clientAuth == clientAuthProvidedButIncorrect {
 		if registry.username == "" || clientAuth == clientAuthProvidedButIncorrect {

pkg/qliksense/fetch.go

@@ -1,28 +1,13 @@
 package qliksense
 
 import (
-	"bufio"
-	"errors"
 	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"strings"
 
+	"github.com/google/uuid"
 	kapis_git "github.com/qlik-oss/k-apis/pkg/git"
 	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-	"github.com/src-d/go-git/plumbing/transport"
-	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 )
 
-type FetchCommandOptions struct {
-	GitUrl      string
-	AccessToken string
-	Version     string
-	SecretName  string
-	Overwrite   bool
-}
-
 const (
 	QLIK_GIT_REPO = "https://github.com/qlik-oss/qliksense-k8s"
 )
@@ -32,125 +17,24 @@ func (q *Qliksense) FetchQK8s(version string) error {
 	return fetchAndUpdateCR(qConfig, version)
 }
 
-func (q *Qliksense) FetchK8sWithOpts(opts *FetchCommandOptions) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	cr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-	if opts.AccessToken != "" {
-		encKey, err := qConfig.GetEncryptionKeyFor(cr.GetName())
-		if err != nil {
-			return err
-		}
-		if err := cr.SetFetchAccessToken(opts.AccessToken, encKey); err != nil {
-			return err
-		}
-	}
-	if opts.SecretName != "" {
-		cr.SetFetchAccessSecretName(opts.SecretName)
-	}
-	if opts.GitUrl != "" {
-		cr.SetFetchUrl(opts.GitUrl)
-	}
-	v := getVersion(opts, cr)
-	if v == "" {
-		return errors.New("Cannot find gitref/tag/branch/version to fetch")
-	}
-	if qConfig.IsRepoExistForCurrent(v) {
-		if opts.Overwrite || getVerionsOverwriteConfirmation(v) == "y" {
-			if err := qConfig.DeleteRepoForCurrent(v); err != nil {
-				return err
-			}
-		} else {
-			// nothing to do
-			return nil
-		}
-	}
-	qConfig.WriteCR(cr)
-	return fetchAndUpdateCR(qConfig, v)
-}
-
-// fetchAndUpdateCR fetch
 func fetchAndUpdateCR(qConfig *qapi.QliksenseConfig, version string) error {
 	qcr, err := qConfig.GetCurrentCR()
 	if err != nil {
 		fmt.Println("cannot get the current-context cr", err)
 		return err
 	}
-	if version == "" {
+	if qConfig.IsRepoExistForCurrent(version) {
-		if qcr.GetLabelFromCr("version") == "" {
-			return errors.New("Cannot find gitref/tag/branch/version to fetch")
-		}
-		version = qcr.GetLabelFromCr("version")
-	}
-	encKey, err := qConfig.GetEncryptionKeyFor(qcr.GetName())
-	if err != nil {
-		return err
-	}
-	// downlaod to temp first
-	tempDest, err := fetchToTempDir(qcr.GetFetchUrl(), version, qcr.GetFetchAccessToken(encKey))
-	if err != nil {
-		return err
-	}
-
-	destDir := qConfig.BuildRepoPath(version)
-	fmt.Printf("fetching version [%s] from %s\n", version, qcr.GetFetchUrl())
-	if err := qapi.CopyDirectory(tempDest, destDir); err != nil {
 		return nil
 	}
+	destDir := qConfig.BuildRepoPath(version)
+	fmt.Printf("fetching version [%s] from %s\n", version, QLIK_GIT_REPO)
+
+	if repo, err := kapis_git.CloneRepository(destDir, QLIK_GIT_REPO, nil); err != nil {
+		return err
+	} else if err = kapis_git.Checkout(repo, version, fmt.Sprintf("%v-by-operator-%v", version, uuid.New().String()), nil); err != nil {
+		return err
+	}
 	qcr.Spec.ManifestsRoot = qConfig.BuildCurrentManifestsRoot(version)
 	qcr.AddLabelToCr("version", version)
 	return qConfig.WriteCurrentContextCR(qcr)
 }
-
-func fetchToTempDir(gitUrl, gitRef, accessToken string) (string, error) {
-	tmpDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		return "", err
-	}
-	downloadPath := path.Join(tmpDir, "repo")
-	var auth transport.AuthMethod
-	if accessToken != "" {
-		auth = &http.BasicAuth{
-			Username: "something",
-			Password: accessToken,
-		}
-	}
-	if repo, err := kapis_git.CloneRepository(downloadPath, gitUrl, auth); err != nil {
-		return "", err
-	} else if err := kapis_git.Checkout(repo, gitRef, "", auth); err != nil {
-		return "", err
-	} else {
-		return downloadPath, nil
-	}
-}
-
-func getVersion(opts *FetchCommandOptions, qcr *qapi.QliksenseCR) string {
-	if opts.Version == "" {
-		if qcr.GetLabelFromCr("version") != "" {
-			return qcr.GetLabelFromCr("version")
-		}
-	}
-	return opts.Version
-}
-
-func getVerionsOverwriteConfirmation(version string) string {
-	reader := bufio.NewReader(os.Stdin)
-	fmt.Println("The version  [" + version + "] already exist")
-	cfm := "n"
-	for {
-		fmt.Print("Do you want to delete and fetch again [y/N]: ")
-		cfm, _ = reader.ReadString('\n')
-		cfm = strings.Replace(cfm, "\n", "", -1)
-		cfm = strings.TrimSpace(cfm)
-		if cfm == "" {
-			cfm = "n"
-		}
-		cfm = strings.ToLower(cfm)
-		if cfm == "y" || cfm == "n" {
-			break
-		}
-	}
-	return cfm
-}

pkg/qliksense/fetch_test.go

@@ -1,35 +0,0 @@
-package qliksense
-
-import (
-	"io/ioutil"
-	"path/filepath"
-	"testing"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func TestFetchAndUpdateCR(t *testing.T) {
-	tempHome, _ := ioutil.TempDir("", "")
-
-	q := &Qliksense{
-		QliksenseHome: tempHome,
-	}
-	q.SetUpQliksenseContext("test1")
-	qConfig := qapi.NewQConfig(tempHome)
-	if err := fetchAndUpdateCR(qConfig, "v0.0.2"); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-
-	actualCrFile := filepath.Join(tempHome, "contexts", "test1", "test1.yaml")
-	cr := &qapi.QliksenseCR{}
-	if err := qapi.ReadFromFile(cr, actualCrFile); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-
-	if cr.Spec.ManifestsRoot != "contexts/test1/qlik-k8s/v0.0.2" {
-		t.Log("actual path: " + cr.Spec.ManifestsRoot + ", expected path: contexts/test1/qlik-k8s/v0.0.2")
-		t.FailNow()
-	}
-}

pkg/qliksense/get_installable_versions.go

@@ -1,88 +0,0 @@
-package qliksense
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/qlik-oss/k-apis/pkg/git"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-type LsRemoteCmdOptions struct {
-	IncludeBranches bool
-	Limit           int
-}
-
-func (q *Qliksense) GetInstallableVersions(opts *LsRemoteCmdOptions) error {
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		return err
-	}
-
-	var repoPath string
-	if qcr.Spec.GetManifestsRoot() != "" {
-		repoPath = qcr.Spec.GetManifestsRoot()
-	} else {
-		repoPath, err = DownloadFromGitRepoToTmpDir(defaultConfigRepoGitUrl, "master")
-		if err != nil {
-			return err
-		}
-	}
-
-	r, err := git.OpenRepository(repoPath)
-	if err != nil {
-		return err
-	}
-
-	remoteRefsList, err := git.GetRemoteRefs(r, nil,
-		&git.RemoteRefConstraints{
-			Include:   true,
-			Sort:      true,
-			SortOrder: git.RefSortOrderDescending,
-		},
-		&git.RemoteRefConstraints{
-			Include:   opts.IncludeBranches,
-			Sort:      true,
-			SortOrder: git.RefSortOrderAscending,
-		})
-	if err != nil {
-		return err
-	}
-
-	if len(remoteRefsList) < 1 {
-		return errors.New("cannot find git remote information in the config repository")
-	}
-
-	var originRemoteRefs *git.RemoteRefs
-	for _, remoteRefs := range remoteRefsList {
-		if remoteRefs.Name == "origin" {
-			originRemoteRefs = remoteRefs
-			break
-		}
-	}
-	if originRemoteRefs == nil {
-		return errors.New(`cannot find git remote called "origin" in the config repository`)
-	}
-
-	tags := originRemoteRefs.Tags
-	if len(tags) > opts.Limit {
-		tags = tags[:opts.Limit]
-	}
-	fmt.Print("Versions:\n")
-	for _, tag := range tags {
-		fmt.Printf(" %s\n", tag)
-	}
-	if opts.IncludeBranches {
-		branches := originRemoteRefs.Branches
-		if len(branches) > opts.Limit {
-			branches = branches[:opts.Limit]
-		}
-		fmt.Print("Branches:\n")
-		for _, branch := range branches {
-			fmt.Printf(" %s\n", branch)
-		}
-	}
-
-	return nil
-}

pkg/qliksense/install.go

@@ -12,6 +12,7 @@ import (
 )
 
 type InstallCommandOptions struct {
+	AcceptEULA   string
 	StorageClass string
 	MongoDbUri   string
 	RotateKeys   string
@@ -27,9 +28,11 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 	// fetch the version
 	qConfig := qapi.NewQConfig(q.QliksenseHome)
 	if !keepPatchFiles {
-		if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
+		defer func() {
-			fmt.Printf("error removing temporary changes to the config: %v\n", err)
+			if err := q.DiscardAllUnstagedChangesFromGitRepo(qConfig); err != nil {
-		}
+				fmt.Printf("error removing temporary changes to the config: %v\n", err)
+			}
+		}()
 	}
 
 	qcr, err := qConfig.GetCurrentCR()
@@ -38,7 +41,9 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 		return err
 	}
 
-	qcr.SetEULA("yes")
+	if opts.AcceptEULA != "" {
+		qcr.Spec.AddToConfigs("qliksense", "acceptEULA", opts.AcceptEULA)
+	}
 	if opts.MongoDbUri != "" {
 		qcr.Spec.AddToSecrets("qliksense", "mongoDbUri", opts.MongoDbUri, "")
 	}
@@ -64,11 +69,16 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 	//CRD will be installed outside of operator
 	//install operator controller into the namespace
 	fmt.Println("Installing operator controller")
-	if operatorControllerString, err := q.getProcessedOperatorControllerString(qcr); err != nil {
+	operatorControllerString := q.GetOperatorControllerString()
-		fmt.Println("error extracting/transforming operator controller", err)
+	if imageRegistry := qcr.GetImageRegistry(); imageRegistry != "" {
-		return err
+		operatorControllerString, err = kustomizeForImageRegistry(operatorControllerString, pullSecretName,
-	} else if err := qapi.KubectlApply(operatorControllerString, ""); err != nil {
+			"qlik/qliksense-operator", fmt.Sprintf("%v/qliksense-operator", imageRegistry))
-		fmt.Println("cannot do kubectl apply on operator controller", err)
+		if err != nil {
+			return err
+		}
+	}
+	if err := qapi.KubectlApply(operatorControllerString, ""); err != nil {
+		fmt.Println("cannot do kubectl apply on opeartor controller", err)
 		return err
 	}
 
@@ -87,7 +97,7 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 			return q.applyCR(dcr)
 		}
 	}
-	if !qcr.IsRepoExist() {
+	if version != "" { // no need to fetch manifest root already set by some other way
 		if err := fetchAndUpdateCR(qConfig, version); err != nil {
 			return err
 		}
@@ -114,19 +124,9 @@ func (q *Qliksense) InstallQK8s(version string, opts *InstallCommandOptions, kee
 	}
 }
 
-func (q *Qliksense) getProcessedOperatorControllerString(qcr *qapi.QliksenseCR) (string, error) {
-	operatorControllerString := q.GetOperatorControllerString()
-	if imageRegistry := qcr.GetImageRegistry(); imageRegistry != "" {
-		return kustomizeForImageRegistry(operatorControllerString, pullSecretName,
-			fmt.Sprintf("%v/%v", qliksenseOperatorImageRepo, qliksenseOperatorImageName),
-			fmt.Sprintf("%v/%v", imageRegistry, qliksenseOperatorImageName))
-	}
-	return operatorControllerString, nil
-}
-
 func installOrRemoveImagePullSecret(qConfig *qapi.QliksenseConfig) error {
 	if pullDockerConfigJsonSecret, err := qConfig.GetPullDockerConfigJsonSecret(); err == nil {
-		if dockerConfigJsonSecretYaml, err := pullDockerConfigJsonSecret.ToYaml(""); err != nil {
+		if dockerConfigJsonSecretYaml, err := pullDockerConfigJsonSecret.ToYaml(nil); err != nil {
 			return err
 		} else if err := qapi.KubectlApply(string(dockerConfigJsonSecretYaml), ""); err != nil {
 			return err
@@ -135,7 +135,7 @@ func installOrRemoveImagePullSecret(qConfig *qapi.QliksenseConfig) error {
 		deleteDockerConfigJsonSecret := qapi.DockerConfigJsonSecret{
 			Name: pullSecretName,
 		}
-		if deleteDockerConfigJsonSecretYaml, err := deleteDockerConfigJsonSecret.ToYaml(""); err != nil {
+		if deleteDockerConfigJsonSecretYaml, err := deleteDockerConfigJsonSecret.ToYaml(nil); err != nil {
 			return err
 		} else if err := qapi.KubectlDelete(string(deleteDockerConfigJsonSecretYaml), ""); err != nil {
 			qapi.LogDebugMessage("failed deleting %v, error: %v\n", pullSecretName, err)

pkg/qliksense/install_test.go

@@ -1,177 +0,0 @@
-package qliksense
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-
-	"github.com/gobuffalo/packr/v2"
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func TestCreateK8sResoruceBeforePatch(t *testing.T) {
-	td := setup()
-	sampleCr := `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-test3
-  labels:
-    version: v0.0.2
-spec:
-  git:
-    repository: https://github.com/ffoysal/qliksense-k8s
-    accessToken: abababababababaab
-    userName: "blblbl"
-  gitOps:
-    enabled: "no"
-    schedule: "*/1 * * * *"
-    watchBranch: pr-branch-db1d26d6
-    image: qlik-docker-oss.bintray.io/qliksense-repo-watcher
-  configs:
-    qliksense:
-    - name: acceptEULA
-      value: "yes"
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop
-  rotateKeys: "yes"`
-
-	crFile := filepath.Join(testDir, "install_test.yaml")
-	ioutil.WriteFile(crFile, []byte(sampleCr), 0644)
-	q := New(testDir)
-	file, e := os.Open(crFile)
-	if e != nil {
-		t.Log(e)
-		t.FailNow()
-	}
-	if err := q.LoadCr(file, false); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	qConfig := qapi.NewQConfig(testDir)
-	cr, err := qConfig.GetCR("qlik-test3")
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	if err = q.createK8sResoruceBeforePatch(cr); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	td()
-}
-
-func setupQliksenseTestDefaultContext(t *testing.T, tmpQlikSenseHome, CR string) {
-	if err := ioutil.WriteFile(path.Join(tmpQlikSenseHome, "config.yaml"), []byte(`
-apiVersion: config.qlik.com/v1
-kind: QliksenseConfig
-metadata:
-  name: QliksenseConfigMetadata
-spec:
-  contexts:
-  - name: qlik-default
-    crFile: contexts/qlik-default/qlik-default.yaml
-  currentContext: qlik-default
-`), os.ModePerm); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	defaultContextDir := path.Join(tmpQlikSenseHome, "contexts", "qlik-default")
-	if err := os.MkdirAll(defaultContextDir, os.ModePerm); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := ioutil.WriteFile(path.Join(defaultContextDir, "qlik-default.yaml"), []byte(CR), os.ModePerm); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func Test_getProcessedOperatorControllerString(t *testing.T) {
-	tmpQlikSenseHome, err := ioutil.TempDir("", "tmp-qlik-sense-home-")
-	if err != nil {
-		t.Fatalf("unexpected error creating tmp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpQlikSenseHome)
-
-	registry := "registryFoo"
-	setupQliksenseTestDefaultContext(t, tmpQlikSenseHome, fmt.Sprintf(`
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-spec:
-  configs:
-    qliksense:
-    - name: imageRegistry
-      value: %v
-`, registry))
-
-	q := &Qliksense{
-		QliksenseHome: tmpQlikSenseHome,
-		CrdBox:        packr.New("crds", "./crds"),
-	}
-
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	qcr, err := qConfig.GetCurrentCR()
-	if err != nil {
-		t.Fatalf("unexpected error getting current CR: %v", err)
-	}
-
-	originalOperatorString := q.GetOperatorControllerString()
-
-	processedOperatorString, err := q.getProcessedOperatorControllerString(qcr)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	controllerImageChecks := map[string]func(t *testing.T, controllerImage string){
-		originalOperatorString: func(t *testing.T, controllerImage string) {
-			expectedControllerImagePrefix := fmt.Sprintf("%v/%v:", qliksenseOperatorImageRepo, qliksenseOperatorImageName)
-			if !strings.HasPrefix(controllerImage, expectedControllerImagePrefix) {
-				t.Fatalf("expected controller image: %v to have prefix: %v", controllerImage, expectedControllerImagePrefix)
-			}
-		},
-		processedOperatorString: func(t *testing.T, controllerImage string) {
-			expectedControllerImagePrefix := fmt.Sprintf("%v/%v:", registry, qliksenseOperatorImageName)
-			if !strings.HasPrefix(controllerImage, expectedControllerImagePrefix) {
-				t.Fatalf("expected controller image: %v to have prefix: %v", controllerImage, expectedControllerImagePrefix)
-			}
-		},
-	}
-
-	resourceFactory := resmap.NewFactory(resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()), nil)
-	for operatorString, controllerImageCheck := range controllerImageChecks {
-		resMap, err := resourceFactory.NewResMapFromBytes([]byte(operatorString))
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		res, err := resMap.GetById(resid.NewResId(resid.Gvk{
-			Group:   "apps",
-			Version: "v1",
-			Kind:    "Deployment",
-		}, "qliksense-operator"))
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		controllerImage, err := res.GetString("spec.template.spec.containers[0].image")
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-
-		controllerImageCheck(t, controllerImage)
-	}
-}

pkg/qliksense/kuz.go

@@ -1,22 +1,18 @@
 package qliksense
 
 import (
-	"bufio"
 	"log"
 	"os"
-	"strings"
 
 	"github.com/qlik-oss/sense-installer/pkg/api"
 
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // don't delete this line ref: https://github.com/kubernetes/client-go/issues/242
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/krusty"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-//ExecuteKustomizeBuild execute kustomize to the directory and return manifest as byte array
+func executeKustomizeBuild(directory string) ([]byte, error) {
-func ExecuteKustomizeBuild(directory string) ([]byte, error) {
 	return executeKustomizeBuildForFileSystem(directory, filesys.MakeFsOnDisk())
 }
 
@@ -42,26 +38,10 @@ func executeKustomizeBuildForFileSystem(directory string, fSys filesys.FileSyste
 
 func executeKustomizeBuildWithStdoutProgress(path string) (kuzManifest []byte, err error) {
 	result, err := api.ExecuteTaskWithBlinkingStdoutFeedback(func() (interface{}, error) {
-		return ExecuteKustomizeBuild(path)
+		return executeKustomizeBuild(path)
 	}, "...")
 	if err != nil {
 		return nil, err
 	}
 	return result.([]byte), nil
 }
-
-//GetYamlsFromMultiDoc filter yaml docs from multiyaml based on kind
-func GetYamlsFromMultiDoc(multiYaml string, kind string) string {
-	yamlDocs := strings.Split(string(multiYaml), "---")
-	resultDocs := ""
-	for _, doc := range yamlDocs {
-		scanner := bufio.NewScanner(strings.NewReader(doc))
-		for scanner.Scan() {
-			if scanner.Text() == "kind: "+kind {
-				resultDocs = resultDocs + "\n---\n" + doc
-				break
-			}
-		}
-	}
-	return resultDocs
-}

pkg/qliksense/kuz_test.go

@@ -20,7 +20,7 @@ import (
 	kapis_git "github.com/qlik-oss/k-apis/pkg/git"
 )
 
-func Test_ExecuteKustomizeBuild(t *testing.T) {
+func Test_executeKustomizeBuild(t *testing.T) {
 	tmpDir, err := ioutil.TempDir("", "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v\n", err)
@@ -41,7 +41,7 @@ configMapGenerator:
 		t.Fatalf("error writing kustomization file to path: %v error: %v\n", kustomizationYamlFilePath, err)
 	}
 
-	result, err := ExecuteKustomizeBuild(tmpDir)
+	result, err := executeKustomizeBuild(tmpDir)
 	if err != nil {
 		t.Fatalf("unexpected kustomize error: %v\n", err)
 	}
@@ -86,7 +86,7 @@ func Test_executeKustomizeBuild_onQlikConfig_regenerateKeys(t *testing.T) {
 
 	generateKeys(cr, "won't-use")
 
-	yamlResources, err := ExecuteKustomizeBuild(path.Join(configPath, "manifests", "base", "resources", "users"))
+	yamlResources, err := executeKustomizeBuild(path.Join(configPath, "manifests", "base", "resources", "users"))
 	if err != nil {
 		t.Fatalf("unexpected kustomize error: %v\n", err)
 	}
@@ -139,97 +139,3 @@ func getEjsonKeyDir(defaultKeyDir string) string {
 	}
 	return ejsonKeyDir
 }
-
-func Test_GetYamlDocKindFromMultiDoc(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("unexpected error: %v\n", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	kustomizationYamlFilePath := path.Join(tmpDir, "kustomization.yaml")
-	testResFileYamlFilePath := path.Join(tmpDir, "test-file.yaml")
-	kustomizationYaml := `
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- test-file.yaml
-`
-	testYaml := `
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: foo-config
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app: qix-sessions
-    chart: qix-sessions-4.0.10
-    heritage: Helm
-    release: qliksense
-  name: qliksense-qix-sessions
-  namespace: default
-   ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  labels:
-    app: chronos
-    chart: chronos-1.5.7
-    heritage: Helm
-    release: qliksense
-  name: qliksense-chronos
-  namespace: default
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - update
-`
-	err = ioutil.WriteFile(kustomizationYamlFilePath, []byte(kustomizationYaml), os.ModePerm)
-	if err != nil {
-		t.Fatalf("error writing kustomization file to path: %v error: %v\n", kustomizationYamlFilePath, err)
-	}
-	err = ioutil.WriteFile(testResFileYamlFilePath, []byte(testYaml), os.ModePerm)
-	if err != nil {
-		t.Fatalf("error writing test-file to path: %v error: %v\n", testResFileYamlFilePath, err)
-	}
-	result, err := ExecuteKustomizeBuild(tmpDir)
-	if err != nil {
-		t.Fatalf("unexpected kustomize error: %v\n", err)
-	}
-	resultYaml := GetYamlsFromMultiDoc(string(result), "Role")
-
-	expectedK8sYaml := `
----
-
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  labels:
-    app: chronos
-    chart: chronos-1.5.7
-    heritage: Helm
-    release: qliksense
-  name: qliksense-chronos
-  namespace: default
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - update
-`
-	if resultYaml != expectedK8sYaml {
-		t.Fatalf("expected k8s yaml: [%v] but got: [%v]\n", expectedK8sYaml, resultYaml)
-	}
-}

pkg/qliksense/load_cr.go

@@ -1,93 +0,0 @@
-package qliksense
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strings"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func (q *Qliksense) LoadCr(reader io.Reader, overwriteExistingContext bool) error {
-	if crBytes, err := ioutil.ReadAll(reader); err != nil {
-		return err
-	} else if crName, err := q.loadCrStringIntoFileSystem(string(crBytes), overwriteExistingContext); err != nil {
-		return err
-	} else {
-		fmt.Println("cr name: [ " + crName + " ] has been loaded")
-	}
-	return nil
-}
-
-func (q *Qliksense) IsEulaAcceptedInCrFile(reader io.Reader) (bool, error) {
-	if crBytes, err := ioutil.ReadAll(reader); err != nil {
-		return false, err
-	} else if cr, err := qapi.CreateCRObjectFromString(string(crBytes)); err != nil {
-		return false, err
-	} else {
-		return cr.IsEULA(), nil
-	}
-}
-
-func (q *Qliksense) loadCrStringIntoFileSystem(crstr string, overwriteExistingContext bool) (string, error) {
-	cr, err := qapi.CreateCRObjectFromString(crstr)
-	if err != nil {
-		return "", err
-	}
-	qConfig := qapi.NewQConfig(q.QliksenseHome)
-	if qConfig.IsContextExist(cr.GetName()) {
-		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
-		// }
-	}
-	if err := qConfig.CreateContextDirs(cr.GetName()); err != nil {
-		return "", err
-	}
-
-	// encrypt the secrets and do base64 then update the CR
-	encryptionKey, err := qConfig.GetEncryptionKeyFor(cr.GetName())
-	if err != nil {
-		return "", err
-	}
-	for svc, nvs := range cr.Spec.Secrets {
-		for _, nv := range nvs {
-			if nv.ValueFrom == nil {
-				skv := &qapi.ServiceKeyValue{
-					Key:     nv.Name,
-					Value:   nv.Value,
-					SvcName: svc,
-				}
-				if err := q.processSecret(skv, encryptionKey, cr, false); err != nil {
-					return cr.GetName(), err
-				}
-			}
-		}
-	}
-	if cr.Spec.FetchSource != nil && cr.Spec.FetchSource.AccessToken != "" {
-		if err := cr.SetFetchAccessToken(cr.Spec.FetchSource.AccessToken, encryptionKey); err != nil {
-			return "", err
-		}
-	}
-	// 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
-	}
-	qConfig.SetCurrentContextName(cr.GetName())
-	qConfig.Write()
-
-	return cr.GetName(), nil
-}

pkg/qliksense/load_cr_test.go

@@ -1,140 +0,0 @@
-package qliksense
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-)
-
-func TestLoadCrFile(t *testing.T) {
-	td := setup()
-	setup()
-	sampleCr1 := `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-test
-  labels:
-    version: v0.0.2
-spec:
-  git:
-    repository: https://github.com/ffoysal/qliksense-k8s
-    accessToken: abababababababaab
-    userName: "blblbl"
-  gitOps:
-    enabled: "no"
-    schedule: "*/1 * * * *"
-    watchBranch: pr-branch-db1d26d6
-    image: qlik-docker-oss.bintray.io/qliksense-repo-watcher
-  configs:
-    qliksense:
-    - name: acceptEULA
-      value: "yes"
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop
-  rotateKeys: "yes"`
-	sampleCr2 := `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-test3
-  labels:
-    version: v0.0.2
-spec:
-  git:
-    repository: https://github.com/ffoysal/qliksense-k8s
-    accessToken: abababababababaab
-    userName: "blblbl"
-  gitOps:
-    enabled: "no"
-    schedule: "*/1 * * * *"
-    watchBranch: pr-branch-db1d26d6
-    image: qlik-docker-oss.bintray.io/qliksense-repo-watcher
-  configs:
-    qliksense:
-    - name: acceptEULA
-      value: "yes"
-  secrets:
-    qliksense:
-    - name: mongoDbUri
-      value: mongodb://qlik-default-mongodb:27017/qliksense?ssl=false
-  profile: docker-desktop
-  rotateKeys: "yes"`
-
-	duplicateCr := `
-apiVersion: qlik.com/v1
-kind: Qliksense
-metadata:
-  name: qlik-default
-  labels:
-    version: v0.0.2
-spec:
-  git:
-    repository: https://github.com/ffoysal/qliksense-k8s
-    accessToken: abababababababaab
-    userName: "blblbl"`
-	crFile1 := filepath.Join(testDir, "testcr1.yaml")
-	ioutil.WriteFile(crFile1, []byte(sampleCr1), 0644)
-	crFile2 := filepath.Join(testDir, "testcr2.yaml")
-	ioutil.WriteFile(crFile2, []byte(sampleCr2), 0644)
-
-	dupCrFile := filepath.Join(testDir, "dupcr.yaml")
-	ioutil.WriteFile(dupCrFile, []byte(duplicateCr), 0644)
-
-	q := New(testDir)
-	file1, e := os.Open(crFile1)
-	if e != nil {
-		t.Log(e)
-		t.FailNow()
-	}
-	if err := q.LoadCr(file1, false); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	file2, e := os.Open(crFile2)
-	if e != nil {
-		t.Log(e)
-		t.FailNow()
-	}
-	if err := q.LoadCr(file2, false); err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	qConfig := qapi.NewQConfig(testDir)
-	cr, err := qConfig.GetCR("qlik-test")
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	if cr.GetName() != "qlik-test" {
-		t.FailNow()
-	}
-
-	cr, err = qConfig.GetCR("qlik-test3")
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	if cr.GetName() != "qlik-test3" {
-		t.FailNow()
-	}
-
-	if qConfig.Spec.CurrentContext != "qlik-test3" {
-		t.FailNow()
-	}
-	file, e := os.Open(dupCrFile)
-	if e != nil {
-		t.Log(e)
-		t.FailNow()
-	}
-	if err := q.LoadCr(file, false); err == nil {
-		t.FailNow()
-	}
-	td()
-}

pkg/qliksense/upgrade.go

@@ -28,20 +28,21 @@ func (q *Qliksense) UpgradeQK8s(keepPatchFiles bool) error {
 		return err
 	}
 	qcr.Spec.RotateKeys = "no"
-
+	if dcr, err := qConfig.GetDecryptedCr(qcr); err != nil {
-	dcr, err := qConfig.GetDecryptedCr(qcr)
-	if err != nil {
 		return err
-	}
+	} else if err := q.applyConfigToK8s(dcr); err != nil {
-	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)
-	}
-	err = q.applyConfigToK8s(dcr)
-	if err != nil {
 		fmt.Println("cannot do kubectl apply on manifests")
 		return err
 	}
-	return q.applyCR(dcr)
+
+	fmt.Println("Install operator CR into cluster")
+	r, err := qcr.GetString()
+	if err != nil {
+		return err
+	}
+	if err := qapi.KubectlApply(r, ""); err != nil {
+		fmt.Println("cannot do kubectl apply on operator CR")
+	}
+	return nil
+
 }