Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/flashcatcloud/flashduty-cli
go 1.25.1

require (
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260513121733-bf978e2213f5
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260514040822-dbac13398b6c
github.com/spf13/cobra v1.10.2
golang.org/x/term v0.42.0
gopkg.in/yaml.v3 v3.0.1
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260513114317-7c106c52bd36 h1:yrY7iNBkZrcj6qRZsXwCzMTXjKKzDRGlca/QRfNqiZI=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260513114317-7c106c52bd36/go.mod h1:dG4eJfdZaj4jNBMwEexbfK/3PmcIMhNeJ88L/DcZzUY=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260513121733-bf978e2213f5 h1:AwVNa+CrGqSl60Pq2RQKRV+layS5coJQx01Np+34HD4=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260513121733-bf978e2213f5/go.mod h1:dG4eJfdZaj4jNBMwEexbfK/3PmcIMhNeJ88L/DcZzUY=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260514040822-dbac13398b6c h1:rGRydfWe+Sao/aEzFKz+CtWgTINTAa0+QLFQG5pA4JU=
github.com/flashcatcloud/flashduty-sdk v0.8.1-0.20260514040822-dbac13398b6c/go.mod h1:dG4eJfdZaj4jNBMwEexbfK/3PmcIMhNeJ88L/DcZzUY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down
39 changes: 39 additions & 0 deletions internal/cli/args.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package cli

import (
"bufio"
"fmt"
"os"
"strings"

"github.com/spf13/cobra"
"golang.org/x/term"
)

// requireArgs returns a positional argument validator that produces descriptive
Expand All @@ -20,3 +23,39 @@ func requireArgs(argNames ...string) cobra.PositionalArgs {
return nil
}
}

// requireExactlyOneFlag validates that exactly one of the named flags is set.
func requireExactlyOneFlag(cmd *cobra.Command, flagNames ...string) error {
set := 0
for _, name := range flagNames {
if cmd.Flags().Changed(name) {
set++
}
}
if set != 1 {
return fmt.Errorf("exactly one of --%s must be specified", strings.Join(flagNames, ", --"))
}
return nil
}

// confirmAction prompts the user for confirmation in interactive terminals.
// Returns true if the user confirms, or if running in non-interactive / JSON / --force mode.
func confirmAction(cmd *cobra.Command, message string) bool {
if flagJSON {
return true
}
force, _ := cmd.Flags().GetBool("force")
if force {
return true
}
if !term.IsTerminal(int(os.Stdin.Fd())) {
return false
}
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s [y/N]: ", message)
scanner := bufio.NewScanner(cmd.InOrStdin())
if scanner.Scan() {
answer := strings.TrimSpace(strings.ToLower(scanner.Text()))
return answer == "y" || answer == "yes"
}
return false
}
16 changes: 16 additions & 0 deletions internal/cli/command.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cli

import (
"encoding/json"
"fmt"
"io"

Expand Down Expand Up @@ -64,3 +65,18 @@ func (ctx *RunContext) PrintTotal(items any, cols []output.Column, total int) er
func (ctx *RunContext) WriteResult(message string) {
writeResult(ctx.Writer, message)
}

// WriteResultJSON outputs structured data as JSON in --json mode,
// or a human-readable message in table mode.
func (ctx *RunContext) WriteResultJSON(data any, humanMessage string) error {
if ctx.JSON {
out, err := json.MarshalIndent(data, "", " ")
if err != nil {
return fmt.Errorf("failed to marshal JSON: %w", err)
}
_, _ = fmt.Fprintln(ctx.Writer, string(out))
return nil
}
_, _ = fmt.Fprintln(ctx.Writer, humanMessage)
return nil
}
13 changes: 13 additions & 0 deletions internal/cli/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,19 @@ func (m *mockClient) CancelStatusPageMigration(context.Context, string) error {
return fmt.Errorf("mockClient: CancelStatusPageMigration not implemented")
}

// Phase 5: Team Management
func (m *mockClient) GetTeamInfo(context.Context, *flashduty.TeamGetInput) (*flashduty.TeamItem, error) {
return nil, fmt.Errorf("mockClient: GetTeamInfo not implemented")
}

func (m *mockClient) UpsertTeam(context.Context, *flashduty.TeamUpsertInput) (*flashduty.TeamUpsertOutput, error) {
return nil, fmt.Errorf("mockClient: UpsertTeam not implemented")
}

func (m *mockClient) DeleteTeam(context.Context, *flashduty.TeamDeleteInput) error {
return fmt.Errorf("mockClient: DeleteTeam not implemented")
}

// saveAndResetGlobals saves the current state of all global vars that commands
// mutate, resets them to safe defaults, and returns a restore function for
// t.Cleanup.
Expand Down
5 changes: 5 additions & 0 deletions internal/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ type flashdutyClient interface {
StartStatusPageEmailSubscriberMigration(ctx context.Context, input *flashduty.StartStatusPageEmailSubscriberMigrationInput) (*flashduty.StartStatusPageMigrationOutput, error)
GetStatusPageMigrationStatus(ctx context.Context, jobID string) (*flashduty.StatusPageMigrationJob, error)
CancelStatusPageMigration(ctx context.Context, jobID string) error

// === PHASE 5: Team Management ===
GetTeamInfo(ctx context.Context, input *flashduty.TeamGetInput) (*flashduty.TeamItem, error)
UpsertTeam(ctx context.Context, input *flashduty.TeamUpsertInput) (*flashduty.TeamUpsertOutput, error)
DeleteTeam(ctx context.Context, input *flashduty.TeamDeleteInput) error
}

// newClientFn creates a flashdutyClient. Override in tests to inject a mock.
Expand Down
Loading
Loading