From aa403f22a201a0ec1330a2797e95b54e99ed5b8a Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Fri, 15 Dec 2023 16:58:16 +0100 Subject: [PATCH] Reference EVE API from the new lf-edge/eve-api repo This also updates EVE API to the latest commit. Signed-off-by: Milan Lenco --- go.mod | 2 +- go.sum | 4 ++-- pkg/driver/common/common.go | 8 ++++---- pkg/driver/file/device_manager_file.go | 2 +- pkg/driver/file/device_manager_file_test.go | 6 +++--- pkg/driver/memory/device_manager_memory.go | 2 +- pkg/driver/memory/device_manager_memory_test.go | 6 +++--- pkg/driver/redis/device_manager_redis.go | 2 +- pkg/driver/redis/device_manager_redis_test.go | 8 ++++---- pkg/server/adminHandler.go | 4 ++-- pkg/server/apiHandler.go | 2 +- pkg/server/apiHandlerv2.go | 10 +++++----- pkg/server/attestation.go | 4 ++-- pkg/server/commonHandler.go | 6 +++--- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 63363c1..f950afa 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/go-tpm v0.3.3 github.com/gorilla/mux v1.7.2 github.com/kr/text v0.2.0 // indirect - github.com/lf-edge/eve/api/go v0.0.0-20230612203304-13fba79dd3af + github.com/lf-edge/eve-api/go v0.0.0-20231214160111-99ce4e43be4b github.com/magiconair/properties v1.8.4 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect diff --git a/go.sum b/go.sum index 7af6c37..e96af31 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lf-edge/eve/api/go v0.0.0-20230612203304-13fba79dd3af h1:iBKOntuGhmehPjllZeb52wqA9yeGLais/PnUdzD367Y= -github.com/lf-edge/eve/api/go v0.0.0-20230612203304-13fba79dd3af/go.mod h1:pNFho84HAA/Vlb1DpLFlatJgQBJ43wH28elAs7wXdtA= +github.com/lf-edge/eve-api/go v0.0.0-20231214160111-99ce4e43be4b h1:uxB8HRp0NgOf8tb9nSoVEcMOo8TQ8YdohfSX+q91vnI= +github.com/lf-edge/eve-api/go v0.0.0-20231214160111-99ce4e43be4b/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= diff --git a/pkg/driver/common/common.go b/pkg/driver/common/common.go index 8486289..da0fe31 100644 --- a/pkg/driver/common/common.go +++ b/pkg/driver/common/common.go @@ -11,10 +11,10 @@ import ( "io" "time" - "github.com/lf-edge/eve/api/go/attest" - "github.com/lf-edge/eve/api/go/certs" - "github.com/lf-edge/eve/api/go/config" - "github.com/lf-edge/eve/api/go/logs" + "github.com/lf-edge/eve-api/go/attest" + "github.com/lf-edge/eve-api/go/certs" + "github.com/lf-edge/eve-api/go/config" + "github.com/lf-edge/eve-api/go/logs" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/pkg/driver/file/device_manager_file.go b/pkg/driver/file/device_manager_file.go index a347609..a1cba01 100644 --- a/pkg/driver/file/device_manager_file.go +++ b/pkg/driver/file/device_manager_file.go @@ -22,7 +22,7 @@ import ( "github.com/lf-edge/adam/pkg/driver/common" "github.com/lf-edge/adam/pkg/util" ax "github.com/lf-edge/adam/pkg/x509" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/proto" ) diff --git a/pkg/driver/file/device_manager_file_test.go b/pkg/driver/file/device_manager_file_test.go index 434e0c3..32262fe 100644 --- a/pkg/driver/file/device_manager_file_test.go +++ b/pkg/driver/file/device_manager_file_test.go @@ -18,9 +18,9 @@ import ( "github.com/lf-edge/adam/pkg/driver/common" "github.com/lf-edge/adam/pkg/util" ax "github.com/lf-edge/adam/pkg/x509" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" - "github.com/lf-edge/eve/api/go/info" - "github.com/lf-edge/eve/api/go/metrics" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" + "github.com/lf-edge/eve-api/go/info" + "github.com/lf-edge/eve-api/go/metrics" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/proto" ) diff --git a/pkg/driver/memory/device_manager_memory.go b/pkg/driver/memory/device_manager_memory.go index 008340c..f2bc18e 100644 --- a/pkg/driver/memory/device_manager_memory.go +++ b/pkg/driver/memory/device_manager_memory.go @@ -9,7 +9,7 @@ import ( "crypto/x509" "fmt" "github.com/lf-edge/adam/pkg/driver/common" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/proto" ) diff --git a/pkg/driver/memory/device_manager_memory_test.go b/pkg/driver/memory/device_manager_memory_test.go index 2c92986..24d2048 100644 --- a/pkg/driver/memory/device_manager_memory_test.go +++ b/pkg/driver/memory/device_manager_memory_test.go @@ -14,9 +14,9 @@ import ( "github.com/lf-edge/adam/pkg/driver/common" ax "github.com/lf-edge/adam/pkg/x509" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" - "github.com/lf-edge/eve/api/go/info" - "github.com/lf-edge/eve/api/go/metrics" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" + "github.com/lf-edge/eve-api/go/info" + "github.com/lf-edge/eve-api/go/metrics" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/pkg/driver/redis/device_manager_redis.go b/pkg/driver/redis/device_manager_redis.go index 01ef780..7f51e12 100644 --- a/pkg/driver/redis/device_manager_redis.go +++ b/pkg/driver/redis/device_manager_redis.go @@ -19,7 +19,7 @@ import ( "github.com/go-redis/redis" "github.com/lf-edge/adam/pkg/driver/common" ax "github.com/lf-edge/adam/pkg/x509" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" uuid "github.com/satori/go.uuid" "github.com/vmihailenco/msgpack/v4" "google.golang.org/protobuf/proto" diff --git a/pkg/driver/redis/device_manager_redis_test.go b/pkg/driver/redis/device_manager_redis_test.go index fc164f2..a20b6da 100644 --- a/pkg/driver/redis/device_manager_redis_test.go +++ b/pkg/driver/redis/device_manager_redis_test.go @@ -10,10 +10,10 @@ import ( "github.com/lf-edge/adam/pkg/driver/common" "github.com/lf-edge/adam/pkg/util" ax "github.com/lf-edge/adam/pkg/x509" - "github.com/lf-edge/eve/api/go/config" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" - "github.com/lf-edge/eve/api/go/info" - "github.com/lf-edge/eve/api/go/metrics" + "github.com/lf-edge/eve-api/go/config" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" + "github.com/lf-edge/eve-api/go/info" + "github.com/lf-edge/eve-api/go/metrics" uuid "github.com/satori/go.uuid" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/encoding/protojson" diff --git a/pkg/server/adminHandler.go b/pkg/server/adminHandler.go index e3f6e7a..da196ee 100644 --- a/pkg/server/adminHandler.go +++ b/pkg/server/adminHandler.go @@ -18,8 +18,8 @@ import ( "github.com/lf-edge/adam/pkg/driver" "github.com/lf-edge/adam/pkg/driver/common" ax "github.com/lf-edge/adam/pkg/x509" - "github.com/lf-edge/eve/api/go/config" - "github.com/lf-edge/eve/api/go/info" + "github.com/lf-edge/eve-api/go/config" + "github.com/lf-edge/eve-api/go/info" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/pkg/server/apiHandler.go b/pkg/server/apiHandler.go index 59735bd..76af126 100644 --- a/pkg/server/apiHandler.go +++ b/pkg/server/apiHandler.go @@ -13,7 +13,7 @@ import ( "github.com/gorilla/mux" "github.com/lf-edge/adam/pkg/driver" "github.com/lf-edge/adam/pkg/driver/common" - "github.com/lf-edge/eve/api/go/config" + "github.com/lf-edge/eve-api/go/config" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/proto" ) diff --git a/pkg/server/apiHandlerv2.go b/pkg/server/apiHandlerv2.go index 2cbeabf..c0f2cba 100644 --- a/pkg/server/apiHandlerv2.go +++ b/pkg/server/apiHandlerv2.go @@ -30,11 +30,11 @@ import ( "github.com/lf-edge/adam/pkg/driver" "github.com/lf-edge/adam/pkg/driver/common" x509Pem "github.com/lf-edge/adam/pkg/x509" - "github.com/lf-edge/eve/api/go/auth" - "github.com/lf-edge/eve/api/go/certs" - "github.com/lf-edge/eve/api/go/config" - "github.com/lf-edge/eve/api/go/evecommon" - eveuuid "github.com/lf-edge/eve/api/go/eveuuid" + "github.com/lf-edge/eve-api/go/auth" + "github.com/lf-edge/eve-api/go/certs" + "github.com/lf-edge/eve-api/go/config" + "github.com/lf-edge/eve-api/go/evecommon" + eveuuid "github.com/lf-edge/eve-api/go/eveuuid" uuid "github.com/satori/go.uuid" ) diff --git a/pkg/server/attestation.go b/pkg/server/attestation.go index 3b09fc2..e06036e 100644 --- a/pkg/server/attestation.go +++ b/pkg/server/attestation.go @@ -18,8 +18,8 @@ import ( "github.com/lf-edge/adam/pkg/driver" "github.com/lf-edge/adam/pkg/driver/common" x509Pem "github.com/lf-edge/adam/pkg/x509" - "github.com/lf-edge/eve/api/go/attest" - "github.com/lf-edge/eve/api/go/certs" + "github.com/lf-edge/eve-api/go/attest" + "github.com/lf-edge/eve-api/go/certs" uuid "github.com/satori/go.uuid" ) diff --git a/pkg/server/commonHandler.go b/pkg/server/commonHandler.go index b74a852..a06c9b5 100644 --- a/pkg/server/commonHandler.go +++ b/pkg/server/commonHandler.go @@ -24,9 +24,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/lf-edge/adam/pkg/driver" "github.com/lf-edge/adam/pkg/driver/common" - "github.com/lf-edge/eve/api/go/config" - "github.com/lf-edge/eve/api/go/logs" - "github.com/lf-edge/eve/api/go/register" + "github.com/lf-edge/eve-api/go/config" + "github.com/lf-edge/eve-api/go/logs" + "github.com/lf-edge/eve-api/go/register" uuid "github.com/satori/go.uuid" "google.golang.org/protobuf/encoding/protojson" )