diff --git a/cmd/api/v2/machine.go b/cmd/api/v2/machine.go index b073687..9ae4c7e 100644 --- a/cmd/api/v2/machine.go +++ b/cmd/api/v2/machine.go @@ -89,7 +89,6 @@ If ~/.ssh/[id_ed25519.pub | id_rsa.pub | id_dsa.pub] is present it will be picke consoleCmd.Flags().StringP("project", "p", "", "project of the machine") consoleCmd.Flags().StringP("sshidentity", "i", "", "the ssh private key used when creating the machine") genericcli.Must(consoleCmd.RegisterFlagCompletionFunc("project", c.Completion.Project)) - genericcli.Must(consoleCmd.MarkFlagRequired("project")) return genericcli.NewCmds(cmdsConfig, consoleCmd) } @@ -207,7 +206,7 @@ func (c *machine) console(args []string) error { return err } - err = helpers.SSHClient(id, viper.GetString("sshidentity"), parsedurl.Host, viper.GetInt("metal-console-port"), c.c.Context.Token, new(viper.GetString("project"))) + err = helpers.SSHClient(id, viper.GetString("sshidentity"), parsedurl.Host, viper.GetInt("metal-console-port"), c.c.Context.Token, new(c.c.GetProject())) if err != nil { return fmt.Errorf("machine console error: %w", err) } diff --git a/pkg/helpers/machine.go b/pkg/helpers/machine.go index 026f6ce..233a695 100644 --- a/pkg/helpers/machine.go +++ b/pkg/helpers/machine.go @@ -188,7 +188,7 @@ func MachineCreateRequestFromCLI(c *config.Config) (*apiv2.MachineServiceCreateR Hostname: hostname, Image: viper.GetString("image"), Name: viper.GetString("name"), - Project: viper.GetString("project"), + Project: c.GetProject(), Size: size, SshPublicKeys: keys, Labels: labels, @@ -566,7 +566,7 @@ IPs can be added per network colon separated, these ips must be already allocate cmd.Flags().StringSlice("placement-labels", []string{}, "placement tags used for rack spreading") cmd.MarkFlagsMutuallyExclusive("file", "project") - cmd.MarkFlagsRequiredTogether("project", "networks", "hostname", "image") + cmd.MarkFlagsRequiredTogether("networks", "hostname", "image") cmd.MarkFlagsRequiredTogether("size", "partition") // Completion for arguments