Require EULA acceptance for install only (#405)

qlik-oss · Jun 11, 2020 · bf4e4b9 · bf4e4b9
1 parent 4cb3231
commit bf4e4b9
Show file tree

Hide file tree

Showing 12 changed files with 171 additions and 466 deletions.
diff --git a/cmd/qliksense/apply.go b/cmd/qliksense/apply.go
@@ -1,74 +1,45 @@
 package main
 
 import (
-	"bytes"
-	"errors"
-	"fmt"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
 
 func applyCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.InstallCommandOptions{}
+	opts := &qliksense.InstallCommandOptions{
+		CleanPatchFiles: true,
+	}
 	filePath := ""
-	cleanPatchFiles, pull, push := true, false, 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(crBytes []byte) error {
-				if cr, crBytesWithEula, err := getCrWithEulaInserted(crBytes); err != nil {
-					return err
-				} else if err := validatePullPushFlagsOnApply(cr, pull, push); err != nil {
-					return err
-				} else {
-					return q.ApplyCRFromReader(bytes.NewReader(crBytesWithEula), opts, cleanPatchFiles, true, pull, push)
-				}
-			})
+			return apply(q, cmd, opts)
 		},
 	}
 
 	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(&cleanPatchFiles, cleanPatchFilesFlagName, cleanPatchFiles, cleanPatchFilesFlagUsage)
-	f.BoolVarP(&pull, pullFlagName, pullFlagShorthand, pull, pullFlagUsage)
-	f.BoolVarP(&push, pushFlagName, pushFlagShorthand, push, pushFlagUsage)
+	f.BoolVar(&opts.CleanPatchFiles, cleanPatchFilesFlagName, opts.CleanPatchFiles, cleanPatchFilesFlagUsage)
+	f.BoolVarP(&opts.Pull, pullFlagName, pullFlagShorthand, opts.Pull, pullFlagUsage)
+	f.BoolVarP(&opts.Push, pushFlagName, pushFlagShorthand, opts.Push, pushFlagUsage)
+	f.StringVarP(&opts.AcceptEULA, "acceptEULA", "a", opts.AcceptEULA, "Accept EULA for qliksense")
 
-	eulaPreRunHooks.addValidator(fmt.Sprintf("%v %v", rootCommandName, c.Name()), loadOrApplyCommandEulaPreRunHook)
-
-	return c
-}
-
-func validatePullPushFlagsOnApply(cr *qapi.QliksenseCR, pull, push bool) error {
-	if pull && !push {
-		fmt.Printf("WARNING: pulling images without pushing them")
+	if err := c.MarkFlagRequired("file"); err != nil {
+		panic(err)
 	}
-	if push {
-		if registry := cr.Spec.GetImageRegistry(); registry == "" {
-			return errors.New("no image registry set in the CR; to set it use: qliksense config set-image-registry")
-		}
-	}
-	return nil
+	return c
 }
 
-func getCrWithEulaInserted(crBytes []byte) (*qapi.QliksenseCR, []byte, error) {
-	if cr, err := qapi.CreateCRObjectFromString(string(crBytes)); err != nil {
-		return nil, nil, err
+func apply(q *qliksense.Qliksense, cmd *cobra.Command, opts *qliksense.InstallCommandOptions) error {
+	if crBytes, err := getCrBytesFromFileFlag(cmd); err != nil {
+		return err
 	} else {
-		cr.SetEULA("yes")
-		if crBytesWithEula, err := qapi.K8sToYaml(cr); err != nil {
-			return nil, nil, err
-		} else {
-			return cr, crBytesWithEula, nil
-		}
+		return q.ApplyCRFromBytes(crBytes, opts, true)
 	}
 }
diff --git a/cmd/qliksense/eula.go b/cmd/qliksense/eula.go
diff --git a/cmd/qliksense/install.go b/cmd/qliksense/install.go
@@ -1,19 +1,15 @@
 package main
 
 import (
-	"bytes"
-	"fmt"
-
-	qapi "github.com/qlik-oss/sense-installer/pkg/api"
-
 	"github.com/qlik-oss/sense-installer/pkg/qliksense"
 	"github.com/spf13/cobra"
 )
 
 func installCmd(q *qliksense.Qliksense) *cobra.Command {
-	opts := &qliksense.InstallCommandOptions{}
+	opts := &qliksense.InstallCommandOptions{
+		CleanPatchFiles: true,
+	}
 	filePath := ""
-	cleanPatchFiles, pull, push := true, false, false
 	c := &cobra.Command{
 		Use:   "install",
 		Short: "install a qliksense release",
@@ -22,76 +18,29 @@ func installCmd(q *qliksense.Qliksense) *cobra.Command {
 		# qliksense install -f file_name or cat cr_file | qliksense install -f -
 		`,
 		RunE: func(cmd *cobra.Command, args []string) error {
+			version := ""
+			if len(args) != 0 {
+				version = args[0]
+			}
+
 			if filePath != "" {
-				return runLoadOrApplyCommandE(cmd, func(crBytes []byte) error {
-					if cr, crBytesWithEula, err := getCrWithEulaInserted(crBytes); err != nil {
-						return err
-					} else if err := validatePullPushFlagsOnApply(cr, pull, push); err != nil {
-						return err
-					} else {
-						return q.ApplyCRFromReader(bytes.NewReader(crBytesWithEula), opts, cleanPatchFiles, true, pull, push)
-					}
-				})
+				return apply(q, cmd, opts)
 			} else {
-				version := ""
-				if len(args) != 0 {
-					version = args[0]
-				}
-				if err := validatePullPushFlagsOnInstall(q, pull, push); err != nil {
-					return err
-				}
-				if pull {
-					fmt.Println("Pulling images...")
-					if err := q.PullImages(version, ""); err != nil {
-						return err
-					}
-				}
-				if push {
-					fmt.Println("Pushing images...")
-					if err := q.PushImagesForCurrentCR(); err != nil {
-						return err
-					}
-				}
-				return q.InstallQK8s(version, opts, cleanPatchFiles)
+				return q.InstallQK8s(version, opts)
 			}
 		},
 	}
 
-	eulaPreRunHooks.addValidator(fmt.Sprintf("%v %v", rootCommandName, c.Name()), func(cmd *cobra.Command, q *qliksense.Qliksense) (b bool, err error) {
-		if filePath != "" {
-			return loadOrApplyCommandEulaPreRunHook(cmd, q)
-		} else if qConfig, err := qapi.NewQConfigE(q.QliksenseHome); err != nil {
-			return false, nil
-		} else if qcr, err := qConfig.GetCurrentCR(); err != nil {
-			return false, nil
-		} else {
-			return qcr.IsEULA(), nil
-		}
-	})
-
 	f := c.Flags()
+	f.StringVarP(&filePath, "file", "f", "", "Install from a CR 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(&cleanPatchFiles, cleanPatchFilesFlagName, cleanPatchFiles, cleanPatchFilesFlagUsage)
-	f.StringVarP(&filePath, "file", "f", "", "Install from a CR file")
-
+	f.BoolVar(&opts.CleanPatchFiles, cleanPatchFilesFlagName, opts.CleanPatchFiles, cleanPatchFilesFlagUsage)
+	f.BoolVarP(&opts.Pull, pullFlagName, pullFlagShorthand, opts.Pull, pullFlagUsage)
+	f.BoolVarP(&opts.Push, pushFlagName, pushFlagShorthand, opts.Push, pushFlagUsage)
+	f.StringVarP(&opts.AcceptEULA, "acceptEULA", "a", opts.AcceptEULA, "Accept EULA for qliksense")
 	f.BoolVarP(&opts.DryRun, "dry-run", "", false, "Dry run will generate the patches without rotating keys")
 
-	f.BoolVarP(&pull, pullFlagName, pullFlagShorthand, pull, pullFlagUsage)
-	f.BoolVarP(&push, pushFlagName, pushFlagShorthand, push, pushFlagUsage)
-
 	return c
 }
-
-func validatePullPushFlagsOnInstall(q *qliksense.Qliksense, pull, push bool) error {
-	if pull && !push {
-		fmt.Printf("WARNING: pulling images without pushing them")
-	}
-	if push {
-		if err := ensureImageRegistrySetInCR(q); err != nil {
-			return err
-		}
-	}
-	return nil
-}