feat!: Remove support for legacy flags

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.0 / unreleased
+
+**BREAKING CHANGE**
+
+Legacy command line flags, `--ding.profile`, `--ding.timeout` and `--template.file` are removed
+and no longer can be used. Please use config file instead before upgrading.
+
+- [CHANGE] **BREAKING CHANGE** Remove legacy command line flags. #157
+- [MISC] Update react & go dependencies.
+
 ## 1.4.0 / 2019-12-11
 
 - [FEATURE/ENHANCEMENT] Allow override global default message template in config file. #76

cmd/prometheus-webhook-dingtalk/main.go

@@ -18,7 +18,6 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/timonwong/prometheus-webhook-dingtalk/config"
-	"github.com/timonwong/prometheus-webhook-dingtalk/internal/compat030"
 	"github.com/timonwong/prometheus-webhook-dingtalk/template"
 	"github.com/timonwong/prometheus-webhook-dingtalk/web"
 )
@@ -44,12 +43,11 @@ func run() int {
 		configFile = kingpin.Flag(
 			"config.file",
 			"Path to the configuration file.",
-		).Default("config.yml").String()
+		).Default("config.yml").ExistingFile()
 	)
 
 	// DO NOT REMOVE. For compatibility purpose
 	kingpin.Flag("web.ui-enabled", "").Hidden().BoolVar(enableWebUI)
-	compat030Builder := compat030.NewBuilder(kingpin.CommandLine)
 
 	promlogConfig := &promlog.Config{}
 	flag.AddFlags(kingpin.CommandLine, promlogConfig)
@@ -93,25 +91,8 @@ func run() int {
 		Flags: flagsMap,
 	})
 
-	var compatConf *config.Config
-	if compat030Builder.IsCompatibleMode() {
-		var err error
-		compatConf, err = compat030Builder.BuildConfig()
-		if err != nil {
-			level.Error(logger).Log("msg", "Failed to build configuration from legacy commandline flags", "err", err)
-			return 1
-		}
-
-		level.Warn(logger).Log("msg", "DEPRECATION: Detected one of the following flags: --ding.profile, --ding.timeout, --template.file")
-		level.Warn(logger).Log("msg", "DEPRECATION: Now working in compatibility mode, please consider upgrading your configurations")
-	}
-
 	configLogger := log.With(logger, "component", "configuration")
-	configCoordinator := config.NewCoordinator(
-		*configFile,
-		compatConf,
-		configLogger,
-	)
+	configCoordinator := config.NewCoordinator(*configFile, configLogger)
 	configCoordinator.Subscribe(func(conf *config.Config) error {
 		// Parse templates
 		level.Info(configLogger).Log("msg", "Loading templates", "templates", strings.Join(conf.Templates, ";"))

config/coordinator.go

@@ -27,20 +27,18 @@ type Coordinator struct {
 	logger         log.Logger
 
 	// Protects config and subscribers
-	mutex        sync.Mutex
-	config       *Config
-	frozenConfig *Config
-	subscribers  []func(*Config) error
+	mutex       sync.Mutex
+	config      *Config
+	subscribers []func(*Config) error
 }
 
 // NewCoordinator returns a new coordinator with the given configuration file
 // path. It does not yet load the configuration from file. This is done in
 // `Reload()`.
-func NewCoordinator(configFilePath string, frozenConfig *Config, l log.Logger) *Coordinator {
+func NewCoordinator(configFilePath string, l log.Logger) *Coordinator {
 	c := &Coordinator{
 		configFilePath: configFilePath,
 		logger:         l,
-		frozenConfig:   frozenConfig,
 	}
 
 	return c
@@ -82,20 +80,15 @@ func (c *Coordinator) Reload() error {
 	defer c.mutex.Unlock()
 
 	logger := log.With(c.logger, "file", c.configFilePath)
-	if c.frozenConfig != nil {
-		logger = c.logger
-		c.config = c.frozenConfig
-	} else {
-		level.Info(logger).Log("msg", "Loading configuration file")
-		if err := c.loadFromFile(); err != nil {
-			level.Error(logger).Log(
-				"msg", "Loading configuration file failed",
-				"err", err,
-			)
-			return err
-		}
-		level.Info(logger).Log("msg", "Completed loading of configuration file")
+	level.Info(logger).Log("msg", "Loading configuration file")
+	if err := c.loadFromFile(); err != nil {
+		level.Error(logger).Log(
+			"msg", "Loading configuration file failed",
+			"err", err,
+		)
+		return err
 	}
+	level.Info(logger).Log("msg", "Completed loading of configuration file")
 
 	if err := c.notifySubscribers(); err != nil {
 		logger.Log("msg", "one or more config change subscribers failed to apply new config", "err", err)