Skip to content

Commit

Permalink
Merge pull request #149 from weichou1229/upgrade-core-contracts
Browse files Browse the repository at this point in the history
build: Upgrade core-contracts and sdk
  • Loading branch information
cloudxxx8 authored Oct 18, 2024
2 parents fb1cfc1 + 3122737 commit 587b4a5
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 17 deletions.
18 changes: 18 additions & 0 deletions Attribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -452,3 +452,21 @@ https://github.com/go-jose/go-jose/blob/v2.6.3/LICENSE

spf13/cast (MIT) - https://github.com/spf13/cast
https://github.com/spf13/cast/blob/master/LICENSE

github.com/barkimedes/go-deepcopy (MIT) https://github.com/barkimedes/go-deepcopy
https://github.com/barkimedes/go-deepcopy/blob/master/LICENSE

github.com/jackc/pgerrcode (MIT) https://github.com/jackc/pgerrcode
https://github.com/jackc/pgerrcode/blob/master/LICENSE

github.com/jackc/pgpassfile (MIT) https://github.com/jackc/pgpassfile
https://github.com/jackc/pgpassfile/blob/master/LICENSE

github.com/jackc/pgservicefile (MIT) https://github.com/jackc/pgservicefile
https://github.com/jackc/pgservicefile/blob/master/LICENSE

github.com/jackc/pgx/v5 (MIT) https://github.com/jackc/pgx
https://github.com/jackc/pgx/blob/master/LICENSE

github.com/jackc/puddle/v2 (MIT) https://github.com/jackc/puddle
https://github.com/jackc/puddle/blob/master/LICENSE
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/edgexfoundry/app-record-replay
go 1.23

require (
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.55
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.57
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.50
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53
github.com/google/uuid v1.6.0
github.com/labstack/echo/v4 v4.12.0
github.com/stretchr/testify v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ github.com/diegoholiveira/jsonlogic/v3 v3.5.3 h1:CPyZQ3fOgiIDZ1yWzPGUpyht5tYTOnR
github.com/diegoholiveira/jsonlogic/v3 v3.5.3/go.mod h1:3nnfWovrlZq2rTpucrJ2KMIS8TMf6IoFneofmeqk/qk=
github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.55 h1:3kof8xNZhW+4v6q/xPHMSA6hkDllGtTui/DUwuIdcWs=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.55/go.mod h1:IqV+Elfm8R1S8x5thY+aoxuG/uULcq0Dx6Ra1lHHKlU=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.57 h1:9iFOM69SYRFa1Hu0rx8Bfof21sY89JWGdmz4wkDdqdM=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.57/go.mod h1:Xop8bNXyIWkg9eEZUWauezCR7QP6tKO1uWV9mys91UQ=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 h1:kmBEAhNi4ftrJMXM3IvEbwrRCOWUDuUOKTVAOgHnoPw=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66/go.mod h1:3IXVpc5Qez5nwFJ8IkMyJMba8Iavj620E0XB42BQzfQ=
github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 h1:274NZdVBkJBuQP6yT3tVrb7psTFuIPogX/DLQqv7OCQ=
github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19/go.mod h1:BG6hCDxXizpgMdNEljwNfLWSsd4Op7GAHd3Pis1dVv8=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.50 h1:Ho1TAQki5DN/ALdYP4YGNzj/Z/CXBXSeBancA+YHtO4=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.50/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 h1:aHnYwqpg0LcnMrgNQlkRQjzHAS/IML/9GI368OmNCz4=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk=
github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 h1:YyB21HEapV5pENG01vFlpjPI6UkmKpJuaWFfgGFVUsY=
github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40/go.mod h1:8NpZ6/eAsiyZHgn/s3DRIpcOjUrve+ZONIgvcDvA3Yg=
github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 h1:AzILZ/xcEmSYVhIwSF4zkWpXyFoBA733E/j8ttzlNnI=
Expand Down
9 changes: 4 additions & 5 deletions internal/application/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,6 @@ func TestDataManager_ImportRecordedData_DataErrors(t *testing.T) {
}

func createTestRecordedData() (dtos.RecordedData, map[string]*coreDtos.Device, map[string]*coreDtos.DeviceProfile) {
val := "hello"
expectedEvents := []coreDtos.Event{
{
Versionable: commonDTO.Versionable{},
Expand All @@ -1148,7 +1147,7 @@ func createTestRecordedData() (dtos.RecordedData, map[string]*coreDtos.Device, m
ResourceName: "R1",
ProfileName: "P1",
ValueType: "Int32",
SimpleReading: coreDtos.SimpleReading{Value: &val},
SimpleReading: coreDtos.SimpleReading{Value: "hello"},
},
},
},
Expand All @@ -1163,7 +1162,7 @@ func createTestRecordedData() (dtos.RecordedData, map[string]*coreDtos.Device, m
ResourceName: "R2",
ProfileName: "P1",
ValueType: "Int64",
SimpleReading: coreDtos.SimpleReading{Value: &val},
SimpleReading: coreDtos.SimpleReading{Value: "hello"},
},
},
},
Expand All @@ -1178,7 +1177,7 @@ func createTestRecordedData() (dtos.RecordedData, map[string]*coreDtos.Device, m
ResourceName: "R1",
ProfileName: "P1",
ValueType: "Int31",
SimpleReading: coreDtos.SimpleReading{Value: &val},
SimpleReading: coreDtos.SimpleReading{Value: "hello"},
},
},
},
Expand All @@ -1193,7 +1192,7 @@ func createTestRecordedData() (dtos.RecordedData, map[string]*coreDtos.Device, m
ResourceName: "R2",
ProfileName: "P2",
ValueType: "String",
SimpleReading: coreDtos.SimpleReading{Value: &val},
SimpleReading: coreDtos.SimpleReading{Value: "hello"},
},
},
},
Expand Down
10 changes: 4 additions & 6 deletions internal/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ func TestHttpController_CancelReplay(t *testing.T) {

func TestHttpController_ExportRecordedData(t *testing.T) {
noRecordedData := dtos.RecordedData{}
val := "1456.0"
recordedData := dtos.RecordedData{
RecordedEvents: []coreDtos.Event{
coreDtos.Event{
Expand All @@ -395,7 +394,7 @@ func TestHttpController_ExportRecordedData(t *testing.T) {
Readings: []coreDtos.BaseReading{
coreDtos.BaseReading{
SimpleReading: coreDtos.SimpleReading{
Value: &val,
Value: "1456.0",
},
},
},
Expand All @@ -406,7 +405,7 @@ func TestHttpController_ExportRecordedData(t *testing.T) {
Readings: []coreDtos.BaseReading{
coreDtos.BaseReading{
SimpleReading: coreDtos.SimpleReading{
Value: &val,
Value: "1456.0",
},
},
},
Expand Down Expand Up @@ -507,7 +506,6 @@ func TestHttpController_ExportRecordedData(t *testing.T) {

func TestHttpController_ImportRecordedData(t *testing.T) {
emptyDataRequest := dtos.RecordedData{}
val := "1456.0"
recordedEventRequest := dtos.RecordedData{
RecordedEvents: []coreDtos.Event{
coreDtos.Event{
Expand All @@ -516,7 +514,7 @@ func TestHttpController_ImportRecordedData(t *testing.T) {
Readings: []coreDtos.BaseReading{
coreDtos.BaseReading{
SimpleReading: coreDtos.SimpleReading{
Value: &val,
Value: "1456.0",
},
},
},
Expand All @@ -527,7 +525,7 @@ func TestHttpController_ImportRecordedData(t *testing.T) {
Readings: []coreDtos.BaseReading{
coreDtos.BaseReading{
SimpleReading: coreDtos.SimpleReading{
Value: &val,
Value: "1456.0",
},
},
},
Expand Down

0 comments on commit 587b4a5

Please sign in to comment.