Skip to content

Commit

Permalink
Merge pull request #685 from jinlinGuan/v4-module
Browse files Browse the repository at this point in the history 
refactor!: update module to v4
  • Loading branch information
@cloudxxx8
cloudxxx8 authored Oct 30, 2024
2 parents 5fbb3d5 + cdafe4a commit b2cf19f
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 259 deletions.
103 changes: 8 additions & 95 deletions Attribution.txt
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
The following open source projects are referenced by app-service-configurable:

bertimus9/systemstat (MIT) https://bitbucket.org/bertimus9/systemstat
https://bitbucket.org/bertimus9/systemstat/src/master/LICENSE

armon/go-metrics (MIT) https://github.com/armon/go-metrics
https://github.com/armon/go-metrics/blob/master/LICENSE

cenkalti/backoff (MIT) https://github.com/cenkalti/backoff
https://github.com/cenkalti/backoff/blob/master/LICENSE

eclipse/paho.mqtt.golang (Eclipse Public License 2.0) https://github.com/eclipse/paho.mqtt.golang
https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE

edgexfoundry/app-functions-sdk-go (Apache 2.0) https://github.com/edgexfoundry/app-functions-sdk-go/v3
edgexfoundry/app-functions-sdk-go (Apache 2.0) https://github.com/edgexfoundry/app-functions-sdk-go/v4
https://github.com/edgexfoundry/app-functions-sdk-go/blob/master/LICENSE

edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v3
edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v4
https://github.com/edgexfoundry/go-mod-core-contracts/blob/master/LICENSE

edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v3
edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v4
https://github.com/edgexfoundry/go-mod-registry/blob/master/LICENSE

edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3
edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v4
https://github.com/edgexfoundry/go-mod-messaging/blob/master/LICENSE

edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v3
edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v4
https://github.com/edgexfoundry/go-mod-secrets/blob/master/LICENSE

edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v3
edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v4
https://github.com/edgexfoundry/go-mod-bootstrap/blob/master/LICENSE

edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v3
edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v4
https://github.com/edgexfoundry/go-mod-configuration/blob/master/LICENSE

github.com/go-kit/log (MIT) https://github.com/go-kit/log
Expand All @@ -42,39 +33,12 @@ https://github.com/go-logfmt/logfmt/blob/master/LICENSE
google/uuid (BSD-3) https://github.com/google/uuid
https://github.com/google/uuid/blob/master/LICENSE

gorilla/mux (BSD-3) https://github.com/gorilla/mux
https://github.com/gorilla/mux/blob/master/LICENSE

hashicorp/consul/api (Mozilla Public License 2.0) - https://github.com/hashicorp/consul/api
https://github.com/hashicorp/consul/blob/master/LICENSE

hashicorp/go-cleanhttp (Mozilla Public License 2.0) - https://github.com/hashicorp/go-cleanhttp
https://github.com/hashicorp/go-cleanhttp/blob/master/LICENSE

hashicorp/go-immutable-radix (Mozilla Public License 2.0) https://github.com/hashicorp/go-immutable-radix
https://github.com/hashicorp/go-immutable-radix/blob/master/LICENSE

hashicorp/go-rootcerts (Mozilla Public License 2.0) https://github.com/hashicorp/go-rootcerts
https://github.com/hashicorp/go-rootcerts/blob/master/LICENSE

hashicorp/golang-lru (Mozilla Public License 2.0) https://github.com/hashicorp/golang-lru
https://github.com/hashicorp/golang-lru/blob/master/LICENSE

hashicorp/serf (Mozilla Public License 2.0) https://github.com/hashicorp/serf
https://github.com/hashicorp/serf/blob/master/LICENSE

hashicorp/errwrap (Mozilla Public License 2.0) https://github.com/hashicorp/errwrap
https://github.com/hashicorp/errwrap/blob/master/LICENSE

hashicorp/go-multierror (Mozilla Public License 2.0) https://github.com/hashicorp/go-multierror
https://github.com/hashicorp/go-multierror/blob/master/LICENSE

kr/logfmt (Unspecified) https://github.com/kr/logfmt
https://github.com/kr/logfmt/blob/master/Readme

mitchellh/consulstructure (MIT) https://github.com/mitchellh/consulstructure
https://github.com/mitchellh/consulstructure/blob/master/LICENSE

mitchellh/mapstructure (MIT) https://github.com/mitchellh/mapstructure
https://github.com/mitchellh/mapstructure/blob/master/LICENSE

Expand All @@ -84,9 +48,6 @@ https://github.com/mitchellh/copystructure/blob/master/LICENSE
mitchellh/reflectwalk (MIT) https://github.com/mitchellh/reflectwalk
https://github.com/mitchellh/reflectwalk/blob/master/LICENSE

mitchellh/go-homedir (MIT) https://github.com/mitchellh/go-homedir
https://github.com/mitchellh/go-homedir/blob/master/LICENSE

fxamacker/cbor/v2 (MIT) https://github.com/fxamacker/cbor/v2
https://github.com/fxamacker/cbor/blob/master/LICENSE

Expand All @@ -99,18 +60,6 @@ https://github.com/golang/net/blob/master/LICENSE
gomodule/redigo (Apache 2.0) https://github.com/gomodule/redigo
https://github.com/gomodule/redigo/blob/master/LICENSE

github.com/go-stack/stack (MIT) https://github.com/go-stack/stack
https://github.com/go-stack/stack/blob/master/LICENSE.md

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

github.com/xdg/scram (Apache 2.0) https://github.com/xdg-go/scram
https://github.com/xdg-go/scram/blob/master/LICENSE

github.com/xdg/stringprep (Apache 2.0) https://github.com/xdg-go/stringprep
https://github.com/xdg-go/stringprep/blob/master/LICENSE

golang.org/x/crypto (Unspecified) https://github.com/golang/crypto
https://github.com/golang/crypto/blob/master/LICENSE

Expand Down Expand Up @@ -138,15 +87,6 @@ https://github.com/go-playground/validator/blob/master/LICENSE
leodido/go-urn (MIT) https://github.com/leodido/go-urn
https://github.com/leodido/go-urn

gopkg.in/yaml.v2 (Apache 2.0) https://github.com/go-yaml/yaml/
https://github.com/go-yaml/yaml/blob/v2.2.2/LICENSE

github.com/fatih/color (MIT) https://github.com/fatih/color
https://github.com/fatih/color/blob/master/LICENSE.md

github.com/hashicorp/go-hclog (MIT) https://github.com/hashicorp/go-hclog
https://github.com/hashicorp/go-hclog/blob/master/LICENSE

github.com/mattn/go-colorable (MIT) https://github.com/mattn/go-colorable
https://github.com/mattn/go-colorable/blob/master/LICENSE

Expand All @@ -171,18 +111,12 @@ 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

github.com/Microsoft/go-winio (MIT) https://github.com/Microsoft/go-winio
https://github.com/microsoft/go-winio/blob/master/LICENSE

Expand All @@ -195,18 +129,9 @@ https://github.com/nats-io/nkeys/blob/master/LICENSE
github.com/nats-io/nuid (Apache-2.0) https://github.com/nats-io/nuid
https://github.com/nats-io/nuid/blob/master/LICENSE

golang.org/x/mod (BSD-3) https://github.com/golang/mod
https://github.com/golang/mod/blob/master/LICENSE

golang.org/x/tools (BSD-3) https://github.com/golang/tools
https://github.com/golang/tools/blob/master/LICENSE

golang.org/x/exp (BSD-3) https://github.com/golang/tools
https://github.com/golang/tools/blob/master/LICENSE

github.com/go-jose/go-jose/v3 (Apache-2.0) https://github.com/go-jose/go-jose
https://github.com/go-jose/go-jose/blob/v3/LICENSE

github.com/klauspost/compress (Apache-2.0) https://github.com/klauspost/compress
https://github.com/klauspost/compress/blob/master/LICENSE

Expand All @@ -216,9 +141,6 @@ https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE
gopkg.in/yaml.v3 (Apache 2.0) https://github.com/go-yaml/yaml/tree/v3
https://github.com/go-yaml/yaml/blob/v2/LICENSE

github.com/golang-jwt/jwt/v4 (MIT) github.com/golang-jwt/jwt
https://github.com/golang-jwt/jwt/blob/main/LICENSE

github.com/labstack/echo/v4 (MIT) https://github.com/labstack/echo
https://github.com/labstack/echo/blob/master/LICENSE

Expand Down Expand Up @@ -288,7 +210,7 @@ https://github.com/go-openapi/validate/blob/master/LICENSE
github.com/go-resty/resty/v2 (MIT) - https://github.com/go-resty/resty
https://github.com/go-resty/resty/blob/v2/LICENSE

github.com/golang-jwt/jwt/v5 (MIT) - https://github.com/golang-jwt/jwt
github.com/golang-jwt/jwt/v5 (MIT) - https://github.com/golang-jwt/jwt/v5
https://github.com/golang-jwt/jwt/blob/main/LICENSE

github.com/gorilla/mux (BSD-3) - https://github.com/gorilla/mux
Expand Down Expand Up @@ -333,9 +255,6 @@ https://github.com/oklog/ulid/blob/main/LICENSE
github.com/opentracing/opentracing-go (Apache 2.0) - https://github.com/opentracing/opentracing-go
https://github.com/opentracing/opentracing-go/blob/master/LICENSE

github.com/openziti/channel/v2 (Apache 2.0) - https://github.com/openziti/channel
https://github.com/openziti/channel/blob/main/LICENSE

github.com/openziti/edge-api (Apache 2.0) - https://github.com/openziti/edge-api
https://github.com/openziti/edge-api/blob/main/LICENSE

Expand Down Expand Up @@ -399,9 +318,6 @@ https://github.com/mongodb/mongo-go-driver/blob/v1/LICENSE
go.mozilla.org/pkcs7 (MIT) - https://github.com/mozilla-services/pkcs7
https://github.com/mozilla-services/pkcs7/blob/master/LICENSE

go.opentelemetry.io/otel (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go
https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE

go.opentelemetry.io/otel/metric (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go
https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE

Expand All @@ -414,9 +330,6 @@ https://cs.opensource.google/go/x/oauth2/+/master:LICENSE
golang.org/x/term (Unspecified) - https://cs.opensource.google/go/x/term
https://cs.opensource.google/go/x/term/+/master:LICENSE

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

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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ EXPOSE 48095
# SDK initialization failed: Could not load configuration file (./res/configuration.yaml)...

ENTRYPOINT ["/app-service-configurable"]
CMD ["-cp=consul.http://edgex-core-consul:8500", "--registry"]
CMD ["-cp=keeper.http://edgex-core-keeper:59890", "--registry"]

26 changes: 7 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,21 @@ module github.com/edgexfoundry/app-service-configurable

go 1.23

require github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.57
require github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0-dev.2

require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/diegoholiveira/jsonlogic/v3 v3.5.3 // indirect
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 // indirect
github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 // indirect
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 // indirect
github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 // indirect
github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 // indirect
github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2 // 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
Expand Down Expand Up @@ -54,15 +51,8 @@ require (
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/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
Expand All @@ -81,9 +71,7 @@ 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
Expand Down
Loading

0 comments on commit b2cf19f

Please sign in to comment.