From 3c83da1dd34c3e0a5f82471047210f55ed3700a9 Mon Sep 17 00:00:00 2001 From: Parisa Tejari Date: Mon, 11 Mar 2024 11:19:54 +0100 Subject: [PATCH] upgrade aurora version in lega-commander --- cli/lega-commander/conf/conf.go | 2 +- cli/lega-commander/go.mod | 2 +- cli/lega-commander/go.sum | 6 ++++-- cli/lega-commander/main.go | 18 +++++++++--------- cli/lega-commander/requests/requests_test.go | 2 +- cli/lega-commander/streaming/streaming.go | 2 +- cli/lega-commander/streaming/streaming_test.go | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cli/lega-commander/conf/conf.go b/cli/lega-commander/conf/conf.go index dd0f2d63..4334a20b 100644 --- a/cli/lega-commander/conf/conf.go +++ b/cli/lega-commander/conf/conf.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - aurora "github.com/logrusorgru/aurora/v3" + "github.com/logrusorgru/aurora/v4" ) const defaultInstanceURL = "https://ega.elixir.no" diff --git a/cli/lega-commander/go.mod b/cli/lega-commander/go.mod index 56a562f1..f536c0d1 100644 --- a/cli/lega-commander/go.mod +++ b/cli/lega-commander/go.mod @@ -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 ) diff --git a/cli/lega-commander/go.sum b/cli/lega-commander/go.sum index f4b2c905..67df1ce2 100644 --- a/cli/lega-commander/go.sum +++ b/cli/lega-commander/go.sum @@ -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= diff --git a/cli/lega-commander/main.go b/cli/lega-commander/main.go index b24080a0..198fb651 100644 --- a/cli/lega-commander/main.go +++ b/cli/lega-commander/main.go @@ -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 ( @@ -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)) } @@ -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)) } diff --git a/cli/lega-commander/requests/requests_test.go b/cli/lega-commander/requests/requests_test.go index 88941de7..732e96d3 100644 --- a/cli/lega-commander/requests/requests_test.go +++ b/cli/lega-commander/requests/requests_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - aurora "github.com/logrusorgru/aurora/v3" + "github.com/logrusorgru/aurora/v4" ) var server *httptest.Server diff --git a/cli/lega-commander/streaming/streaming.go b/cli/lega-commander/streaming/streaming.go index f51ee937..1f095272 100644 --- a/cli/lega-commander/streaming/streaming.go +++ b/cli/lega-commander/streaming/streaming.go @@ -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" ) diff --git a/cli/lega-commander/streaming/streaming_test.go b/cli/lega-commander/streaming/streaming_test.go index 32d606e7..d63b9a7a 100644 --- a/cli/lega-commander/streaming/streaming_test.go +++ b/cli/lega-commander/streaming/streaming_test.go @@ -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