Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:covalenthq/bsp-agent into develop
Browse files Browse the repository at this point in the history
Signed-off-by: Pranay Valson <[email protected]>
  • Loading branch information
noslav committed Jan 2, 2025
2 parents 92847d6 + 7aef3fe commit 4956f6b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.9.3
github.com/ubiq/go-ubiq v3.0.1+incompatible
golang.org/x/sys v0.25.0
golang.org/x/sys v0.28.0
google.golang.org/api v0.122.0 // indirect
gopkg.in/avro.v0 v0.0.0-20171217001914-a730b5802183
)
Expand Down Expand Up @@ -71,7 +71,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/fatih/color v1.17.0
github.com/fatih/color v1.18.0
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ github.com/ethereum/go-ethereum v1.14.9/go.mod h1:QeW+MtTpRdBEm2pUFoonByee8zfHv7
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8=
Expand Down Expand Up @@ -897,8 +897,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down
11 changes: 3 additions & 8 deletions internal/config/utils.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package config

import (
"log"
"fmt"
"os"
"strconv"
)
Expand All @@ -15,17 +15,14 @@ func LookupEnvOrString(key string, defaultVal string) string {
return defaultVal
}

// LookupEnvOrInt looks up a flag env that is an integer
func LookupEnvOrInt(key string, defaultVal int) int {

Check failure on line 18 in internal/config/utils.go

View workflow job for this annotation

GitHub Actions / go-lint

exported: exported function LookupEnvOrInt should have comment or be unexported (revive)
if val, ok := os.LookupEnv(key); ok {
v, err := strconv.Atoi(val)
if err != nil {
log.Fatalf("unable to lookupEnvOrInt[%s]: %v", key, err)
panic(fmt.Sprintf("unable to lookupEnvOrInt[%s]: %v", key, err))
}

return v

Check failure on line 24 in internal/config/utils.go

View workflow job for this annotation

GitHub Actions / go-lint

return with no blank line before (nlreturn)
}

return defaultVal

Check failure on line 26 in internal/config/utils.go

View workflow job for this annotation

GitHub Actions / go-lint

return with no blank line before (nlreturn)
}

Expand All @@ -34,11 +31,9 @@ func LookupEnvOrInt64(key string, defaultVal int64) int64 {
if val, ok := os.LookupEnv(key); ok {
v, err := strconv.ParseInt(val, 10, 64)
if err != nil {
log.Fatalf("unable to lookupEnvOrInt[%s]: %v", key, err)
panic(fmt.Sprintf("unable to lookupEnvOrInt64[%s]: %v", key, err))
}

return v
}

return defaultVal

Check failure on line 38 in internal/config/utils.go

View workflow job for this annotation

GitHub Actions / go-lint

return with no blank line before (nlreturn)
}

0 comments on commit 4956f6b

Please sign in to comment.