Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade aurora version in lega-commander #100

Merged
merged 1 commit into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/lega-commander/conf/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"sync"

aurora "github.com/logrusorgru/aurora/v3"
"github.com/logrusorgru/aurora/v4"
)

const defaultInstanceURL = "https://ega.elixir.no"
Expand Down
2 changes: 1 addition & 1 deletion cli/lega-commander/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/chzyer/test v1.0.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/jessevdk/go-flags v1.5.0
github.com/logrusorgru/aurora/v3 v3.0.0
github.com/logrusorgru/aurora/v4 v4.0.0
github.com/neicnordic/crypt4gh v1.8.11
)

Expand Down
6 changes: 4 additions & 2 deletions cli/lega-commander/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/logrusorgru/aurora/v3 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4=
github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc=
github.com/logrusorgru/aurora/v4 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4=
github.com/logrusorgru/aurora/v4 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc=
github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA=
github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
Expand Down
18 changes: 9 additions & 9 deletions cli/lega-commander/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/elixir-oslo/lega-commander/resuming"
"github.com/elixir-oslo/lega-commander/streaming"
"github.com/jessevdk/go-flags"
aurora "github.com/logrusorgru/aurora/v3"
"github.com/logrusorgru/aurora/v4"
)

var (
Expand Down Expand Up @@ -96,10 +96,10 @@ func main() {
if inboxOptions.List {
fileList, err := fileManager.ListFiles(true)
if err != nil {
if _, ok := err.(*files.FolderNotFoundError); ok {
log.Fatal(aurora.Red("Inbox Error: The user folder is empty or does not exist yet"))
}
}
if _, ok := err.(*files.FolderNotFoundError); ok {
log.Fatal(aurora.Red("Inbox Error: The user folder is empty or does not exist yet"))
}
}
if err != nil {
log.Fatal(aurora.Red(err))
}
Expand Down Expand Up @@ -136,10 +136,10 @@ func main() {
if inboxOptions.List {
fileList, err := fileManager.ListFiles(false)
if err != nil {
if _, ok := err.(*files.FolderNotFoundError); ok {
log.Fatal(aurora.Red("Outbox Error: No data has been staged in the outbox yet"))
}
}
if _, ok := err.(*files.FolderNotFoundError); ok {
log.Fatal(aurora.Red("Outbox Error: No data has been staged in the outbox yet"))
}
}
if err != nil {
log.Fatal(aurora.Red(err))
}
Expand Down
2 changes: 1 addition & 1 deletion cli/lega-commander/requests/requests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

aurora "github.com/logrusorgru/aurora/v3"
"github.com/logrusorgru/aurora/v4"
)

var server *httptest.Server
Expand Down
2 changes: 1 addition & 1 deletion cli/lega-commander/streaming/streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/elixir-oslo/lega-commander/requests"
"github.com/elixir-oslo/lega-commander/resuming"
"github.com/golang-jwt/jwt"
aurora "github.com/logrusorgru/aurora/v3"
"github.com/logrusorgru/aurora/v4"
"github.com/neicnordic/crypt4gh/model/headers"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/lega-commander/streaming/streaming_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/elixir-oslo/lega-commander/files"
"github.com/elixir-oslo/lega-commander/requests"
"github.com/elixir-oslo/lega-commander/resuming"
aurora "github.com/logrusorgru/aurora/v3"
"github.com/logrusorgru/aurora/v4"
)

var uploader Streamer
Expand Down