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.

Sign up for GitHub

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

fix: update dependencies to latest versions and modules #79

Merged
merged 4 commits into from
Apr 28, 2022
Merged

fix: update dependencies to latest versions and modules #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f01186
fix: wip
marcpfuller Apr 28, 2022
0dfdef7
fix: wip
marcpfuller Apr 28, 2022
c37b68d
Merge branch 'update_attribution_and_config' of https://github.com/ma…
marcpfuller Apr 28, 2022
508f69e
fix: removing metrics from configuration toml
marcpfuller Apr 28, 2022
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
29 changes: 28 additions & 1 deletion Attribution.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,31 @@ golang.org/x/text (Unspecified) https://github.com/golang/text
https://github.com/golang/text/blob/master/LICENSE

gopkg.in/yaml.v3 (MIT) https://github.com/go-yaml/yaml/
https://github.com/go-yaml/yaml/blob/v3/LICENSE
https://github.com/go-yaml/yaml/blob/v3/LICENSE

github.com/golang/protobuf (BSD-3) https://github.com/golang/protobuf
https://github.com/golang/protobuf/blob/master/LICENSE

github.com/spiffe/go-spiffe/v2 (Apache-2.0 License) github.com/spiffe/go-spiffe/v2
https://github.com/spiffe/go-spiffe/blob/main/LICENSE

github.com/zeebo/errs (MIT) https://github.com/zeebo/errs
https://github.com/zeebo/errs/blob/master/LICENSE

google.golang.org/genproto (Apache-2.0) https://github.com/googleapis/go-genproto
https://github.com/googleapis/go-genproto/blob/main/LICENSE

google.golang.org/grpc (Apache-2.0) https://github.com/grpc/grpc-go
https://github.com/grpc/grpc-go/blob/master/LICENSE

google.golang.org/protobuf (Unspecified) https://github.com/protocolbuffers/protobuf-go
https://github.com/protocolbuffers/protobuf-go/blob/master/LICENSE

gopkg.in/square/go-jose.v2 (Apache-2.0) https://github.com/square/go-jose/tree/v2.6.0
https://github.com/square/go-jose/blob/v2.6.0/LICENSE

rcrowley/go-metrics (Unspecified) https://github.com/rcrowley/go-metrics
https://github.com/rcrowley/go-metrics/blob/master/LICENSE

go-kit/log (MIT) https://github.com/go-kit/log
https://github.com/go-kit/log/blob/main/LICENSE
10 changes: 9 additions & 1 deletion cmd/res/configuration.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LogLevel = "INFO"
[Writable.InsecureSecrets.DB.Secrets]
username = ""
password = ""

[Service]
Host = "localhost"
Port = 59989
Expand Down Expand Up @@ -40,6 +40,14 @@ DisableScrubSecretsFile = false
TokenFile = "/tmp/edgex/secrets/device-rfid-llrp/secrets-token.json"
[SecretStore.Authentication]
AuthType = "X-Vault-Token"
[SecretStore.RuntimeTokenProvider]
Enabled = false
Protocol = "https"
Host = "localhost"
Port = 59841
TrustDomain = "edgexfoundry.org"
EndpointSocket = "/tmp/edgex/secrets/spiffe/public/api.sock"
RequiredSecrets = "redisdb"

[Registry]
Host = "localhost"
Expand Down
44 changes: 26 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,33 @@ module github.com/edgexfoundry/device-rfid-llrp-go
go 1.17

require (
github.com/edgexfoundry/device-sdk-go/v2 v2.1.0
github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.0
github.com/edgexfoundry/device-sdk-go/v2 v2.2.0-dev.35
github.com/edgexfoundry/go-mod-core-contracts/v2 v2.2.0-dev.27
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.1
)

require (
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 // indirect
bitbucket.org/bertimus9/systemstat v0.5.0 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eclipse/paho.mqtt.golang v1.3.5 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.0 // indirect
github.com/edgexfoundry/go-mod-configuration/v2 v2.1.0 // indirect
github.com/edgexfoundry/go-mod-messaging/v2 v2.1.0 // indirect
github.com/edgexfoundry/go-mod-registry/v2 v2.1.0 // indirect
github.com/edgexfoundry/go-mod-secrets/v2 v2.1.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.20 // indirect
github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-messaging/v2 v2.2.0-dev.12 // indirect
github.com/edgexfoundry/go-mod-registry/v2 v2.2.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-secrets/v2 v2.2.0-dev.8 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.3.0 // indirect
github.com/go-kit/kit v0.11.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.9.0 // indirect
github.com/go-playground/validator/v10 v10.10.1 // indirect
github.com/go-redis/redis/v7 v7.3.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
Expand All @@ -37,7 +38,7 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.12.0 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.0 // indirect
github.com/hashicorp/serf v0.9.5 // indirect
Expand All @@ -52,10 +53,17 @@ require (
github.com/pebbe/zmq4 v1.2.7 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
github.com/spiffe/go-spiffe/v2 v2.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
golang.org/x/text v0.3.6 // indirect
github.com/zeebo/errs v1.2.2 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.42.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/square/go-jose.v2 v2.4.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
Loading