Skip to content

Commit

Permalink
(misc) Update dependencies
Browse files Browse the repository at this point in the history 
And add some tests

Signed-off-by: R.I.Pienaar <[email protected]>
  • Loading branch information
@ripienaar
ripienaar committed Feb 21, 2024
1 parent 2f57694 commit 44e102d
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 93 deletions.
19 changes: 16 additions & 3 deletions confkey/confkey_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ import (
"reflect"
"runtime"
"strings"
"testing"
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"testing"
)

func TestFileContent(t *testing.T) {
Expand All @@ -24,7 +23,7 @@ func TestFileContent(t *testing.T) {
}

type TestData struct {
PlainString string `confkey:"plain_string" validate:"shellsafe"`
PlainString string `confkey:"plain_string" validate:"shellsafe" environment:"P"`
CommaSplit []string `confkey:"comma_split" type:"comma_split"`
PathSplit []string `confkey:"path_split" type:"path_split"`
ColonSplit []string `confkey:"colon_split" type:"colon_split"`
Expand Down Expand Up @@ -288,6 +287,20 @@ var _ = Describe("Confkey", func() {
Expect(d.PathSplit).To(Equal([]string{"/foo", "/bar", "/baz"}))
})

It("Should support getting values from the environment", func() {
err := SetStructDefaults(&d)
Expect(err).ToNot(HaveOccurred())

err = SetStructFieldWithKey(&d, "plain_string", "")
Expect(err).ToNot(HaveOccurred())
Expect(d.PlainString).To(Equal(""))

os.Setenv("P", "ENV SETTING")
err = SetStructFieldWithKey(&d, "plain_string", "")
Expect(err).ToNot(HaveOccurred())
Expect(d.PlainString).To(Equal("ENV SETTING"))
})

It("Should support ints", func() {
err := SetStructFieldWithKey(&d, "int", "1")
Expect(err).ToNot(HaveOccurred())
Expand Down
53 changes: 24 additions & 29 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/choria-io/tokens v0.0.3
github.com/cloudevents/sdk-go/v2 v2.15.0
github.com/dustin/go-humanize v1.0.1
github.com/expr-lang/expr v1.16.0
github.com/expr-lang/expr v1.16.1
github.com/fatih/color v1.16.0
github.com/fatih/structtag v1.2.0
github.com/ghodss/yaml v1.0.0
Expand All @@ -31,27 +31,27 @@ require (
github.com/looplab/fsm v1.0.1
github.com/miekg/pkcs11 v1.1.1
github.com/mitchellh/mapstructure v1.5.0
github.com/nats-io/jsm.go v0.1.1-0.20240111112330-8508bd502b64
github.com/nats-io/nats-server/v2 v2.10.10
github.com/nats-io/nats.go v1.32.0
github.com/nats-io/natscli v0.1.2-0.20240111163134-59e8c66e1dcb
github.com/nats-io/jsm.go v0.1.1-0.20240207100149-2665d2ce5928
github.com/nats-io/nats-server/v2 v2.10.11
github.com/nats-io/nats.go v1.33.1
github.com/nats-io/natscli v0.1.3
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/open-policy-agent/opa v0.61.0
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/client_model v0.5.0
github.com/prometheus/client_model v0.6.0
github.com/robfig/cron v1.2.0
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/segmentio/ksuid v1.0.4
github.com/sirupsen/logrus v1.9.3
github.com/tidwall/gjson v1.17.0
github.com/tidwall/gjson v1.17.1
github.com/tidwall/pretty v1.2.1
github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5
golang.org/x/crypto v0.18.0
golang.org/x/sys v0.16.0
golang.org/x/term v0.16.0
golang.org/x/crypto v0.19.0
golang.org/x/sys v0.17.0
golang.org/x/term v0.17.0
golang.org/x/text v0.14.0
golang.org/x/tools v0.17.0
golang.org/x/tools v0.18.0
rsc.io/goversion v1.2.0
)

Expand All @@ -63,6 +63,7 @@ require (
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/achanda/go-sysctl v0.0.0-20160222034550-6be7678c45d2 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/antonmedv/expr v1.15.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/brutella/dnssd v1.2.10 // indirect
Expand All @@ -73,14 +74,14 @@ require (
github.com/dgryski/trifles v0.0.0-20220729183022-231ecf6ed548 // indirect
github.com/emicklei/dot v1.6.1 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.7.0 // indirect
github.com/gdamore/tcell/v2 v2.7.1 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/flatbuffers v23.3.3+incompatible // indirect
github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e // indirect
github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/goss-org/GOnetstat v0.0.0-20230101144325-22be0bd9e64d // indirect
Expand All @@ -103,27 +104,23 @@ require (
github.com/miekg/dns v1.1.58 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nats-io/jwt/v2 v2.5.3 // indirect
github.com/nats-io/jwt/v2 v2.5.4 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nsc/v2 v2.8.6-0.20231220104935-3f89317df670 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nsf/termbox-go v1.1.1 // indirect
github.com/oleiade/reflections v1.0.1 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/common v0.47.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rivo/uniseg v0.4.6 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/samber/lo v1.39.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/synadia-io/jwt-auth-builder.go v0.0.0-20240201211527-9e5bc474b550 // indirect
github.com/tadglines/go-pkgs v0.0.0-20210623144937-b983b20f54f9 // indirect
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand All @@ -132,21 +129,19 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xiam/to v0.0.0-20200126224905-d60d31e03561 // indirect
github.com/yashtewari/glob-intersection v0.2.0 // indirect
go.opentelemetry.io/otel v1.23.0 // indirect
go.opentelemetry.io/otel/metric v1.23.0 // indirect
go.opentelemetry.io/otel/sdk v1.23.0 // indirect
go.opentelemetry.io/otel/trace v1.23.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 // indirect
gopkg.in/gizak/termui.v1 v1.0.0-20151021151108-e62b5929642a // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand Down
Loading

0 comments on commit 44e102d

Please sign in to comment.