From 5c7590b0bef8e8f10e91a78d75a17232225b2394 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 26 Oct 2025 10:39:13 +1100 Subject: [PATCH] Removed gopkg --- .forgejo/workflows/ci.yaml | 6 ++--- cmd/dynamo-browse/main.go | 39 ++++++++++++++++++++------------ go.mod | 2 +- go.sum | 16 ------------- test/cmd/load-test-table/main.go | 8 +++---- 5 files changed, 33 insertions(+), 38 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index db56260..9d0e0e6 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -83,9 +83,9 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.25 -# - name: Configure -# run: | -# git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" + - name: Configure + run: | + git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" - name: Setup Goreleaser run: | go install github.com/goreleaser/goreleaser/v2@v2.12.7 diff --git a/cmd/dynamo-browse/main.go b/cmd/dynamo-browse/main.go index 38fa879..8c77891 100644 --- a/cmd/dynamo-browse/main.go +++ b/cmd/dynamo-browse/main.go @@ -4,15 +4,17 @@ import ( "context" "flag" "fmt" - "lmika.dev/cmd/dynamo-browse/internal/common/ui/commandctrl/cmdpacks" "log" "net" "os" "strings" + "lmika.dev/cmd/dynamo-browse/internal/common/ui/commandctrl/cmdpacks" + "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/dynamodb" tea "github.com/charmbracelet/bubbletea" + bus "github.com/lmika/events" "lmika.dev/cmd/dynamo-browse/internal/common/ui/commandctrl" "lmika.dev/cmd/dynamo-browse/internal/common/ui/logging" "lmika.dev/cmd/dynamo-browse/internal/common/ui/osstyle" @@ -33,8 +35,6 @@ import ( "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/ui" "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/ui/keybindings" "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/ui/teamodels/styles" - bus "github.com/lmika/events" - "github.com/lmika/gopkgs/cli" ) func main() { @@ -52,7 +52,8 @@ func main() { cfg, err := config.LoadDefaultConfig(ctx) if err != nil { - cli.Fatalf("cannot load AWS config: %v", err) + fmt.Fprintf(os.Stderr, "cannot load AWS config: %v", err) + os.Exit(1) } closeFn := logging.EnableLogging(*flagDebug) @@ -61,7 +62,8 @@ func main() { wsManager := workspaces.New(workspaces.MetaInfo{Command: "dynamo-browse"}) ws, err := wsManager.OpenOrCreate(*flagWorkspace) if err != nil { - cli.Fatalf("cannot create workspace: %v", ws) + fmt.Fprintf(os.Stderr, "cannot create workspace: %v", ws) + os.Exit(1) } defer ws.Close() @@ -69,7 +71,8 @@ func main() { if *flagLocal != "" { host, port, err := net.SplitHostPort(*flagLocal) if err != nil { - cli.Fatalf("invalid address '%v': %v", *flagLocal, err) + fmt.Fprintf(os.Stderr, "invalid address '%v': %v", *flagLocal, err) + os.Exit(1) } if host == "" { host = "localhost" @@ -94,12 +97,14 @@ func main() { if *flagRO { if err := settingStore.SetReadOnly(*flagRO); err != nil { - cli.Fatalf("unable to set read-only mode: %v", err) + fmt.Fprintf(os.Stderr, "unable to set read-only mode: %v", err) + os.Exit(1) } } if *flagDefaultLimit > 0 { if err := settingStore.SetDefaultLimit(*flagDefaultLimit); err != nil { - cli.Fatalf("unable to set default limit: %v", err) + fmt.Fprintf(os.Stderr, "unable to set default limit: %v", err) + os.Exit(1) } } @@ -130,27 +135,32 @@ func main() { if *flagQuery != "" { if *flagTable == "" { - cli.Fatalf("-t will need to be set for -q") + fmt.Fprintf(os.Stderr, "-t will need to be set for -q") + os.Exit(1) } ctx := context.Background() query, err := queryexpr.Parse(*flagQuery) if err != nil { - cli.Fatalf("query: %v", err) + fmt.Fprintf(os.Stderr, "query: %v", err) + os.Exit(1) } ti, err := tableService.Describe(ctx, *flagTable) if err != nil { - cli.Fatalf("cannot describe table: %v", err) + fmt.Fprintf(os.Stderr, "cannot describe table: %v", err) + os.Exit(1) } rs, err := tableService.ScanOrQuery(ctx, ti, query, nil) if err != nil { - cli.Fatalf("cannot execute query: %v", err) + fmt.Fprintf(os.Stderr, "cannot execute query: %v", err) + os.Exit(1) } if err := exportController.ExportToWriter(os.Stdout, rs); err != nil { - cli.Fatalf("cannot export results of query: %v", err) + fmt.Fprintf(os.Stderr, "cannot export results of query: %v", err) + os.Exit(1) } return } @@ -171,7 +181,8 @@ func main() { commandController, err := commandctrl.NewCommandController(inputHistoryService, stdCommands) if err != nil { - cli.Fatalf("cannot setup command controller: %v", err) + fmt.Fprintf(os.Stderr, "cannot setup command controller: %v", err) + os.Exit(1) } commandController.SetCommandCompletionProvider(columnsController) diff --git a/go.mod b/go.mod index ccf156c..ed7f36c 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,6 @@ require ( github.com/charmbracelet/lipgloss v0.6.0 github.com/lmika/events v0.0.0-20200906102219-a2269cd4394e github.com/lmika/go-bubble-table v0.2.2-0.20220616114432-6bbb2995e538 - github.com/lmika/gopkgs v0.0.0-20240408110817-a02f6fc67d1f github.com/lmika/shellwords v0.0.0-20140714114018-ce258dd729fe github.com/mattn/go-runewidth v0.0.14 github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 @@ -56,6 +55,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc // indirect github.com/kr/pretty v0.3.1 // indirect + github.com/lmika/gopkgs v0.0.0-20240408110817-a02f6fc67d1f // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/mattn/go-isatty v0.0.17 // indirect diff --git a/go.sum b/go.sum index 431cfe1..5e310f2 100644 --- a/go.sum +++ b/go.sum @@ -154,8 +154,6 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= @@ -249,21 +247,7 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -lmika.dev/pkg/modash v0.0.0-20250216001243-c73e50a0913d h1:x5aMBOkCr4cjJyFmq+qJVUsByfffD9k56HYDx1yZSR4= -lmika.dev/pkg/modash v0.0.0-20250216001243-c73e50a0913d/go.mod h1:8NDl/yR1eCCEhip9FJlVuMNXIeaztQ0Ks/tizExFcTI= lmika.dev/pkg/modash v0.0.0-20250619112300-0be0b6b35b1b h1:Oymcj66pgyJ2CtGk9lPh06P4FOekllE1iPehDwaL0vw= lmika.dev/pkg/modash v0.0.0-20250619112300-0be0b6b35b1b/go.mod h1:8NDl/yR1eCCEhip9FJlVuMNXIeaztQ0Ks/tizExFcTI= -ucl.lmika.dev v0.0.0-20250525023717-3076897eb73e h1:N+HzQUunDUvdjAzbSDtHQZVZ1k+XHbVgbNwmc+EKmlQ= -ucl.lmika.dev v0.0.0-20250525023717-3076897eb73e/go.mod h1:/MMZKm6mOMtnY4I8TYEot4Pc8dKEy+/IAQo1VdpA5EY= -ucl.lmika.dev v0.0.0-20250527110948-e869e6c9bd4d h1:SlmmY92u7nvPW6xa66n2ZPfCOx90uNp1KkJZ1IDF6K0= -ucl.lmika.dev v0.0.0-20250527110948-e869e6c9bd4d/go.mod h1:/MMZKm6mOMtnY4I8TYEot4Pc8dKEy+/IAQo1VdpA5EY= -ucl.lmika.dev v0.0.0-20250527112110-03e6878524a1 h1:e++1/TfwVKdWi1TmO+kfCdO2+lCTKCrh1m4ps0p7UUM= -ucl.lmika.dev v0.0.0-20250527112110-03e6878524a1/go.mod h1:/MMZKm6mOMtnY4I8TYEot4Pc8dKEy+/IAQo1VdpA5EY= -ucl.lmika.dev v0.0.0-20250527114213-41b4fdb00382 h1:rDJtNrcKVmEqLep1l2YrodPjCfq+/yl7p8EZUrKW7Aw= -ucl.lmika.dev v0.0.0-20250527114213-41b4fdb00382/go.mod h1:/MMZKm6mOMtnY4I8TYEot4Pc8dKEy+/IAQo1VdpA5EY= -ucl.lmika.dev v0.0.0-20250528113931-3a88c0c777d8 h1:kC312X0SvM9YHtuS1r6Js+CgmSS+kSAMLj8cYFuI0+4= -ucl.lmika.dev v0.0.0-20250528113931-3a88c0c777d8/go.mod h1:/MMZKm6mOMtnY4I8TYEot4Pc8dKEy+/IAQo1VdpA5EY= -ucl.lmika.dev v0.0.0-20250718121358-7c76e61b08e4 h1:4HF6Av2/cOXBmRfHBthHn2iHJhk9GvHAFg6Tu6LVUTA= -ucl.lmika.dev v0.0.0-20250718121358-7c76e61b08e4/go.mod h1:+HB5VAi0cI28mr3LbclJvv5lb/HclJ3R60x6cbjgt4c= ucl.lmika.dev v0.1.0 h1:gIZvLjruY1buIH25cm1hcIOvZ/+BvsZ+f84xrhcS6pY= ucl.lmika.dev v0.1.0/go.mod h1:+HB5VAi0cI28mr3LbclJvv5lb/HclJ3R60x6cbjgt4c= diff --git a/test/cmd/load-test-table/main.go b/test/cmd/load-test-table/main.go index d6c425a..be9cdb5 100644 --- a/test/cmd/load-test-table/main.go +++ b/test/cmd/load-test-table/main.go @@ -4,17 +4,17 @@ import ( "context" "flag" "fmt" + "log" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/dynamodb" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/brianvoe/gofakeit/v6" + "github.com/pkg/errors" "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/models" "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/providers/dynamo" "lmika.dev/cmd/dynamo-browse/internal/dynamo-browse/services/tables" - "github.com/lmika/gopkgs/cli" - "github.com/pkg/errors" - "log" ) func main() { @@ -28,7 +28,7 @@ func main() { cfg, err := config.LoadDefaultConfig(ctx) if err != nil { - cli.Fatalf("cannot load AWS config: %v", err) + log.Fatalf("cannot load AWS config: %v", err) } dynamoClient := dynamodb.NewFromConfig(cfg,