-
Notifications
You must be signed in to change notification settings - Fork 1
CLI: Update hypeman SDK to 458c6a08c9db195425776427cc42690d987f8e5c and add new commands/flags #46
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.
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
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,174 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/kernel/hypeman-go" | ||
| "github.com/kernel/hypeman-go/option" | ||
| "github.com/tidwall/gjson" | ||
| "github.com/urfave/cli/v3" | ||
| ) | ||
|
|
||
| var autoStandbyCmd = cli.Command{ | ||
| Name: "auto-standby", | ||
| Aliases: []string{"autostandby"}, | ||
| Usage: "Inspect auto-standby configuration and status", | ||
| Commands: []*cli.Command{ | ||
| &autoStandbyStatusCmd, | ||
| }, | ||
| HideHelpCommand: true, | ||
| } | ||
|
|
||
| var autoStandbyStatusCmd = cli.Command{ | ||
| Name: "status", | ||
| Usage: "Get auto-standby status for an instance", | ||
| ArgsUsage: "<instance>", | ||
| Action: handleAutoStandbyStatus, | ||
| HideHelpCommand: true, | ||
| } | ||
|
|
||
| func handleAutoStandbyStatus(ctx context.Context, cmd *cli.Command) error { | ||
| args := cmd.Args().Slice() | ||
| if len(args) < 1 { | ||
| return fmt.Errorf("instance ID or name required\nUsage: hypeman auto-standby status <instance>") | ||
| } | ||
|
|
||
| client := hypeman.NewClient(getDefaultRequestOptions(cmd)...) | ||
| instanceID, err := ResolveInstance(ctx, &client, args[0]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var opts []option.RequestOption | ||
| if cmd.Root().Bool("debug") { | ||
| opts = append(opts, debugMiddlewareOption) | ||
| } | ||
|
|
||
| var res []byte | ||
| opts = append(opts, option.WithResponseBodyInto(&res)) | ||
| _, err = client.Instances.AutoStandby.Status(ctx, instanceID, opts...) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| format := cmd.Root().String("format") | ||
| transform := cmd.Root().String("transform") | ||
|
|
||
| obj := gjson.ParseBytes(res) | ||
|
|
||
| if format == "auto" { | ||
| status := obj.Get("status").String() | ||
| enabled := obj.Get("enabled").Bool() | ||
| configured := obj.Get("configured").Bool() | ||
| supported := obj.Get("supported").Bool() | ||
| idleTimeout := obj.Get("idle_timeout").String() | ||
| reason := obj.Get("reason").String() | ||
| trackingMode := obj.Get("tracking_mode").String() | ||
| connections := obj.Get("active_inbound_connections").Int() | ||
|
|
||
| if idleTimeout == "" { | ||
| idleTimeout = "-" | ||
| } | ||
| if reason == "" { | ||
| reason = "-" | ||
| } | ||
|
|
||
| fmt.Printf("%-14s %s\n", "STATUS", status) | ||
| fmt.Printf("%-14s %t\n", "ENABLED", enabled) | ||
| fmt.Printf("%-14s %t\n", "CONFIGURED", configured) | ||
| fmt.Printf("%-14s %t\n", "SUPPORTED", supported) | ||
| fmt.Printf("%-14s %s\n", "IDLE TIMEOUT", idleTimeout) | ||
| fmt.Printf("%-14s %s\n", "REASON", reason) | ||
| fmt.Printf("%-14s %s\n", "TRACKING", trackingMode) | ||
| fmt.Printf("%-14s %d\n", "CONNECTIONS", connections) | ||
|
|
||
| if idleSince := obj.Get("idle_since").String(); idleSince != "" { | ||
| fmt.Printf("%-14s %s\n", "IDLE SINCE", idleSince) | ||
| } | ||
| if nextStandby := obj.Get("next_standby_at").String(); nextStandby != "" { | ||
| fmt.Printf("%-14s %s\n", "NEXT STANDBY", nextStandby) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| return ShowJSON(os.Stdout, "auto-standby status", obj, format, transform) | ||
| } | ||
|
|
||
| func buildAutoStandbyPolicy(cmd *cli.Command, prefix string) (hypeman.AutoStandbyPolicyParam, bool, error) { | ||
| var policy hypeman.AutoStandbyPolicyParam | ||
|
|
||
| enabledFlag := prefix + "enabled" | ||
| idleTimeoutFlag := prefix + "idle-timeout" | ||
| ignoreDestinationPortFlag := prefix + "ignore-destination-port" | ||
| ignoreSourceCIDRFlag := prefix + "ignore-source-cidr" | ||
|
|
||
| enabledSet := cmd.IsSet(enabledFlag) | ||
| idleTimeout := cmd.String(idleTimeoutFlag) | ||
| ignoreSourceCIDRs := cleanStringValues(cmd.StringSlice(ignoreSourceCIDRFlag)) | ||
| ignoreDestinationPorts, err := parseAutoStandbyPorts(cmd.StringSlice(ignoreDestinationPortFlag), ignoreDestinationPortFlag) | ||
| if err != nil { | ||
| return hypeman.AutoStandbyPolicyParam{}, false, err | ||
| } | ||
|
|
||
| if !enabledSet && idleTimeout == "" && len(ignoreDestinationPorts) == 0 && len(ignoreSourceCIDRs) == 0 { | ||
| return hypeman.AutoStandbyPolicyParam{}, false, nil | ||
| } | ||
|
|
||
| if enabledSet { | ||
| policy.Enabled = hypeman.Opt(cmd.Bool(enabledFlag)) | ||
| } else { | ||
| policy.Enabled = hypeman.Opt(true) | ||
| } | ||
|
|
||
| if idleTimeout != "" { | ||
| policy.IdleTimeout = hypeman.Opt(idleTimeout) | ||
| } | ||
| if len(ignoreDestinationPorts) > 0 { | ||
| policy.IgnoreDestinationPorts = ignoreDestinationPorts | ||
| } | ||
| if len(ignoreSourceCIDRs) > 0 { | ||
| policy.IgnoreSourceCidrs = ignoreSourceCIDRs | ||
| } | ||
|
|
||
| return policy, true, nil | ||
| } | ||
|
|
||
| func parseAutoStandbyPorts(rawPorts []string, flagName string) ([]int64, error) { | ||
| ports := make([]int64, 0, len(rawPorts)) | ||
| for _, rawPort := range rawPorts { | ||
| value := strings.TrimSpace(rawPort) | ||
| if value == "" { | ||
| continue | ||
| } | ||
|
|
||
| port, err := strconv.ParseInt(value, 10, 64) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("invalid %s value %q: %w", flagName, rawPort, err) | ||
| } | ||
| if port < 1 || port > 65535 { | ||
| return nil, fmt.Errorf("%s must be between 1 and 65535: %q", flagName, rawPort) | ||
| } | ||
|
|
||
| ports = append(ports, port) | ||
| } | ||
|
|
||
| return ports, nil | ||
| } | ||
|
|
||
| func cleanStringValues(values []string) []string { | ||
| cleaned := make([]string, 0, len(values)) | ||
| for _, value := range values { | ||
| value = strings.TrimSpace(value) | ||
| if value == "" { | ||
| continue | ||
| } | ||
|
|
||
| cleaned = append(cleaned, value) | ||
| } | ||
|
|
||
| return cleaned | ||
| } | ||
This file contains hidden or 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 hidden or 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,35 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/kernel/hypeman-go" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestParseInstanceWaitState(t *testing.T) { | ||
| t.Run("accepts mixed-case state names", func(t *testing.T) { | ||
| state, err := parseInstanceWaitState("rUnNiNg") | ||
| require.NoError(t, err) | ||
| assert.Equal(t, hypeman.InstanceWaitParamsStateRunning, state) | ||
| }) | ||
|
|
||
| t.Run("rejects unsupported state names", func(t *testing.T) { | ||
| _, err := parseInstanceWaitState("booting") | ||
| require.EqualError(t, err, "invalid state: booting (must be Created, Initializing, Running, Paused, Shutdown, Stopped, Standby, or Unknown)") | ||
| }) | ||
| } | ||
|
|
||
| func TestParseAutoStandbyPorts(t *testing.T) { | ||
| t.Run("parses valid port values", func(t *testing.T) { | ||
| ports, err := parseAutoStandbyPorts([]string{"80", " 443 "}, "ignore-destination-port") | ||
| require.NoError(t, err) | ||
| assert.Equal(t, []int64{80, 443}, ports) | ||
| }) | ||
|
|
||
| t.Run("rejects out-of-range ports", func(t *testing.T) { | ||
| _, err := parseAutoStandbyPorts([]string{"70000"}, "ignore-destination-port") | ||
| require.EqualError(t, err, `ignore-destination-port must be between 1 and 65535: "70000"`) | ||
| }) | ||
| } |
This file contains hidden or 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 hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update command implicitly forces auto-standby enabled
Medium Severity
The
buildAutoStandbyPolicyfunction defaults auto-standby toenabled=trueif the--enabledflag isn't explicitly set, even when other policy flags are present. While suitable for instance creation, this can silently re-enable auto-standby on instances where it was intentionally disabled if a user updates another policy setting.Reviewed by Cursor Bugbot for commit de05818. Configure here.