From ea0b3fb34e6d76d5810fea264ad772fb90f7cdda Mon Sep 17 00:00:00 2001 From: RoyUP9 <87927115+RoyUP9@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:11:02 +0200 Subject: [PATCH] moved headless to root config, use headless in view (#450) --- acceptanceTests/tap_test.go | 8 ++++---- acceptanceTests/testsUtils.go | 16 +++++++++++----- cli/cmd/tap.go | 1 - cli/cmd/tapRunner.go | 2 +- cli/cmd/viewRunner.go | 4 +++- cli/config/configStruct.go | 1 + cli/config/configStructs/tapConfig.go | 2 -- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/acceptanceTests/tap_test.go b/acceptanceTests/tap_test.go index ee805aa4f..08c6ac0d5 100644 --- a/acceptanceTests/tap_test.go +++ b/acceptanceTests/tap_test.go @@ -827,21 +827,21 @@ func TestTapDumpLogs(t *testing.T) { return } - var dumpsLogsPath string + var dumpLogsPath string for _, file := range files { fileName := file.Name() if strings.Contains(fileName, "mizu_logs") { - dumpsLogsPath = path.Join(mizuFolderPath, fileName) + dumpLogsPath = path.Join(mizuFolderPath, fileName) break } } - if dumpsLogsPath == "" { + if dumpLogsPath == "" { t.Errorf("dump logs file not found") return } - zipReader, zipError := zip.OpenReader(dumpsLogsPath) + zipReader, zipError := zip.OpenReader(dumpLogsPath) if zipError != nil { t.Errorf("failed to get zip reader, err: %v", zipError) return diff --git a/acceptanceTests/testsUtils.go b/acceptanceTests/testsUtils.go index 95cbf8077..98122dc18 100644 --- a/acceptanceTests/testsUtils.go +++ b/acceptanceTests/testsUtils.go @@ -93,16 +93,16 @@ func getDefaultCommandArgs() []string { telemetry := "telemetry=false" agentImage := "agent-image=gcr.io/up9-docker-hub/mizu/ci:0.0.0" imagePullPolicy := "image-pull-policy=Never" + headless := "headless=true" - return []string{setFlag, telemetry, setFlag, agentImage, setFlag, imagePullPolicy} + return []string{setFlag, telemetry, setFlag, agentImage, setFlag, imagePullPolicy, setFlag, headless} } func getDefaultTapCommandArgs() []string { - headless := "--headless" tapCommand := "tap" defaultCmdArgs := getDefaultCommandArgs() - return append([]string{tapCommand, headless}, defaultCmdArgs...) + return append([]string{tapCommand}, defaultCmdArgs...) } func getDefaultTapCommandArgsWithDaemonMode() []string { @@ -135,11 +135,17 @@ func getDefaultConfigCommandArgs() []string { } func getDefaultCleanCommandArgs() []string { - return []string{"clean"} + cleanCommand := "clean" + defaultCmdArgs := getDefaultCommandArgs() + + return append([]string{cleanCommand}, defaultCmdArgs...) } func getDefaultViewCommandArgs() []string { - return []string{"view"} + viewCommand := "view" + defaultCmdArgs := getDefaultCommandArgs() + + return append([]string{viewCommand}, defaultCmdArgs...) } func retriesExecute(retriesCount int, executeFunc func() error) error { diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go index 6ec7105ca..f4ed44605 100644 --- a/cli/cmd/tap.go +++ b/cli/cmd/tap.go @@ -113,5 +113,4 @@ func init() { tapCmd.Flags().String(configStructs.EnforcePolicyFile, defaultTapConfig.EnforcePolicyFile, "Yaml file path with policy rules") tapCmd.Flags().String(configStructs.ContractFile, defaultTapConfig.ContractFile, "OAS/Swagger file to validate to monitor the contracts") tapCmd.Flags().Bool(configStructs.DaemonModeTapName, defaultTapConfig.DaemonMode, "Run mizu in daemon mode, detached from the cli") - tapCmd.Flags().Bool(configStructs.HeadlessMode, defaultTapConfig.HeadlessMode, "Enable headless mode.") } diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 2dbd5f92e..93d20c100 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -626,7 +626,7 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi } logger.Log.Infof("Mizu is available at %s\n", url) - if !config.Config.Tap.HeadlessMode { + if !config.Config.HeadlessMode { uiUtils.OpenBrowser(url) } if err := apiProvider.ReportTappedPods(state.tapperSyncer.CurrentlyTappedPods); err != nil { diff --git a/cli/cmd/viewRunner.go b/cli/cmd/viewRunner.go index a342b484c..d6904ea05 100644 --- a/cli/cmd/viewRunner.go +++ b/cli/cmd/viewRunner.go @@ -58,7 +58,9 @@ func runMizuView() { logger.Log.Infof("Mizu is available at %s\n", url) - uiUtils.OpenBrowser(url) + if !config.Config.HeadlessMode { + uiUtils.OpenBrowser(url) + } if isCompatible, err := version.CheckVersionCompatibility(apiServerProvider); err != nil { logger.Log.Errorf("Failed to check versions compatibility %v", err) diff --git a/cli/config/configStruct.go b/cli/config/configStruct.go index 171ed11d0..b625141e8 100644 --- a/cli/config/configStruct.go +++ b/cli/config/configStruct.go @@ -31,6 +31,7 @@ type ConfigStruct struct { DumpLogs bool `yaml:"dump-logs" default:"false"` KubeConfigPathStr string `yaml:"kube-config-path"` ConfigFilePath string `yaml:"config-path,omitempty" readonly:""` + HeadlessMode bool `yaml:"headless" default:"false"` } func (config *ConfigStruct) SetDefaults() { diff --git a/cli/config/configStructs/tapConfig.go b/cli/config/configStructs/tapConfig.go index c79040e0c..c48bdf85b 100644 --- a/cli/config/configStructs/tapConfig.go +++ b/cli/config/configStructs/tapConfig.go @@ -23,7 +23,6 @@ const ( EnforcePolicyFile = "traffic-validation-file" ContractFile = "contract" DaemonModeTapName = "daemon" - HeadlessMode = "headless" ) type TapConfig struct { @@ -46,7 +45,6 @@ type TapConfig struct { ApiServerResources shared.Resources `yaml:"api-server-resources"` TapperResources shared.Resources `yaml:"tapper-resources"` DaemonMode bool `yaml:"daemon" default:"false"` - HeadlessMode bool `yaml:"headless" default:"false"` } func (config *TapConfig) PodRegex() *regexp.Regexp {