chore: update to latest clio (#98)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

cmd/quill/cli/cli.go

@@ -3,8 +3,6 @@ package cli
 import (
  "os"
 
- "github.com/spf13/cobra"
-
  "github.com/anchore/clio"
  "github.com/anchore/quill/cmd/quill/cli/commands"
  "github.com/anchore/quill/cmd/quill/internal/ui"
@@ -13,7 +11,7 @@ import (
  "github.com/anchore/quill/internal/redact"
 )
 
-func New(id clio.Identification) *cobra.Command {
+func New(id clio.Identification) clio.Application {
  clioCfg := clio.NewSetupConfig(id).
  WithGlobalConfigFlag(). // add persistent -c <path> for reading an application config from
  WithGlobalLoggingFlags(). // add persistent -v and -q flags tied to the logging config
@@ -71,5 +69,5 @@ func New(id clio.Identification) *cobra.Command {
  root.AddCommand(extract)
  root.AddCommand(p12)
 
- return root
+ return app
 }

cmd/quill/main.go

@@ -1,17 +1,9 @@
 package main
 
 import (
- "context"
- "os"
- "os/signal"
- "strings"
-
- "github.com/gookit/color"
-
  "github.com/anchore/clio"
  "github.com/anchore/quill/cmd/quill/cli"
  "github.com/anchore/quill/internal"
- "github.com/anchore/quill/internal/log"
 )
 
 const valueNotProvided = "[not provided]"
@@ -23,7 +15,7 @@ var gitDescription = valueNotProvided
 var buildDate = valueNotProvided
 
 func main() {
- cmd := cli.New(
+ app := cli.New(
  clio.Identification{
  Name: internal.ApplicationName,
  Version: version,
@@ -33,44 +25,5 @@ func main() {
  },
  )
 
- // drive application control from a single context which can be cancelled (notifying the event loop to stop)
- ctx, cancel := context.WithCancel(context.Background())
- cmd.SetContext(ctx)
-
- // note: it is important to always do signal handling from the main package. In this way if quill is used
- // as a lib a refactor would not need to be done (since anything from the main package cannot be imported this
- // nicely enforces this constraint)
- signals := make(chan os.Signal, 10) // Note: A buffered channel is recommended for this; see https://golang.org/pkg/os/signal/#Notify
- signal.Notify(signals, os.Interrupt)
-
- var exitCode int
-
- defer func() {
- if exitCode != 0 {
- os.Exit(exitCode)
- }
- }()
-
- defer func() {
- signal.Stop(signals)
- cancel()
- }()
-
- go func() {
- select {
- case <-signals: // first signal, cancel context
- log.Trace("signal interrupt, stop requested")
- cancel()
- case <-ctx.Done():
- }
- <-signals // second signal, hard exit
- log.Trace("signal interrupt, killing")
- os.Exit(1)
- }()
-
- if err := cmd.Execute(); err != nil {
- // report an issue on stdout
- color.Red.Println(strings.TrimSpace(err.Error()))
- exitCode = 1
- }
+ app.Run()
 }

go.mod

@@ -6,9 +6,9 @@ require (
  github.com/PuerkitoBio/goquery v1.8.1
  github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
  github.com/anchore/bubbly v0.0.0-20230518153401-87b6af8ccf22
- github.com/anchore/clio v0.0.0-20230630162005-9535e9dc2817
+ github.com/anchore/clio v0.0.0-20230802135737-4778c80552e5
  github.com/anchore/fangs v0.0.0-20230628163043-a51c5a39b097
- github.com/anchore/go-logger v0.0.0-20230531193951-db5ae83e7dbe
+ github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a
  github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb
  github.com/aws/aws-sdk-go v1.44.308
  github.com/blacktop/go-macho v1.1.162
@@ -74,7 +74,7 @@ require (
  github.com/pkg/profile v1.7.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/rivo/uniseg v0.2.0 // indirect
- github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/sirupsen/logrus v1.9.3 // indirect
  github.com/spf13/afero v1.9.3 // indirect
  github.com/spf13/cast v1.5.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect

go.sum

@@ -46,12 +46,12 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/anchore/bubbly v0.0.0-20230518153401-87b6af8ccf22 h1:5NFK6VGgqBUOAX2SYyzFYvNdOiYDxzim8jga386FlZY=
 github.com/anchore/bubbly v0.0.0-20230518153401-87b6af8ccf22/go.mod h1:Kv+Mm9CdtnV8iem48iEPIwy7/N4Wmk0hpxYNH5gTwKQ=
-github.com/anchore/clio v0.0.0-20230630162005-9535e9dc2817 h1:YsE91GT81FQOAOKByAnJVeJY2q8AunJ1eNf1bDC/o8g=
-github.com/anchore/clio v0.0.0-20230630162005-9535e9dc2817/go.mod h1:H5f7dtqPQ6kbL0OHcLrc5N0zkIxLZPBL2oKUE03fLgA=
+github.com/anchore/clio v0.0.0-20230802135737-4778c80552e5 h1:+8PjffRlKmpulXMCYvZN+S/Abm29e8JSBmcDSdQ8jps=
+github.com/anchore/clio v0.0.0-20230802135737-4778c80552e5/go.mod h1:PrUEp9T+mMgEyPvimzwpqgJD6Zfg/9nw0BEGryY3qFo=
 github.com/anchore/fangs v0.0.0-20230628163043-a51c5a39b097 h1:79jSyWO6WOV8HPEpOQBOr7WsC2DnBRpyl7zsdaahCcg=
 github.com/anchore/fangs v0.0.0-20230628163043-a51c5a39b097/go.mod h1:E3zNHEz7mizIFGJhuX+Ga7AbCmEN5TfzVDxmOfj7XZw=
-github.com/anchore/go-logger v0.0.0-20230531193951-db5ae83e7dbe h1:Df867YMmymdMG6z5IW8pR0/2CRpLIjYnaTXLp6j+s0k=
-github.com/anchore/go-logger v0.0.0-20230531193951-db5ae83e7dbe/go.mod h1:ubLFmlsv8/DFUQrZwY5syT5/8Er3ugSr4rDFwHsE3hg=
+github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a h1:nJ2G8zWKASyVClGVgG7sfM5mwoZlZ2zYpIzN2OhjWkw=
+github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a/go.mod h1:ubLFmlsv8/DFUQrZwY5syT5/8Er3ugSr4rDFwHsE3hg=
 github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb h1:iDMnx6LIjtjZ46C0akqveX83WFzhpTD3eqOthawb5vU=
 github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb/go.mod h1:DmTY2Mfcv38hsHbG78xMiTDdxFtkHpgYNVDPsF2TgHk=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
@@ -301,8 +301,8 @@ github.com/scylladb/go-set v1.0.2 h1:SkvlMCKhP0wyyct6j+0IHJkBkSZL+TDzZ4E7f7BCcRE
 github.com/scylladb/go-set v1.0.2/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
 github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
@@ -481,7 +481,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -516,6 +515,7 @@ 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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=