cmd/dynamo-browse
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

ssm-browse: added cd command

Browse source 
Also came up with an approach for dealing with commands that will probably work with contexts
This commit is contained in:
Leon Mika 2022-03-29 10:29:25 +11:00
parent 0b745a6dfa
commit f6f06eb22d
13 changed files with 142 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/ssm-browse/controllers/events.go
View file

@ -3,5 +3,6 @@ package controllers
import "github.com/lmika/awstools/internal/ssm-browse/models"
type NewParameterListMsg struct {
Prefix string
Parameters *models.SSMParameters
}

28
internal/ssm-browse/controllers/ssmcontroller.go
View file

@ -5,27 +5,53 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/lmika/awstools/internal/common/ui/events"
"github.com/lmika/awstools/internal/ssm-browse/services/ssmparameters"
"sync"
)
type SSMController struct {
service *ssmparameters.Service
// state
mutex *sync.Mutex
prefix string
}
func New(service *ssmparameters.Service) *SSMController {
return &SSMController{
service: service,
prefix: "/",
mutex: new(sync.Mutex),
}
}
func (c *SSMController) Fetch() tea.Cmd {
return func() tea.Msg {
res, err := c.service.List(context.Background())
res, err := c.service.List(context.Background(), c.prefix)
if err != nil {
return events.Error(err)
}
return NewParameterListMsg{
Prefix: c.prefix,
Parameters: res,
}
}
}
func (c *SSMController) ChangePrefix(newPrefix string) tea.Cmd {
return func() tea.Msg {
res, err := c.service.List(context.Background(), newPrefix)
if err != nil {
return events.Error(err)
}
c.mutex.Lock()
defer c.mutex.Unlock()
c.prefix = newPrefix
return NewParameterListMsg{
Prefix: c.prefix,
Parameters: res,
}
}
}

1
internal/ssm-browse/models/models.go
View file

@ -2,6 +2,7 @@ package models
type SSMParameters struct {
Items []SSMParameter
NextToken string
}
type SSMParameter struct {

15
internal/ssm-browse/providers/awsssm/provider.go
View file

@ -6,6 +6,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ssm"
"github.com/lmika/awstools/internal/ssm-browse/models"
"github.com/pkg/errors"
"log"
)
type Provider struct {
@ -18,9 +19,16 @@ func NewProvider(client *ssm.Client) *Provider {
}
}
func (p *Provider) List(ctx context.Context) (*models.SSMParameters, error) {
func (p *Provider) List(ctx context.Context, prefix string, nextToken string) (*models.SSMParameters, error) {
log.Printf("new prefix: %v", prefix)
var nextTokenStr *string = nil
if nextToken != "" {
nextTokenStr = aws.String(nextToken)
}
pars, err := p.client.GetParametersByPath(ctx, &ssm.GetParametersByPathInput{
Path: aws.String("/"),
Path: aws.String(prefix),
NextToken: nextTokenStr,
MaxResults: 10,
Recursive: true,
})
@ -30,10 +38,11 @@ func (p *Provider) List(ctx context.Context) (*models.SSMParameters, error) {
res := &models.SSMParameters{
Items: make([]models.SSMParameter, len(pars.Parameters)),
NextToken: aws.ToString(pars.NextToken),
}
for i, p := range pars.Parameters {
res.Items[i] = models.SSMParameter{
Name: aws.ToString(p.Name),
Name: aws.ToString(p.Name),
Value: aws.ToString(p.Value),
}
}

2
internal/ssm-browse/services/ssmparameters/iface.go
View file

@ -6,5 +6,5 @@ import (
)
type SSMProvider interface {
List(ctx context.Context) (*models.SSMParameters, error)
List(ctx context.Context, prefix string, nextToken string) (*models.SSMParameters, error)
}

20
internal/ssm-browse/services/ssmparameters/service.go
View file

@ -15,6 +15,22 @@ func NewService(provider SSMProvider) *Service {
}
}
func (s *Service) List(ctx context.Context) (*models.SSMParameters, error) {
return s.provider.List(ctx)
func (s *Service) List(ctx context.Context, prefix string) (*models.SSMParameters, error) {
var items []models.SSMParameter
var nextToken string
for {
page, err := s.provider.List(ctx, prefix, nextToken)
if err != nil {
return nil, err
}
items = append(items, page.Items...)
nextToken = page.NextToken
if len(items) >= 50 || nextToken == "" {
break
}
}
return &models.SSMParameters{Items: items, NextToken: nextToken}, nil
}

39
internal/ssm-browse/ui/model.go
View file

@ -2,6 +2,7 @@ package ui
import (
tea "github.com/charmbracelet/bubbletea"
"github.com/lmika/awstools/internal/common/ui/commandctrl"
"github.com/lmika/awstools/internal/dynamo-browse/ui/teamodels/layout"
"github.com/lmika/awstools/internal/dynamo-browse/ui/teamodels/statusandprompt"
"github.com/lmika/awstools/internal/ssm-browse/controllers"
@ -9,26 +10,29 @@ import (
)
type Model struct {
controller *controllers.SSMController
cmdController *commandctrl.CommandController
controller *controllers.SSMController
statusAndPrompt *statusandprompt.StatusAndPrompt
root tea.Model
root tea.Model
ssmList *ssmlist.Model
}
func NewModel(controller *controllers.SSMController) Model {
func NewModel(controller *controllers.SSMController, cmdController *commandctrl.CommandController) Model {
ssmList := ssmlist.New()
root := layout.FullScreen(
statusandprompt.New(ssmList, "Hello SSM"),
)
statusAndPrompt := statusandprompt.New(ssmList, "Hello SSM")
root := layout.FullScreen(statusAndPrompt)
return Model{
controller: controller,
root: root,
ssmList: ssmList,
controller: controller,
cmdController: cmdController,
root: root,
statusAndPrompt: statusAndPrompt,
ssmList: ssmList,
}
}
func (m Model) Init() tea.Cmd {
return m.controller.Fetch()
}
@ -36,11 +40,19 @@ func (m Model) Init() tea.Cmd {
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case controllers.NewParameterListMsg:
m.ssmList.SetPrefix(msg.Prefix)
m.ssmList.SetParameters(msg.Parameters)
case tea.KeyMsg:
switch msg.String() {
case "ctrl+c", "q":
return m, tea.Quit
if !m.statusAndPrompt.InPrompt() {
switch msg.String() {
// TEMP
case ":":
return m, m.cmdController.Prompt()
// END TEMP
case "ctrl+c", "q":
return m, tea.Quit
}
}
}
@ -52,4 +64,3 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
func (m Model) View() string {
return m.root.View()
}

6
internal/ssm-browse/ui/ssmlist/ssmlist.go
View file

@ -19,7 +19,7 @@ type Model struct {
}
func New() *Model {
frameTitle := frame.NewFrameTitle("SSM", true)
frameTitle := frame.NewFrameTitle("SSM: /", true)
table := table.New([]string{"name", "type", "value"}, 0, 0)
return &Model{
@ -28,6 +28,10 @@ func New() *Model {
}
}
func (m *Model) SetPrefix(newPrefix string) {
m.frameTitle.SetTitle("SSM: " + newPrefix)
}
func (m *Model) SetParameters(parameters *models.SSMParameters) {
m.parameters = parameters
cols := []string{"name", "type", "value"}

4
internal/ssm-browse/ui/ssmlist/tblmodel.go
View file

@ -5,6 +5,7 @@ import (
table "github.com/calyptia/go-bubble-table"
"github.com/lmika/awstools/internal/ssm-browse/models"
"io"
"strings"
)
type itemTableRow struct {
@ -12,7 +13,8 @@ type itemTableRow struct {
}
func (mtr itemTableRow) Render(w io.Writer, model table.Model, index int) {
line := fmt.Sprintf("%s\t%s\t%s", mtr.item.Name, "String", mtr.item.Value)
firstLine := strings.SplitN(mtr.item.Value, "\n", 2)[0]
line := fmt.Sprintf("%s\t%s\t%s", mtr.item.Name, "String", firstLine)
if index == model.Cursor() {
fmt.Fprintln(w, model.Styles.SelectedRow.Render(line))