Skip to content

Commit a42c1ef

Browse files
authored
Merge pull request #811 from weichou1229/v4-module
refactor!: update to v4 module
2 parents 850fdf7 + 5af3fa0 commit a42c1ef

File tree

19 files changed

+391
-401
lines changed

19 files changed

+391
-401
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ updates:
66
schedule:
77
interval: "daily"
88
ignore:
9-
- dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/v3"
9+
- dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/*"
1010
# Included when go-mod-bootstrap is updated
11-
- dependency-name: "github.com/edgexfoundry/go-mod-messaging/v3"
11+
- dependency-name: "github.com/edgexfoundry/go-mod-messaging/*"
1212
# Included when go-mod-bootstrap is updated
13-
- dependency-name: "github.com/edgexfoundry/go-mod-registry/v3"
13+
- dependency-name: "github.com/edgexfoundry/go-mod-registry/*"
1414
# Included when go-mod-bootstrap is updated

Attribution.txt

Lines changed: 204 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ https://github.com/armon/go-metrics/blob/master/LICENSE
66
cenkalti/backoff (MIT) https://github.com/cenkalti/backoff
77
https://github.com/cenkalti/backoff/blob/master/LICENSE
88

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

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

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

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

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

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

2727
github.com/Microsoft/go-winio (MIT) https://github.com/Microsoft/go-winio
@@ -186,7 +186,7 @@ https://github.com/go-kit/log/blob/master/LICENSE
186186
eclipse/paho.mqtt.golang (Eclipse Public License 2.0) https://github.com/eclipse/paho.mqtt.golang
187187
https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE
188188

189-
github.com/go-jose/go-jose/v3 (Apache-2.0) https://github.com/go-jose/go-jose
189+
github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose
190190
https://github.com/go-jose/go-jose/blob/v3/LICENSE
191191

192192
github.com/klauspost/compress (Apache-2.0) https://github.com/klauspost/compress
@@ -218,3 +218,200 @@ https://github.com/golang-jwt/jwt/blob/main/LICENSE
218218

219219
google.golang.org/genproto/googleapis/rpc (Apache-2.0) https://pkg.go.dev/google.golang.org/genproto
220220
https://pkg.go.dev/google.golang.org/genproto?tab=licenses
221+
222+
nhooyr.io/websocket (ISC License) - https://github.com/nhooyr/websocket
223+
https://github.com/nhooyr/websocket/blob/master/LICENSE.txt
224+
225+
gopkg.in/go-jose/go-jose.v2 (Apache 2.0) - https://github.com/go-jose/go-jose
226+
https://github.com/go-jose/go-jose/blob/v2.6.3/LICENSE
227+
228+
golang.org/x/oauth2 (Unspecified) - https://cs.opensource.google/go/x/oauth2
229+
https://cs.opensource.google/go/x/oauth2/+/master:LICENSE
230+
231+
go.opentelemetry.io/otel (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go
232+
https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE
233+
234+
go.opentelemetry.io/otel/metric (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go
235+
https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE
236+
237+
go.opentelemetry.io/otel/trace (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go
238+
https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE
239+
240+
golang.org/x/term (Unspecified) - https://cs.opensource.google/go/x/term
241+
https://cs.opensource.google/go/x/term/+/master:LICENSE
242+
243+
github.com/fullsailor/pkcs7 (MIT) - https://github.com/fullsailor/pkcs7
244+
https://github.com/fullsailor/pkcs7/blob/master/LICENSE
245+
246+
go.mozilla.org/pkcs7 (MIT) - https://github.com/mozilla-services/pkcs7
247+
https://github.com/mozilla-services/pkcs7/blob/master/LICENSE
248+
249+
github.com/zitadel/oidc/v2 (Apache 2.0) - https://github.com/zitadel/oidc
250+
https://github.com/zitadel/oidc/blob/main/LICENSE
251+
252+
github.com/tklauser/go-sysconf (BSD-3) - https://github.com/tklauser/go-sysconf
253+
https://github.com/tklauser/go-sysconf/blob/main/LICENSE
254+
255+
github.com/tklauser/numcpus (Apache 2.0) - https://github.com/tklauser/numcpus
256+
https://github.com/tklauser/numcpus/blob/main/LICENSE
257+
258+
github.com/speps/go-hashids (MIT) - https://github.com/speps/go-hashids
259+
https://github.com/speps/go-hashids/blob/master/LICENSE
260+
261+
spf13/cast (MIT) - https://github.com/spf13/cast
262+
https://github.com/spf13/cast/blob/master/LICENSE
263+
264+
github.com/openziti/channel/v3 (Apache 2.0) - github.com/openziti/channel/v3
265+
https://github.com/openziti/channel/blob/main/LICENSE
266+
267+
github.com/openziti/edge-api (Apache 2.0) - https://github.com/openziti/edge-api
268+
https://github.com/openziti/edge-api/blob/main/LICENSE
269+
270+
github.com/openziti/foundation/v2 (Apache 2.0) - https://github.com/openziti/foundation
271+
https://github.com/openziti/foundation/blob/main/LICENSE
272+
273+
github.com/openziti/identity (Apache 2.0) - https://github.com/openziti/identity
274+
https://github.com/openziti/identity/blob/main/LICENSE
275+
276+
github.com/openziti/metrics (Apache 2.0) - https://github.com/openziti/metrics
277+
https://github.com/openziti/metrics/blob/main/LICENSE
278+
279+
github.com/openziti/sdk-golang (Apache 2.0) - https://github.com/openziti/sdk-golang
280+
https://github.com/openziti/sdk-golang/blob/main/LICENSE
281+
282+
github.com/openziti/secretstream (MIT) - https://github.com/openziti/secretstream
283+
https://github.com/openziti/secretstream/blob/main/LICENSE
284+
285+
github.com/openziti/transport/v2 (Apache 2.0) - https://github.com/openziti/transport
286+
https://github.com/openziti/transport/blob/main/LICENSE
287+
288+
github.com/go-openapi/analysis (Apache 2.0) - https://github.com/go-openapi/analysis
289+
https://github.com/go-openapi/analysis/blob/master/LICENSE
290+
291+
github.com/go-openapi/errors (Apache 2.0) - https://github.com/go-openapi/errors
292+
https://github.com/go-openapi/errors/blob/master/LICENSE
293+
294+
github.com/go-openapi/jsonpointer (Apache 2.0) - https://github.com/go-openapi/jsonpointer
295+
https://github.com/go-openapi/jsonpointer/blob/master/LICENSE
296+
297+
github.com/go-openapi/jsonreference (Apache 2.0) - https://github.com/go-openapi/jsonreference
298+
https://github.com/go-openapi/jsonreference/blob/master/LICENSE
299+
300+
github.com/go-openapi/loads (Apache 2.0) - https://github.com/go-openapi/loads
301+
https://github.com/go-openapi/loads/blob/master/LICENSE
302+
303+
github.com/go-openapi/runtime (Apache 2.0) - https://github.com/go-openapi/runtime
304+
https://github.com/go-openapi/runtime/blob/master/LICENSE
305+
306+
github.com/go-openapi/spec (Apache 2.0) - https://github.com/go-openapi/spec
307+
https://github.com/go-openapi/spec/blob/master/LICENSE
308+
309+
github.com/go-openapi/strfmt (Apache 2.0) - https://github.com/go-openapi/strfmt
310+
https://github.com/go-openapi/strfmt/blob/master/LICENSE
311+
312+
github.com/go-openapi/swag (Apache 2.0) - https://github.com/go-openapi/swag
313+
https://github.com/go-openapi/swag/blob/master/LICENSE
314+
315+
github.com/go-openapi/validate (Apache 2.0) - https://github.com/go-openapi/validate
316+
https://github.com/go-openapi/validate/blob/master/LICENSE
317+
318+
319+
github.com/go-logr/logr (Apache 2.0) - https://github.com/go-logr/logr
320+
https://github.com/go-logr/logr/blob/master/LICENSE
321+
322+
github.com/go-logr/stdr (Apache 2.0) - https://github.com/go-logr/stdr
323+
https://github.com/go-logr/stdr/blob/master/LICENSE
324+
325+
github.com/asaskevich/govalidator (MIT) - https://github.com/asaskevich/govalidator
326+
https://github.com/asaskevich/govalidator/blob/master/LICENSE
327+
328+
github.com/cenkalti/backoff/v4 (MIT) - https://github.com/cenkalti/backoff
329+
https://github.com/cenkalti/backoff/blob/v4/LICENSE
330+
331+
github.com/fsnotify/fsnotify (BSD-3) - REPOURL
332+
https://github.com/fsnotify/fsnotify/blob/main/LICENSE
333+
334+
github.com/go-ole/go-ole (MIT) - https://github.com/go-ole/go-ole
335+
https://github.com/go-ole/go-ole/blob/master/LICENSE
336+
337+
338+
github.com/go-resty/resty/v2 (MIT) - https://github.com/go-resty/resty
339+
https://github.com/go-resty/resty/blob/v2/LICENSE
340+
341+
github.com/golang-jwt/jwt/v5 (MIT) - https://github.com/golang-jwt/jwt/v5
342+
https://github.com/golang-jwt/jwt/blob/main/LICENSE
343+
344+
hashicorp/go-multierror (Mozilla Public License 2.0) https://github.com/hashicorp/go-multierror
345+
https://github.com/hashicorp/go-multierror/blob/master/LICENSE
346+
347+
github.com/oklog/ulid (Apache 2.0) - https://github.com/oklog/ulid
348+
https://github.com/oklog/ulid/blob/main/LICENSE
349+
350+
github.com/opentracing/opentracing-go (Apache 2.0) - https://github.com/opentracing/opentracing-go
351+
https://github.com/opentracing/opentracing-go/blob/master/LICENSE
352+
353+
github.com/orcaman/concurrent-map/v2 (MIT) - https://github.com/orcaman/concurrent-map
354+
https://github.com/orcaman/concurrent-map/blob/master/LICENSE
355+
356+
github.com/parallaxsecond/parsec-client-go (Apache 2.0) - https://github.com/parallaxsecond/parsec-client-go
357+
https://github.com/parallaxsecond/parsec-client-go/blob/main/LICENSE
358+
359+
github.com/pkg/errors (BSD-2) - https://github.com/pkg/errors
360+
https://github.com/pkg/errors/blob/master/LICENSE
361+
362+
github.com/shirou/gopsutil/v3 (BSD) - https://github.com/shirou/gopsutil
363+
https://github.com/shirou/gopsutil/blob/master/LICENSE
364+
365+
github.com/shoenig/go-m1cpu (Mozilla Public License 2.0) - https://github.com/shoenig/go-m1cpu
366+
https://github.com/shoenig/go-m1cpu/blob/main/LICENSE
367+
368+
github.com/sirupsen/logrus (MIT) - https://github.com/sirupsen/logrus
369+
https://github.com/sirupsen/logrus/blob/master/LICENSE
370+
371+
go.mongodb.org/mongo-driver (Apache 2.0) - https://github.com/mongodb/mongo-go-driver
372+
https://github.com/mongodb/mongo-go-driver/blob/v1/LICENSE
373+
374+
github.com/yusufpapurcu/wmi (MIT) - https://github.com/yusufpapurcu/wmi
375+
https://github.com/yusufpapurcu/wmi/blob/master/LICENSE
376+
377+
github.com/power-devops/perfstat (MIT) - https://github.com/power-devops/perfstat
378+
https://github.com/power-devops/perfstat/blob/main/LICENSE
379+
380+
github.com/mgutz/ansi (MIT) - https://github.com/mgutz/ansi
381+
https://github.com/mgutz/ansi/blob/master/LICENSE
382+
383+
github.com/michaelquigley/pfxlog (MIT) - https://github.com/michaelquigley/pfxlog
384+
https://github.com/michaelquigley/pfxlog/blob/main/LICENSE
385+
386+
github.com/miekg/pkcs11 (BSD-3) - https://github.com/miekg/pkcs11
387+
https://github.com/miekg/pkcs11/blob/master/LICENSE
388+
389+
github.com/gorilla/schema (BSD-3) - https://github.com/gorilla/schema
390+
https://github.com/gorilla/schema/blob/main/LICENSE
391+
392+
github.com/gorilla/securecookie (BSD-3) - https://github.com/gorilla/securecookie
393+
https://github.com/gorilla/securecookie/blob/main/LICENSE
394+
395+
github.com/mailru/easyjson (MIT) - https://github.com/mailru/easyjson
396+
https://github.com/mailru/easyjson/blob/master/LICENSE
397+
398+
github.com/josharian/intern (MIT) - https://github.com/josharian/intern
399+
https://github.com/josharian/intern/blob/master/LICENSE.md
400+
401+
github.com/kataras/go-events (MIT) - https://github.com/kataras/go-events
402+
https://github.com/kataras/go-events/blob/master/LICENSE
403+
404+
github.com/lufia/plan9stats (BSD-3) - https://github.com/lufia/plan9stats
405+
https://github.com/lufia/plan9stats/blob/main/LICENSE
406+
407+
github.com/josharian/intern (MIT) - https://github.com/josharian/intern
408+
https://github.com/josharian/intern/blob/master/LICENSE.md
409+
410+
github.com/kataras/go-events (MIT) - https://github.com/kataras/go-events
411+
https://github.com/kataras/go-events/blob/master/LICENSE
412+
413+
github.com/mitchellh/go-ps (MIT) - https://github.com/mitchellh/go-ps
414+
https://github.com/mitchellh/go-ps/blob/master/LICENSE.md
415+
416+
github.com/muhlemmer/gu (The Unlicense) - https://github.com/muhlemmer/gu
417+
https://github.com/muhlemmer/gu/blob/main/LICENSE

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
ARG BASE=golang:1.21-alpine3.18
18+
ARG BASE=golang:1.23-alpine3.20
1919
FROM ${BASE} AS builder
2020

2121
ARG MAKE="make cmd/edgex-ui-server/edgex-ui-server"
@@ -41,7 +41,7 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
4141
COPY . .
4242
RUN ${MAKE}
4343

44-
FROM alpine:3.18
44+
FROM alpine:3.20
4545

4646
# Ensure using latest versions of all installed packages to avoid any recent CVEs
4747
RUN apk --no-cache upgrade

cmd/edgex-ui-server/res/configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Clients:
2222
core-metadata:
2323
Protocol: http
2424
Host: localhost
25-
Port: 80
25+
Port: 59881
2626
SecurityOptions:
2727
Mode: ""
2828
OpenZitiController: "openziti:1280"

0 commit comments

Comments
 (0)