mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor into singular account in the config

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-28 15:52:46 +01:00
parent b9198c546c
commit e09cea328b
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmd/rove/main.go
View file

@ -42,10 +42,15 @@ func printUsage() {
const gRPCport = 9090 const gRPCport = 9090
// Account stores data for an account
type Account struct {
Name string `json:"name"`
}
// Config is used to store internal data // Config is used to store internal data
type Config struct { type Config struct {
Host string `json:"host,omitempty"` Host string `json:"host,omitempty"`
Accounts map[string]string `json:"accounts,omitempty"` Account Account `json:"account,omitempty"`
} }
// ConfigPath returns the configuration path // ConfigPath returns the configuration path
@ -65,7 +70,6 @@ func ConfigPath() string {
func LoadConfig() (config Config, err error) { func LoadConfig() (config Config, err error) {
datapath := ConfigPath() datapath := ConfigPath()
config.Accounts = make(map[string]string)
// Create the path if needed // Create the path if needed
path := filepath.Dir(datapath) path := filepath.Dir(datapath)
@ -136,7 +140,7 @@ func InnerMain(command string, args ...string) error {
if len(args) > 0 { if len(args) > 0 {
config.Host = args[0] config.Host = args[0]
} }
fmt.Printf("host: %s\taccount: %s\n", config.Host, config.Accounts[config.Host]) fmt.Printf("host: %s\taccount: %s\n", config.Host, config.Account)
return SaveConfig(config) return SaveConfig(config)
} }
@ -173,6 +177,7 @@ func InnerMain(command string, args ...string) error {
if len(args) == 0 { if len(args) == 0 {
return fmt.Errorf("must pass name to 'register'") return fmt.Errorf("must pass name to 'register'")
} }
name := args[0] name := args[0]
d := rove.RegisterRequest{ d := rove.RegisterRequest{
Name: name, Name: name,
@ -184,7 +189,7 @@ func InnerMain(command string, args ...string) error {
default: default:
fmt.Printf("Registered account with id: %s\n", name) fmt.Printf("Registered account with id: %s\n", name)
config.Accounts[config.Host] = name config.Account.Name = name
} }
case "commands": case "commands":
@ -219,7 +224,7 @@ func InnerMain(command string, args ...string) error {
} }
d := rove.CommandsRequest{ d := rove.CommandsRequest{
Account: config.Accounts[config.Host], Account: config.Account.Name,
Commands: commands, Commands: commands,
} }
@ -237,7 +242,7 @@ func InnerMain(command string, args ...string) error {
} }
case "radar": case "radar":
dat := rove.RadarRequest{Account: config.Accounts[config.Host]} dat := rove.RadarRequest{Account: config.Account.Name}
if err := verifyID(dat.Account); err != nil { if err := verifyID(dat.Account); err != nil {
return err return err
} }
@ -253,7 +258,7 @@ func InnerMain(command string, args ...string) error {
} }
case "rover": case "rover":
req := rove.RoverRequest{Account: config.Accounts[config.Host]} req := rove.RoverRequest{Account: config.Account.Name}
if err := verifyID(req.Account); err != nil { if err := verifyID(req.Account); err != nil {
return err return err
} }