extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-24 11:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

more cmd lint

Browse Source
This commit is contained in:
Michael Quigley 2022-08-10 15:27:41 -04:00
parent 7f2afc13cd
commit 1ef84865f0
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/zrok/controller.go
View File

@ -10,7 +10,6 @@ func init() {
} }
type controllerCommand struct { type controllerCommand struct {
dbPath string
cmd *cobra.Command cmd *cobra.Command
} }
@ -21,9 +20,7 @@ func newControllerCommand() *controllerCommand {
Aliases: []string{"ctrl"}, Aliases: []string{"ctrl"},
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
} }
command := &controllerCommand{ command := &controllerCommand{cmd: cmd}
cmd: cmd,
}
cmd.Run = command.run cmd.Run = command.run
return command return command
} }

26
cmd/zrok/enable.go
View File

@ -13,19 +13,27 @@ import (
) )
func init() { func init() {
enableCmd.Flags().StringVarP(&enableDescription, "description", "d", "<user>@<hostname>", "Description of this environment") rootCmd.AddCommand(newEnableCommand().cmd)
rootCmd.AddCommand(enableCmd)
} }
var enableCmd = &cobra.Command{ type enableCommand struct {
description string
cmd *cobra.Command
}
func newEnableCommand() *enableCommand {
cmd := &cobra.Command{
Use: "enable <token>", Use: "enable <token>",
Short: "Enable an environment for zrok", Short: "Enable an environment for zrok",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: enable,
} }
var enableDescription string command := &enableCommand{cmd: cmd}
cmd.Flags().StringVarP(&command.description, "description", "d", "<user>@<hostname>", "Description of this environment")
cmd.Run = command.run
return command
}
func enable(_ *cobra.Command, args []string) { func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
token := args[0] token := args[0]
hostName, hostDetail, err := getHost() hostName, hostDetail, err := getHost()
@ -37,15 +45,15 @@ func enable(_ *cobra.Command, args []string) {
panic(err) panic(err)
} }
hostDetail = fmt.Sprintf("%v; %v", user.Username, hostDetail) hostDetail = fmt.Sprintf("%v; %v", user.Username, hostDetail)
if enableDescription == "<user>@<hostname>" { if cmd.description == "<user>@<hostname>" {
enableDescription = fmt.Sprintf("%v@%v", user.Username, hostName) cmd.description = fmt.Sprintf("%v@%v", user.Username, hostName)
} }
zrok := newZrokClient() zrok := newZrokClient()
auth := httptransport.APIKeyAuth("X-TOKEN", "header", token) auth := httptransport.APIKeyAuth("X-TOKEN", "header", token)
req := identity.NewEnableParams() req := identity.NewEnableParams()
req.Body = &rest_model_zrok.EnableRequest{ req.Body = &rest_model_zrok.EnableRequest{
Description: enableDescription, Description: cmd.description,
Host: hostDetail, Host: hostDetail,
} }
resp, err := zrok.Identity.Enable(req, auth) resp, err := zrok.Identity.Enable(req, auth)