From dddb97548bec85db192f293d99ac6585ca10faad Mon Sep 17 00:00:00 2001 From: Lenny Goodell Date: Mon, 23 Jan 2023 13:48:17 -0700 Subject: [PATCH] refactor: Update to latest core contracts and fix tests (#1275) Signed-off-by: Leonard Goodell Signed-off-by: Leonard Goodell --- app-service-template/Attribution.txt | 5 +++++ app-service-template/go.mod | 2 +- app-service-template/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/transforms/tags_test.go | 4 ++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app-service-template/Attribution.txt b/app-service-template/Attribution.txt index d041838c4..b90a87cc5 100644 --- a/app-service-template/Attribution.txt +++ b/app-service-template/Attribution.txt @@ -219,3 +219,8 @@ https://github.com/nats-io/nkeys/blob/master/LICENSE github.com/nats-io/nuid (Apache-2.0) https://github.com/nats-io/nuid https://github.com/nats-io/nuid/blob/master/LICENSE +golang.org/x/mod (BSD-3) https://github.com/golang/mod +https://github.com/golang/mod/blob/master/LICENSE + +golang.org/x/tools (BSD-3) https://github.com/golang/tools +https://github.com/golang/tools/blob/master/LICENSE diff --git a/app-service-template/go.mod b/app-service-template/go.mod index bb8106adc..1e5e21fce 100644 --- a/app-service-template/go.mod +++ b/app-service-template/go.mod @@ -10,7 +10,7 @@ replace github.com/edgexfoundry/app-functions-sdk-go/v3 => ../ require ( github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.9 - github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4 + github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6 github.com/google/uuid v1.3.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.8.1 diff --git a/app-service-template/go.sum b/app-service-template/go.sum index d12c88ed7..4f5af966a 100644 --- a/app-service-template/go.sum +++ b/app-service-template/go.sum @@ -34,8 +34,8 @@ github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.11 h1:PHkcIC9hwOG2XyumsdO github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.11/go.mod h1:UjrW9GZ5UjKZLF1EzEtAjvrgOvgQz3FGyVyAAX+fXW4= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4 h1:J1G1Fd0wKsr2FNqansSOvfErvUrYanR/9tKbp0VpcRo= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6 h1:RQFs/HjVOi1X3YxJ8sm4vuX8nhKgH0caSf9RtjQvdeI= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.4 h1:swPZOjoQ/IUIWSJpZCmQENtP/plFRx5tgiCEZgnfxFU= github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.4/go.mod h1:8pxuYvh2zcq1GuKqmk1MAuH1yuN40iOMmL0g2myIfwk= github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 h1:QgZF9f70Cwpvkjw3tP1aiVGHc+yNFJNzW6hO8pDs3fg= diff --git a/go.mod b/go.mod index 91f70a625..2848f05e0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/diegoholiveira/jsonlogic/v3 v3.2.6 github.com/eclipse/paho.mqtt.golang v1.4.2 github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.11 - github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4 + github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6 github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.4 github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 github.com/fxamacker/cbor/v2 v2.4.0 diff --git a/go.sum b/go.sum index 1b102826b..63da10845 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.11 h1:PHkcIC9hwOG2XyumsdO github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.11/go.mod h1:UjrW9GZ5UjKZLF1EzEtAjvrgOvgQz3FGyVyAAX+fXW4= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4 h1:J1G1Fd0wKsr2FNqansSOvfErvUrYanR/9tKbp0VpcRo= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.4/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6 h1:RQFs/HjVOi1X3YxJ8sm4vuX8nhKgH0caSf9RtjQvdeI= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.6/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.4 h1:swPZOjoQ/IUIWSJpZCmQENtP/plFRx5tgiCEZgnfxFU= github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.4/go.mod h1:8pxuYvh2zcq1GuKqmk1MAuH1yuN40iOMmL0g2myIfwk= github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 h1:QgZF9f70Cwpvkjw3tP1aiVGHc+yNFJNzW6hO8pDs3fg= diff --git a/pkg/transforms/tags_test.go b/pkg/transforms/tags_test.go index fce122618..5aab271a2 100644 --- a/pkg/transforms/tags_test.go +++ b/pkg/transforms/tags_test.go @@ -53,8 +53,8 @@ func TestTags_AddTags(t *testing.T) { tests := []struct { Name string FunctionInput interface{} - TagsToAdd map[string]interface{} - Expected map[string]interface{} + TagsToAdd dtos.Tags + Expected dtos.Tags ErrorExpected bool ErrorContains string }{