Skip to content

Consider default project for machine creation and console #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majst01 merged 3 commits into from
Sep 10, 2026
Merged

Consider default project for machine creation and console #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5575c72
Consider default project for machine creation.
Gerrit91 Sep 10, 2026
a3adae6
Also do not require the project strictly.
Gerrit91 Sep 10, 2026
80eec68
Same for console cmd.
Gerrit91 Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/api/v2/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/helpers/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down