Skip to content

Commit

Permalink
Merge pull request lf-edge#121 from milan-zededa/eve-api
Browse files Browse the repository at this point in the history 
Reference EVE API from the new lf-edge/eve-api repo
  • Loading branch information
@deitch
deitch authored Dec 17, 2023
2 parents 7d4f2ac + aa403f2 commit 9f6fca2
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
8 changes: 4 additions & 4 deletions pkg/driver/common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/file/device_manager_file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/driver/file/device_manager_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/memory/device_manager_memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/driver/memory/device_manager_memory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/redis/device_manager_redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions pkg/driver/redis/device_manager_redis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/adminHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/apiHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions pkg/server/apiHandlerv2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/server/attestation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/server/commonHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down

0 comments on commit 9f6fca2

Please sign in to comment.