diff --git a/cmd/community.go b/cmd/community.go deleted file mode 100644 index aff4870f5..000000000 --- a/cmd/community.go +++ /dev/null @@ -1,37 +0,0 @@ -package cmd - -import ( - "fmt" - "strings" - - "github.com/kubeshark/kubeshark/config" - "github.com/kubeshark/kubeshark/misc" - "github.com/kubeshark/kubeshark/utils" - "github.com/rs/zerolog/log" - "github.com/spf13/cobra" -) - -var communityCmd = &cobra.Command{ - Use: "community", - Short: fmt.Sprintf("Use %s Community Edition. (default)", misc.Software), - RunE: func(cmd *cobra.Command, args []string) error { - edition := "community" - config.Config.Edition = edition - if err := config.WriteConfig(&config.Config); err != nil { - log.Error().Err(err).Msg("Failed writing config.") - return nil - } - - log.Info().Msgf("%s edition has been set to: %s", misc.Software, strings.Title(edition)) - - log.Warn(). - Str("command", fmt.Sprintf("%s tap", misc.Program)). - Msg(fmt.Sprintf(utils.Yellow, "Now you can run:")) - - return nil - }, -} - -func init() { - rootCmd.AddCommand(communityCmd) -} diff --git a/cmd/config.go b/cmd/config.go index e7cf618fc..15ac9bd8a 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -36,7 +36,7 @@ var configCmd = &cobra.Command{ return nil } - log.Debug().Str("template", template).Msg("Printing template config...") + log.Debug().Str("template", template).Msg("Writing template config...") fmt.Printf("%v", template) } diff --git a/cmd/edition.go b/cmd/edition.go deleted file mode 100644 index 980fdc99d..000000000 --- a/cmd/edition.go +++ /dev/null @@ -1,23 +0,0 @@ -package cmd - -import ( - "fmt" - "strings" - - "github.com/kubeshark/kubeshark/config" - "github.com/kubeshark/kubeshark/misc" - "github.com/spf13/cobra" -) - -var editionCmd = &cobra.Command{ - Use: "edition", - Short: fmt.Sprintf("Print the current edition of %s.", misc.Software), - RunE: func(cmd *cobra.Command, args []string) error { - fmt.Println(strings.Title(config.Config.Edition)) - return nil - }, -} - -func init() { - rootCmd.AddCommand(editionCmd) -} diff --git a/cmd/upgrade.go b/cmd/upgrade.go deleted file mode 100644 index 7edb721e7..000000000 --- a/cmd/upgrade.go +++ /dev/null @@ -1,37 +0,0 @@ -package cmd - -import ( - "fmt" - "strings" - - "github.com/kubeshark/kubeshark/config" - "github.com/kubeshark/kubeshark/misc" - "github.com/kubeshark/kubeshark/utils" - "github.com/rs/zerolog/log" - "github.com/spf13/cobra" -) - -var upgradeCmd = &cobra.Command{ - Use: "upgrade", - Short: fmt.Sprintf("Use %s Pro Edition.", misc.Software), - RunE: func(cmd *cobra.Command, args []string) error { - edition := "pro" - config.Config.Edition = edition - if err := config.WriteConfig(&config.Config); err != nil { - log.Error().Err(err).Msg("Failed writing config.") - return nil - } - - log.Info().Msgf("%s edition has been set to: %s", misc.Software, strings.Title(edition)) - - log.Warn(). - Str("command", fmt.Sprintf("%s tap", misc.Program)). - Msg(fmt.Sprintf(utils.Yellow, "Now you can run:")) - - return nil - }, -} - -func init() { - rootCmd.AddCommand(upgradeCmd) -} diff --git a/config/config.go b/config/config.go index e93afda1a..f5acd350a 100644 --- a/config/config.go +++ b/config/config.go @@ -48,9 +48,7 @@ func InitConfig(cmd *cobra.Command) error { return nil } - if cmd.Use != "edition" { - go version.CheckNewerVersion() - } + go version.CheckNewerVersion() Config = CreateDefaultConfig() cmdName = cmd.Name() @@ -61,7 +59,7 @@ func InitConfig(cmd *cobra.Command) error { configFilePathFlag := cmd.Flags().Lookup(ConfigFilePathCommandName) configFilePath := configFilePathFlag.Value.String() - if err := loadConfigFile(configFilePath, &Config, cmd.Use != "edition"); err != nil { + if err := loadConfigFile(configFilePath, &Config); err != nil { if configFilePathFlag.Changed || !os.IsNotExist(err) { return fmt.Errorf("invalid config, %w\n"+ "you can regenerate the file by removing it (%v) and using `kubeshark config -r`", err, configFilePath) @@ -101,7 +99,7 @@ func WriteConfig(config *ConfigStruct) error { return nil } -func loadConfigFile(configFilePath string, config *ConfigStruct, logPath bool) error { +func loadConfigFile(configFilePath string, config *ConfigStruct) error { reader, openErr := os.Open(configFilePath) if openErr != nil { return openErr @@ -116,9 +114,7 @@ func loadConfigFile(configFilePath string, config *ConfigStruct, logPath bool) e return err } - if logPath { - log.Info().Str("path", configFilePath).Msg("Found config file!") - } + log.Info().Str("path", configFilePath).Msg("Found config file!") return nil } diff --git a/config/configStruct.go b/config/configStruct.go index 88f70b080..21a0be613 100644 --- a/config/configStruct.go +++ b/config/configStruct.go @@ -35,7 +35,6 @@ type ConfigStruct struct { DumpLogs bool `yaml:"dumplogs" default:"false"` ConfigFilePath string `yaml:"configpath,omitempty" readonly:""` HeadlessMode bool `yaml:"headless" default:"false"` - Edition string `yaml:"edition" default:"community"` } func (config *ConfigStruct) SetDefaults() {