-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: allow JSON output on resource creation
- Loading branch information
Showing
37 changed files
with
1,453 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package base | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "io" | ||
| "os" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/hetznercloud/cli/internal/cmd/output" | ||
| "github.com/hetznercloud/cli/internal/cmd/util" | ||
| "github.com/hetznercloud/cli/internal/hcapi2" | ||
| "github.com/hetznercloud/cli/internal/state" | ||
| "github.com/hetznercloud/hcloud-go/v2/hcloud" | ||
| ) | ||
|
|
||
| // CreateCmd allows defining commands for resource creation | ||
| type CreateCmd struct { | ||
| BaseCobraCommand func(hcapi2.Client) *cobra.Command | ||
| Run func(context.Context, hcapi2.Client, state.ActionWaiter, *cobra.Command, []string) (*hcloud.Response, any, error) | ||
| PrintResource func(context.Context, hcapi2.Client, *cobra.Command, any) | ||
| } | ||
|
|
||
| // CobraCommand creates a command that can be registered with cobra. | ||
| func (cc *CreateCmd) CobraCommand( | ||
| ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter, | ||
| ) *cobra.Command { | ||
| cmd := cc.BaseCobraCommand(client) | ||
|
|
||
| output.AddFlag(cmd, output.OptionJSON()) | ||
|
|
||
| if cmd.Args == nil { | ||
| cmd.Args = cobra.NoArgs | ||
| } | ||
|
|
||
| cmd.TraverseChildren = true | ||
| cmd.DisableFlagsInUseLine = true | ||
|
|
||
| if cmd.PreRunE != nil { | ||
| cmd.PreRunE = util.ChainRunE(cmd.PreRunE, tokenEnsurer.EnsureToken) | ||
| } else { | ||
| cmd.PreRunE = tokenEnsurer.EnsureToken | ||
| } | ||
|
|
||
| cmd.RunE = func(cmd *cobra.Command, args []string) error { | ||
| outputFlags := output.FlagsForCommand(cmd) | ||
|
|
||
| isJson := outputFlags.IsSet("json") | ||
| if isJson { | ||
| cmd.SetOut(os.Stderr) | ||
| } else { | ||
| cmd.SetOut(os.Stdout) | ||
| } | ||
|
|
||
| response, resource, err := cc.Run(ctx, client, actionWaiter, cmd, args) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if isJson { | ||
| bytes, _ := io.ReadAll(response.Body) | ||
|
|
||
| var data map[string]any | ||
| if err := json.Unmarshal(bytes, &data); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| delete(data, "action") | ||
|
|
||
| return util.DescribeJSON(data) | ||
| } else if resource != nil { | ||
| cc.PrintResource(ctx, client, cmd, resource) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| return cmd | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.