sqs-browse: remove assumption regarding table keys

Table keys are now retrieved from describe
This commit is contained in:
Leon Mika 2022-03-25 08:17:52 +11:00
parent 3428bd2a8a
commit 5a69e6c954
47 changed files with 150 additions and 98 deletions

View file

@ -2,11 +2,12 @@ package commandctrl
import (
"context"
"strings"
"github.com/lmika/awstools/internal/common/ui/events"
"github.com/lmika/awstools/internal/common/ui/uimodels"
"github.com/lmika/shellwords"
"github.com/pkg/errors"
"strings"
)
type CommandController struct {
@ -45,4 +46,4 @@ func (c *CommandController) Execute() uimodels.Operation {
return command.Execute(WithCommandArgs(ctx, tokens[1:]))
})
}
}

View file

@ -2,11 +2,12 @@ package commandctrl_test
import (
"context"
"testing"
"github.com/lmika/awstools/internal/common/ui/commandctrl"
"github.com/lmika/awstools/internal/common/ui/events"
"github.com/lmika/awstools/test/testuictx"
"github.com/stretchr/testify/assert"
"testing"
)
func TestCommandController_Prompt(t *testing.T) {

View file

@ -2,7 +2,8 @@ package commandctrl
import "context"
type commandArgContextKeyType struct {}
type commandArgContextKeyType struct{}
var commandArgContextKey = commandArgContextKeyType{}
func WithCommandArgs(ctx context.Context, args []string) context.Context {
@ -12,4 +13,4 @@ func WithCommandArgs(ctx context.Context, args []string) context.Context {
func CommandArgs(ctx context.Context) []string {
args, _ := ctx.Value(commandArgContextKey).([]string)
return args
}
}

View file

@ -2,6 +2,7 @@ package dispatcher
import (
"fmt"
tea "github.com/charmbracelet/bubbletea"
"github.com/lmika/awstools/internal/common/ui/events"
"github.com/lmika/awstools/internal/common/ui/uimodels"

View file

@ -2,10 +2,11 @@ package dispatcher
import (
"context"
"sync"
"github.com/lmika/awstools/internal/common/ui/events"
"github.com/lmika/awstools/internal/common/ui/uimodels"
"github.com/pkg/errors"
"sync"
)
type Dispatcher struct {
@ -14,7 +15,6 @@ type Dispatcher struct {
publisher MessagePublisher
}
func NewDispatcher(publisher MessagePublisher) *Dispatcher {
return &Dispatcher{
mutex: new(sync.Mutex),
@ -44,6 +44,3 @@ func (d *Dispatcher) Start(ctx context.Context, operation uimodels.Operation) {
d.runningOp = nil
}()
}

View file

@ -4,4 +4,4 @@ import tea "github.com/charmbracelet/bubbletea"
type MessagePublisher interface {
Send(msg tea.Msg)
}
}

View file

@ -14,4 +14,4 @@ type Message string
type PromptForInput struct {
Prompt string
OnDone uimodels.Operation
}
}

View file

@ -2,7 +2,8 @@ package uimodels
import "context"
type uiContextKeyType struct {}
type uiContextKeyType struct{}
var uiContextKey = uiContextKeyType{}
func Ctx(ctx context.Context) UIContext {

View file

@ -11,4 +11,3 @@ type OperationFn func(ctx context.Context) error
func (f OperationFn) Execute(ctx context.Context) error {
return f(ctx)
}

View file

@ -2,7 +2,8 @@ package uimodels
import "context"
type promptValueKeyType struct {}
type promptValueKeyType struct{}
var promptValueKey = promptValueKeyType{}
func PromptValue(ctx context.Context) string {