myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge pull request #61 from ohdearaugustin/topic/refactor-cli-versionCmd

Browse source 
Refactor cmdVersion to cli package
This commit is contained in:
Juan Font 2021-07-25 12:00:06 +02:00 committed by GitHub
commit b83ecc3e6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmd/headscale/cli/version.go Normal file
View file

@ -0,0 +1,23 @@
package cli
import (
"fmt"
"github.com/spf13/cobra"
"strings"
)
var version = "dev"
var VersionCmd = &cobra.Command{
Use: "version",
Short: "Print the version.",
Long: "The version of headscale.",
Run: func(cmd *cobra.Command, args []string) {
o, _ := cmd.Flags().GetString("output")
if strings.HasPrefix(o, "json") {
JsonOutput(map[string]string{"version": version}, nil, o)
return
}
fmt.Println(version)
},
}

19
cmd/headscale/headscale.go
View file

@ -4,28 +4,11 @@ import (
"fmt"
"log"
"os"
"strings"
"github.com/juanfont/headscale/cmd/headscale/cli"
"github.com/spf13/cobra"
)
var version = "dev"
var versionCmd = &cobra.Command{
Use: "version",
Short: "Print the version.",
Long: "The version of headscale.",
Run: func(cmd *cobra.Command, args []string) {
o, _ := cmd.Flags().GetString("output")
if strings.HasPrefix(o, "json") {
cli.JsonOutput(map[string]string{"version": version}, nil, o)
return
}
fmt.Println(version)
},
}
var headscaleCmd = &cobra.Command{
Use: "headscale",
Short: "headscale - a Tailscale control server",
@ -47,7 +30,7 @@ func main() {
headscaleCmd.AddCommand(cli.PreauthkeysCmd)
headscaleCmd.AddCommand(cli.RoutesCmd)
headscaleCmd.AddCommand(cli.ServeCmd)
headscaleCmd.AddCommand(versionCmd)
headscaleCmd.AddCommand(cli.VersionCmd)
cli.NodeCmd.PersistentFlags().StringP("namespace", "n", "", "Namespace")
err = cli.NodeCmd.MarkPersistentFlagRequired("namespace")