Switch machine-id implementation (#4568)

This commit is contained in:
andig 2022-09-24 13:43:14 +02:00 • committed by GitHub
parent c914d04e94
commit 8d09e4e423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions

3
go.mod
View file

@ -19,7 +19,6 @@ require (
github.com/containrrr/shoutrrr v0.6.1
github.com/coreos/go-oidc/v3 v3.3.0
github.com/deepmap/oapi-codegen v1.11.0
github.com/denisbrodbeck/machineid v1.0.1
github.com/dmarkham/enumer v1.5.6
github.com/dustin/go-humanize v1.0.0
github.com/dylanmei/iso8601 v0.1.0
@ -63,6 +62,7 @@ require (
github.com/nicksnyder/go-i18n/v2 v2.2.0
github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20220510032225-4f9f17eaec4c
github.com/olekukonko/tablewriter v0.0.5
github.com/panta/machineid v1.0.1
github.com/philippseith/signalr v0.6.1-0.20220829124759-bd5ffb679356
github.com/prometheus/client_golang v1.13.0
github.com/prometheus/common v0.37.0
@ -101,6 +101,7 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denisbrodbeck/machineid v1.0.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect

2
go.sum
View file

@ -693,6 +693,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/panta/machineid v1.0.1 h1:IUIF47trYWR813A3cO/MnTEpesPFOhvejyauCGh1KI0=
github.com/panta/machineid v1.0.1/go.mod h1:JXdlT3pyUqvDz7Pf1VeU2hRa1DIfOu0zBrj+xSvVbDg=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/name v1.0.0/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM=
github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0=

View file

@ -11,10 +11,10 @@ import (
"github.com/evcc-io/evcc/hems/ocpp/profile"
"github.com/evcc-io/evcc/util"
"github.com/denisbrodbeck/machineid"
ocpp16 "github.com/lorenzodonini/ocpp-go/ocpp1.6"
ocppcore "github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
"github.com/lorenzodonini/ocpp-go/ws"
"github.com/panta/machineid"
)
// OCPP is an OCPP client

View file

@ -12,7 +12,6 @@ import (
"strings"
"time"
"github.com/denisbrodbeck/machineid"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/core/loadpoint"
"github.com/evcc-io/evcc/core/site"
@ -21,6 +20,7 @@ import (
"github.com/google/uuid"
"github.com/gorilla/mux"
"github.com/koron/go-ssdp"
"github.com/panta/machineid"
)
const (