From 29a9e07daf100f2a5fbd0867e3af18edae05b189 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Mon, 20 Jan 2025 09:57:28 +1100 Subject: [PATCH] Fixed bug with the history provider --- go.mod | 8 ++- go.sum | 47 ++++++++++++++++ .../ssm-browse/controllers/ssmcontroller.go | 35 ++++++++++-- .../pasteboardprovider/nilprovider.go | 11 ++++ .../providers/pasteboardprovider/providers.go | 55 +++++++++++++++++++ .../services/historyprovider/service.go | 36 ++++++++++++ internal/ssm-browse/ui/model.go | 14 ++++- main.go | 7 ++- 8 files changed, 202 insertions(+), 11 deletions(-) create mode 100644 internal/ssm-browse/providers/pasteboardprovider/nilprovider.go create mode 100644 internal/ssm-browse/providers/pasteboardprovider/providers.go create mode 100644 internal/ssm-browse/services/historyprovider/service.go diff --git a/go.mod b/go.mod index 2c92f6f..bac11b0 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,11 @@ require ( github.com/muesli/termenv v0.12.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect + golang.design/x/clipboard v0.7.0 // indirect + golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect + golang.org/x/image v0.6.0 // indirect + golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index 57a30a7..2024808 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/aws-sdk-go-v2 v1.33.0 h1:Evgm4DI9imD81V0WwD+TN4DCwjUMdc94TrduMLbgZJs= @@ -93,8 +94,37 @@ github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.design/x/clipboard v0.7.0 h1:4Je8M/ys9AJumVnl8m+rZnIvstSnYj1fvzqYrU3TXvo= +golang.design/x/clipboard v0.7.0/go.mod h1:PQIvqYO9GP29yINEfsEn5zSQKAz3UgXmZKzDA6dnq2E= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= +golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4= +golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -102,9 +132,26 @@ golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/internal/ssm-browse/controllers/ssmcontroller.go b/internal/ssm-browse/controllers/ssmcontroller.go index 935db18..b3b05a3 100644 --- a/internal/ssm-browse/controllers/ssmcontroller.go +++ b/internal/ssm-browse/controllers/ssmcontroller.go @@ -5,23 +5,27 @@ import ( tea "github.com/charmbracelet/bubbletea" "lmika.dev/cmd/ssm-browse/internal/common/ui/events" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/models" + "lmika.dev/cmd/ssm-browse/internal/ssm-browse/providers/pasteboardprovider" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/services/ssmparameters" + "path" "sync" ) type SSMController struct { - service *ssmparameters.Service + service *ssmparameters.Service + pasteboard *pasteboardprovider.Provider // state mutex *sync.Mutex prefix string } -func New(service *ssmparameters.Service) *SSMController { +func New(service *ssmparameters.Service, pasteboard *pasteboardprovider.Provider) *SSMController { return &SSMController{ - service: service, - prefix: "/", - mutex: new(sync.Mutex), + service: service, + prefix: "/", + mutex: new(sync.Mutex), + pasteboard: pasteboard, } } @@ -76,6 +80,27 @@ func (c *SSMController) Clone(param models.SSMParameter) tea.Msg { }) } +func (c *SSMController) CopyValueToClipboard(param *models.SSMParameter) tea.Cmd { + return func() tea.Msg { + err := c.pasteboard.WriteText([]byte(param.Value)) + if err != nil { + return events.Error(err) + } + return events.StatusMsg("Value copied to pasteboard") + } +} + +func (c *SSMController) CopyBasePathToClipboard(param *models.SSMParameter) tea.Cmd { + return func() tea.Msg { + keyBasename := path.Base(param.Name) + err := c.pasteboard.WriteText([]byte(keyBasename)) + if err != nil { + return events.Error(err) + } + return events.StatusMsg("Key basename copied to pasteboard") + } +} + func (c *SSMController) DeleteParameter(param models.SSMParameter) tea.Msg { return events.ConfirmYes("delete parameter? ", func() tea.Msg { ctx := context.Background() diff --git a/internal/ssm-browse/providers/pasteboardprovider/nilprovider.go b/internal/ssm-browse/providers/pasteboardprovider/nilprovider.go new file mode 100644 index 0000000..7285aff --- /dev/null +++ b/internal/ssm-browse/providers/pasteboardprovider/nilprovider.go @@ -0,0 +1,11 @@ +package pasteboardprovider + +type NilProvider struct{} + +func (NilProvider) ReadText() (string, bool) { + return "", false +} + +func (n NilProvider) WriteText(bts []byte) error { + return nil +} diff --git a/internal/ssm-browse/providers/pasteboardprovider/providers.go b/internal/ssm-browse/providers/pasteboardprovider/providers.go new file mode 100644 index 0000000..fb53ac2 --- /dev/null +++ b/internal/ssm-browse/providers/pasteboardprovider/providers.go @@ -0,0 +1,55 @@ +package pasteboardprovider + +import ( + "github.com/pkg/errors" + "golang.design/x/clipboard" + "sync" +) + +type Provider struct { + mutex *sync.Mutex + clipboardInit bool +} + +func New() *Provider { + return &Provider{ + mutex: new(sync.Mutex), + } +} + +func (c *Provider) initClipboard() error { + c.mutex.Lock() + defer c.mutex.Unlock() + + if c.clipboardInit { + return nil + } + + if err := clipboard.Init(); err != nil { + return errors.Wrap(err, "unable to enable clipboard") + } + c.clipboardInit = true + return nil +} + +func (c *Provider) WriteText(bts []byte) error { + if err := c.initClipboard(); err != nil { + return err + } + + clipboard.Write(clipboard.FmtText, bts) + return nil +} + +func (c *Provider) ReadText() (string, bool) { + if err := c.initClipboard(); err != nil { + return "", false + } + + content := clipboard.Read(clipboard.FmtText) + if content == nil { + return "", false + } + + return string(content), true +} diff --git a/internal/ssm-browse/services/historyprovider/service.go b/internal/ssm-browse/services/historyprovider/service.go new file mode 100644 index 0000000..ea9785a --- /dev/null +++ b/internal/ssm-browse/services/historyprovider/service.go @@ -0,0 +1,36 @@ +package historyprovider + +import ( + "context" + "lmika.dev/cmd/ssm-browse/internal/ssm-browse/services" +) + +type Service struct { + history []string +} + +func NewService() *Service { + return &Service{ + history: make([]string, 0), + } +} + +// Len returns the number of historical items +func (s *Service) Len() int { + return len(s.history) +} + +// Item returns the historical item at index 'idx', where items are chronologically ordered such that the +// item at 0 is the oldest item. +func (s *Service) Item(idx int) string { + return s.history[idx] +} + +// PutItem adds an item to the history +func (s *Service) PutItem(item string) { + s.history = append(s.history, item) +} + +func (s *Service) Iter(ctx context.Context, category string) services.HistoryProvider { + return s +} diff --git a/internal/ssm-browse/ui/model.go b/internal/ssm-browse/ui/model.go index 70213c3..d6f4bd5 100644 --- a/internal/ssm-browse/ui/model.go +++ b/internal/ssm-browse/ui/model.go @@ -73,10 +73,20 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case tea.KeyMsg: if !m.statusAndPrompt.InPrompt() { switch msg.String() { - // TEMP + case "c": + if currentParam := m.ssmList.CurrentParameter(); currentParam != nil { + return m, m.controller.CopyValueToClipboard(currentParam) + } else { + return m, func() tea.Msg { return events.Error(errors.New("no parameter selected")) } + } + case "B": + if currentParam := m.ssmList.CurrentParameter(); currentParam != nil { + return m, m.controller.CopyBasePathToClipboard(currentParam) + } else { + return m, func() tea.Msg { return events.Error(errors.New("no parameter selected")) } + } case ":": return m, func() tea.Msg { return m.cmdController.Prompt() } - // END TEMP case "ctrl+c", "q": return m, tea.Quit diff --git a/main.go b/main.go index 49fbf71..84ec58b 100644 --- a/main.go +++ b/main.go @@ -13,6 +13,8 @@ import ( "lmika.dev/cmd/ssm-browse/internal/common/ui/logging" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/controllers" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/providers/awsssm" + "lmika.dev/cmd/ssm-browse/internal/ssm-browse/providers/pasteboardprovider" + "lmika.dev/cmd/ssm-browse/internal/ssm-browse/services/historyprovider" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/services/ssmparameters" "lmika.dev/cmd/ssm-browse/internal/ssm-browse/ui" "os" @@ -44,10 +46,11 @@ func main() { provider := awsssm.NewProvider(ssmClient) service := ssmparameters.NewService(provider) + pbProvider := pasteboardprovider.New() - ctrl := controllers.New(service) + ctrl := controllers.New(service, pbProvider) - cmdController := commandctrl.NewCommandController(nil) + cmdController := commandctrl.NewCommandController(historyprovider.NewService()) cmdController.AddCommands(&commandctrl.CommandList{ Commands: map[string]commandctrl.Command{ "cd": func(ec commandctrl.ExecContext, args []string) tea.Msg {