Skip to content

Commit

Permalink
Merge pull request #35 from jinlinGuan/v4-update
Browse files Browse the repository at this point in the history
feat: Upgrade go modules to the latest V4 versions
  • Loading branch information
jiekechoo authored Jan 16, 2025
2 parents 9db981a + e01f1b2 commit 2d83bb8
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 232 deletions.
18 changes: 12 additions & 6 deletions cmd/res/configuration.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
Writable:
LogLevel: INFO
LogLevel: "INFO"

Service:
Host: 'localhost'
Host: "localhost"
Port: 59994 # 59994 for testing
StartupMsg: 'S7 device service started'
StartupMsg: "S7 device service started"

MessageBus:
Optional:
ClientId: "device-s7"

Device:
# These have common values (currently), but must be here for service local env overrides to apply when customized
ProfilesDir: './res/profiles'
DevicesDir: './res/devices'
# By default, this service doesn't have any profiles or devices.
# The following settings can be overridden with env overrides to apply customized values.
ProfilesDir: ""
DevicesDir: ""
60 changes: 23 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,27 @@ module github.com/edgexfoundry/device-s7
go 1.23

require (
github.com/edgexfoundry/device-sdk-go/v4 v4.0.0-dev.1
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2
github.com/edgexfoundry/device-sdk-go/v4 v4.0.0-dev.18
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.22
github.com/robinson/gos7 v0.0.0-20231012111941-bdaa10e92e16
github.com/spf13/cast v1.7.1
)

require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.19 // indirect
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.10 // indirect
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.10 // indirect
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.5 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand All @@ -45,30 +42,21 @@ require (
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.1 // indirect
github.com/go-redis/redis/v7 v7.3.0 // indirect
github.com/go-playground/validator/v10 v10.24.0 // indirect
github.com/go-resty/resty/v2 v2.15.3 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/schema v1.4.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hashicorp/consul/api v1.29.4 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // 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.4 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kataras/go-events v0.0.3 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/labstack/echo/v4 v4.12.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/labstack/echo/v4 v4.13.3 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand All @@ -78,28 +66,26 @@ require (
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/michaelquigley/pfxlog v0.6.10 // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/nats-io/nats.go v1.37.0 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nats.go v1.38.0 // indirect
github.com/nats-io/nkeys v0.4.9 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/openziti/channel/v3 v3.0.4 // indirect
github.com/openziti/edge-api v0.26.32 // indirect
github.com/openziti/edge-api v0.26.34 // indirect
github.com/openziti/foundation/v2 v2.0.49 // indirect
github.com/openziti/identity v1.0.85 // indirect
github.com/openziti/metrics v1.2.58 // indirect
github.com/openziti/sdk-golang v0.23.43 // indirect
github.com/openziti/sdk-golang v0.23.44 // indirect
github.com/openziti/secretstream v0.1.25 // indirect
github.com/openziti/transport/v2 v2.0.146 // indirect
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
github.com/panjf2000/ants/v2 v2.10.0 // indirect
github.com/panjf2000/ants/v2 v2.11.0 // indirect
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand All @@ -122,15 +108,15 @@ require (
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
Expand Down
Loading

0 comments on commit 2d83bb8

Please sign in to comment.