refactor: Use standardized host:port and configuration file flags

pojntfx · pojntfx · commit 4e51a3f915b8 · 2020-01-21T20:28:40.000+01:00
diff --git a/cmd/constants.go b/cmd/constants.go
@@ -1,8 +1,10 @@
 package cmd
 
 const (
-	DHCPDDHostPortDefault    = "localhost:1240" // DHCPDDHostPortDefault is the default Host:port of `dhcpdd`.
-	DHClientDHostPortDefault = "localhost:1241" // DHClientDHostPortDefault is the default Host:port of `dhclient`.
+	DHCPDDHostPortDefault    = "localhost:1240"                  // DHCPDDHostPortDefault is the default Host:port of `dhcpdd`.
+	DHClientDHostPortDefault = "localhost:1241"                  // DHClientDHostPortDefault is the default Host:port of `dhclient`.
+	HostPortDocs             = "Host:port of the server to use." // HostPortDocs is the documentation for the host:port flag.
+	ConfigurationFileDocs    = "Configuration file to use."      // ConfigurationFileDocs is the documentation for the configuration file flag.)
 )
 
 const (
diff --git a/cmd/dhclientctl/cmd/apply.go b/cmd/dhclientctl/cmd/apply.go
@@ -56,8 +56,8 @@ func init() {
 		deviceFlag         string
 	)
 
-	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the dhclientd server to use.")
-	applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")
+	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
+	applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)
 	applyCmd.PersistentFlags().StringVarP(&deviceFlag, deviceKey, "d", "edge1", "Device to bind to.")
 
 	if err := viper.BindPFlags(applyCmd.PersistentFlags()); err != nil {
diff --git a/cmd/dhclientctl/cmd/delete.go b/cmd/dhclientctl/cmd/delete.go
@@ -64,7 +64,7 @@ func init() {
 		serverHostPortFlag string
 	)
 
-	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")
+	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {
 		log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))
diff --git a/cmd/dhclientctl/cmd/get.go b/cmd/dhclientctl/cmd/get.go
@@ -75,7 +75,7 @@ func init() {
 		serverHostPortFlag string
 	)
 
-	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")
+	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {
 		log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))
diff --git a/cmd/dhclientd/main.go b/cmd/dhclientd/main.go
@@ -117,7 +117,7 @@ func init() {
 		hostPortFlag   string
 	)
 
-	rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")
+	rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)
 	rootCmd.PersistentFlags().StringVarP(&hostPortFlag, listenHostPortKey, "l", constants.DHClientDHostPortDefault, "TCP listen host:port.")
 
 	if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
diff --git a/cmd/dhcpdctl/cmd/apply.go b/cmd/dhcpdctl/cmd/apply.go
@@ -69,8 +69,8 @@ func init() {
 		subnetsFlag        string
 	)
 
-	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, "Host:port of the dhcpdd server to use.")
-	applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")
+	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
+	applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)
 	applyCmd.PersistentFlags().StringVarP(&deviceFlag, deviceKey, "d", "edge0", "Device to bind to.")
 	applyCmd.PersistentFlags().StringVarP(&subnetsFlag, subnetsKey, "n", `[
   {
diff --git a/cmd/dhcpdctl/cmd/delete.go b/cmd/dhcpdctl/cmd/delete.go
@@ -64,7 +64,7 @@ func init() {
 		serverHostPortFlag string
 	)
 
-	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")
+	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {
 		log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))
diff --git a/cmd/dhcpdctl/cmd/get.go b/cmd/dhcpdctl/cmd/get.go
@@ -75,7 +75,7 @@ func init() {
 		serverHostPortFlag string
 	)
 
-	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")
+	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {
 		log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))
diff --git a/cmd/dhcpdd/main.go b/cmd/dhcpdd/main.go
@@ -124,7 +124,7 @@ func init() {
 		hostPortFlag   string
 	)
 
-	rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")
+	rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)
 	rootCmd.PersistentFlags().StringVarP(&hostPortFlag, listenHostPortKey, "l", constants.DHCPDDHostPortDefault, "TCP listen host:port.")
 
 	if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ func init() {`
`56`	`56`	`deviceFlag string`
`57`	`57`	`)`
`58`	`58`
`59`		`- applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the dhclientd server to use.")`
`60`		`- applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")`
	`59`	`+ applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)`
	`60`	`+ applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)`
`61`	`61`	`applyCmd.PersistentFlags().StringVarP(&deviceFlag, deviceKey, "d", "edge1", "Device to bind to.")`
`62`	`62`
`63`	`63`	`if err := viper.BindPFlags(applyCmd.PersistentFlags()); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func init() {`
`64`	`64`	`serverHostPortFlag string`
`65`	`65`	`)`
`66`	`66`
`67`		`- deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")`
	`67`	`+ deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)`
`68`	`68`
`69`	`69`	`if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {`
`70`	`70`	`log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func init() {`
`75`	`75`	`serverHostPortFlag string`
`76`	`76`	`)`
`77`	`77`
`78`		`- getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, "Host:port of the go-isc-dhcp server to use.")`
	`78`	`+ getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)`
`79`	`79`
`80`	`80`	`if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {`
`81`	`81`	`log.Fatal(constants.CouldNotBindFlagsErrorMessage, rz.Err(err))`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func init() {`
`117`	`117`	`hostPortFlag string`
`118`	`118`	`)`
`119`	`119`
`120`		`- rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")`
	`120`	`+ rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)`
`121`	`121`	`rootCmd.PersistentFlags().StringVarP(&hostPortFlag, listenHostPortKey, "l", constants.DHClientDHostPortDefault, "TCP listen host:port.")`
`122`	`122`
`123`	`123`	`if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ func init() {`
`69`	`69`	`subnetsFlag string`
`70`	`70`	`)`
`71`	`71`
`72`		`- applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, "Host:port of the dhcpdd server to use.")`
`73`		`- applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")`
	`72`	`+ applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)`
	`73`	`+ applyCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)`
`74`	`74`	`applyCmd.PersistentFlags().StringVarP(&deviceFlag, deviceKey, "d", "edge0", "Device to bind to.")`
`75`	`75`	applyCmd.PersistentFlags().StringVarP(&subnetsFlag, subnetsKey, "n", `[
`76`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func init() {`
`124`	`124`	`hostPortFlag string`
`125`	`125`	`)`
`126`	`126`
`127`		`- rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, "Configuration file to use.")`
	`127`	`+ rootCmd.PersistentFlags().StringVarP(&configFileFlag, configFileKey, "f", configFileDefault, constants.ConfigurationFileDocs)`
`128`	`128`	`rootCmd.PersistentFlags().StringVarP(&hostPortFlag, listenHostPortKey, "l", constants.DHCPDDHostPortDefault, "TCP listen host:port.")`
`129`	`129`
`130`	`130`	`if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {`