diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go index effc83373..b7eb75613 100644 --- a/cli/cmd/tap.go +++ b/cli/cmd/tap.go @@ -2,7 +2,6 @@ package cmd import ( "errors" - "fmt" "os" "github.com/up9inc/mizu/cli/config" @@ -68,7 +67,4 @@ func init() { tapCmd.Flags().String(configStructs.HumanMaxEntriesDBSizeTapName, defaultTapConfig.HumanMaxEntriesDBSize, "Override the default max entries db size") tapCmd.Flags().Bool(configStructs.DryRunTapName, defaultTapConfig.DryRun, "Preview of all pods matching the regex, without tapping them") tapCmd.Flags().String(configStructs.EnforcePolicyFile, defaultTapConfig.EnforcePolicyFile, "Yaml file path with policy rules") - - tapCmd.Flags().String(configStructs.EnforcePolicyFileDeprecated, defaultTapConfig.EnforcePolicyFileDeprecated, "Yaml file with policy rules") - tapCmd.Flags().MarkDeprecated(configStructs.EnforcePolicyFileDeprecated, fmt.Sprintf("Use --%s instead", configStructs.EnforcePolicyFile)) } diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 98c3ead0c..66f682f1f 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -49,15 +49,8 @@ func RunMizuTap() { } var mizuValidationRules string - if config.Config.Tap.EnforcePolicyFile != "" || config.Config.Tap.EnforcePolicyFileDeprecated != "" { - var trafficValidation string - if config.Config.Tap.EnforcePolicyFile != "" { - trafficValidation = config.Config.Tap.EnforcePolicyFile - } else { - trafficValidation = config.Config.Tap.EnforcePolicyFileDeprecated - } - - mizuValidationRules, err = readValidationRules(trafficValidation) + if config.Config.Tap.EnforcePolicyFile != "" { + mizuValidationRules, err = readValidationRules(config.Config.Tap.EnforcePolicyFile) if err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error reading policy file: %v", errormessage.FormatError(err))) return diff --git a/cli/config/configStructs/tapConfig.go b/cli/config/configStructs/tapConfig.go index 00be5a1e5..80c15375a 100644 --- a/cli/config/configStructs/tapConfig.go +++ b/cli/config/configStructs/tapConfig.go @@ -17,7 +17,6 @@ const ( HumanMaxEntriesDBSizeTapName = "max-entries-db-size" DryRunTapName = "dry-run" EnforcePolicyFile = "traffic-validation-file" - EnforcePolicyFileDeprecated = "test-rules" ) type TapConfig struct { @@ -34,7 +33,6 @@ type TapConfig struct { HumanMaxEntriesDBSize string `yaml:"max-entries-db-size" default:"200MB"` DryRun bool `yaml:"dry-run" default:"false"` EnforcePolicyFile string `yaml:"traffic-validation-file"` - EnforcePolicyFileDeprecated string `yaml:"test-rules,omitempty" readonly:""` ApiServerResources Resources `yaml:"api-server-resources"` TapperResources Resources `yaml:"tapper-resources"` }