From 3122737150792d1db66637461d446b3c7de78dbd Mon Sep 17 00:00:00 2001 From: bruce Date: Fri, 18 Oct 2024 20:18:28 +0800 Subject: [PATCH] build: Upgrade core-contracts and sdk Upgrade core-contracts to v3.2.0-dev.53 and sdk to v3.2.0-dev.57 Signed-off-by: bruce --- Attribution.txt | 18 ++++++++++++++++++ go.mod | 4 ++-- go.sum | 8 ++++---- internal/application/manager_test.go | 9 ++++----- internal/controller/controller_test.go | 10 ++++------ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Attribution.txt b/Attribution.txt index 0a5de5d..6d7f3b8 100644 --- a/Attribution.txt +++ b/Attribution.txt @@ -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 diff --git a/go.mod b/go.mod index ac21a97..6d0f0d2 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index c486bef..cc81770 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/application/manager_test.go b/internal/application/manager_test.go index c35f9a2..87f0576 100644 --- a/internal/application/manager_test.go +++ b/internal/application/manager_test.go @@ -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{}, @@ -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"}, }, }, }, @@ -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"}, }, }, }, @@ -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"}, }, }, }, @@ -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"}, }, }, }, diff --git a/internal/controller/controller_test.go b/internal/controller/controller_test.go index dd818f2..4b072ee 100644 --- a/internal/controller/controller_test.go +++ b/internal/controller/controller_test.go @@ -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{ @@ -395,7 +394,7 @@ func TestHttpController_ExportRecordedData(t *testing.T) { Readings: []coreDtos.BaseReading{ coreDtos.BaseReading{ SimpleReading: coreDtos.SimpleReading{ - Value: &val, + Value: "1456.0", }, }, }, @@ -406,7 +405,7 @@ func TestHttpController_ExportRecordedData(t *testing.T) { Readings: []coreDtos.BaseReading{ coreDtos.BaseReading{ SimpleReading: coreDtos.SimpleReading{ - Value: &val, + Value: "1456.0", }, }, }, @@ -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{ @@ -516,7 +514,7 @@ func TestHttpController_ImportRecordedData(t *testing.T) { Readings: []coreDtos.BaseReading{ coreDtos.BaseReading{ SimpleReading: coreDtos.SimpleReading{ - Value: &val, + Value: "1456.0", }, }, }, @@ -527,7 +525,7 @@ func TestHttpController_ImportRecordedData(t *testing.T) { Readings: []coreDtos.BaseReading{ coreDtos.BaseReading{ SimpleReading: coreDtos.SimpleReading{ - Value: &val, + Value: "1456.0", }, }, },