feat: Edgex 3.0 update (#175)

* refactor: Migrate Edgex compose to 3.0 closes #121 Signed-off-by: Leonard Goodell <[email protected]> * feat(ms-authentication): Update ms-authentication service to EdgeX v3.0 (#126) * feat(ms-authentication): Update ms-authentication service to EdgeX v3.0 --------- Signed-off-by: Sean O'Hair <[email protected]> * feat: Migrate device-mqtt service files and add ENV overrides for mqtt topics (#128) Signed-off-by: Sean O'Hair <[email protected]> * feat: Migrate as-vending microservice to EdgeX 3.0 (#139) * feat: Migrate as-vending microservice to EdgeX 3.0 Signed-off-by: Brian McGinn <[email protected]> --------- Signed-off-by: Brian McGinn <[email protected]> Co-authored-by: Lenny Goodell <[email protected]> Co-authored-by: Jim Wang @ Intel <[email protected]> * feat: update as controller board to use EdgeX-3.0 (#140) * feat: update as controller board to use EdgeX-3.0 * fix: remove build tags related to no_zmq for tests * fix: change automated checkout wording to automated vending for as-controller board * fix: add the missing support-notification client config in configuration yaml file Signed-off-by: Jim Wang <[email protected]> --------- Signed-off-by: Jim Wang <[email protected]> * feat: Migrate ms-ledger microservice to EdgeX 3.0 (#141) * feat: Migrate ms-ledger microservice to EdgeX 3.0 Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: Migration changes in docker-compose Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: removed zmq references Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: change image name in trivyimagescan Signed-off-by: Neethu Elizabeth Simon <[email protected]> --------- Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: update ds-card-reader to use EdgeX-3.0 (#144) * feat: update ds-card-reader to use EdgeX-3.0 Closes: #133 Signed-off-by: Valina Li <[email protected]> * feat: Migrate ds-controller microservice to EdgeX 3.0 (#145) * feat: Migrate ds-controller to EdgeX 3.0 Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: handle hadolint + remove zeromq Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: add hadolint flag Signed-off-by: Neethu Elizabeth Simon <[email protected]> * feat: changed devicelist toml to yaml Signed-off-by: Neethu Elizabeth Simon <[email protected]> * fix: typo Signed-off-by: Neethu Elizabeth Simon <[email protected]> * fix: change device-list in dockerfile Signed-off-by: Neethu Elizabeth Simon <[email protected]> * fix: yaml indentation Signed-off-by: Neethu Elizabeth Simon <[email protected]> --------- Signed-off-by: Neethu Elizabeth Simon <[email protected]> * build: Upgrade portianer to CE version closes #136 Signed-off-by: Leonard Goodell <[email protected]> * feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0 (#130) * feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0 --------- Signed-off-by: Sean O'Hair <[email protected]> * feat: Migrate ds-cv-inferencing to be EdgeX 3.0 compatible Closes #135 Signed-off-by: Elizabeth J Lee <[email protected]> * fix: address pr comments Signed-off-by: Elizabeth J Lee <[email protected]> * fix: remove top level go.mod and go.sum Signed-off-by: Elizabeth J Lee <[email protected]> * fix: Address Lenny's PR comments Signed-off-by: Elizabeth J Lee <[email protected]> * refactor: added code for command client Signed-off-by: preethi-satishcandra <[email protected]> * fix: address pr feedback Signed-off-by: Elizabeth J Lee <[email protected]> * fix: address jim's comments Signed-off-by: Elizabeth J Lee <[email protected]> * refactor: added mock command client for the unit tests Signed-off-by: preethi-satishcandra <[email protected]> * feat: update license year to include 2023 (#149) Closes: #138 Signed-off-by: Jim Wang <[email protected]> * refactor: updated unit test to pass by adding mock command client that returns error Signed-off-by: preethi-satishcandra <[email protected]> * refactor: cleaned up the code Signed-off-by: preethi-satishcandra <[email protected]> * refactor: addressed Lenny's code review comments Signed-off-by: preethi-satishcandra <[email protected]> * feat: Update test script for v3 endpoints Closes #150 Signed-off-by: Elizabeth J Lee <[email protected]> * refactor: addressed more of Lenny's code review comments Signed-off-by: preethi-satishcandra <[email protected]> * refactor: Fix naming of checkout-> vending and fix service names Signed-off-by: Elizabeth J Lee <[email protected]> * refactor: addressed more code review comments Signed-off-by: preethi-satishcandra <[email protected]> * refactor: changed some of the error logs to debug from info mode Signed-off-by: preethi-satishcandra <[email protected]> * feat: update docs for edgex 3.0 update (#152) * feat: update docs for edgex 3.0 update Closes: #137 Signed-off-by: Valina Li <[email protected]> * feat: update and cleanup compose-av env file (#157) ------- Signed-off-by: Sean O'Hair <[email protected]> * feat: update references of automated-checkout to automated-vending (#159) Signed-off-by: Sean O'Hair <[email protected]> * refactor: remove use of iot-devkit utilities package, fix ioutil calls Closes #158 Signed-off-by: Elizabeth J Lee <[email protected]> * fix: broken unit tests Signed-off-by: Elizabeth J Lee <[email protected]> * fix: address pr comments Signed-off-by: Elizabeth J Lee <[email protected]> * fix: adjust return statement Signed-off-by: Elizabeth J Lee <[email protected]> * fix: Revert cv-inference back to OpenVINO 2021. Update controller-board device-list format Removed double escape in smoke-test string Closes #161 Signed-off-by: Brian McGinn <[email protected]> * fix: remove ioutil to update to os package Signed-off-by: Elizabeth J Lee <[email protected]> * fix: address pr comments Signed-off-by: Elizabeth J Lee <[email protected]> * fix: Integration issues with upgrade to EdgeX 3.0 Signed-off-by: Elizabeth J Lee <[email protected]> * fix: adjust unit tests Signed-off-by: Elizabeth J Lee <[email protected]> * fix: Dependabot reference updates (#174) Signed-off-by: Brian McGinn <[email protected]> --------- Signed-off-by: Leonard Goodell <[email protected]> Signed-off-by: Sean O'Hair <[email protected]> Signed-off-by: Brian McGinn <[email protected]> Signed-off-by: Jim Wang <[email protected]> Signed-off-by: Neethu Elizabeth Simon <[email protected]> Signed-off-by: Valina Li <[email protected]> Signed-off-by: Elizabeth J Lee <[email protected]> Signed-off-by: preethi-satishcandra <[email protected]> Co-authored-by: Leonard Goodell <[email protected]> Co-authored-by: seanohair22 <[email protected]> Co-authored-by: Jim Wang @ Intel <[email protected]> Co-authored-by: NeethuES <[email protected]> Co-authored-by: Valina Li <[email protected]> Co-authored-by: Elizabeth J Lee <[email protected]> Co-authored-by: preethi-satishcandra <[email protected]>
intel-retail · Oct 17, 2023 · 6a7a1cf · 6a7a1cf
1 parent 20d29f2
commit 6a7a1cf
Show file tree

Hide file tree

Showing 180 changed files with 6,389 additions and 7,347 deletions.
diff --git a/.github/workflows/trivyimagescan.yaml b/.github/workflows/trivyimagescan.yaml
@@ -35,7 +35,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/as-vending:dev'
+            image-ref: 'automated-vending/as-vending:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-as-vending.sarif'
@@ -64,7 +64,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/as-controller-board-status:dev'
+            image-ref: 'automated-vending/as-controller-board-status:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-as-controller-board-status.sarif'
@@ -93,7 +93,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/ds-card-reader:dev'
+            image-ref: 'automated-vending/ds-card-reader:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-ds-card-reader.sarif'
@@ -122,7 +122,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/ds-controller-board:dev'
+            image-ref: 'automated-vending/ds-controller-board:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-ds-controller-board.sarif'
@@ -151,7 +151,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/ms-authentication:dev'
+            image-ref: 'automated-vending/ms-authentication:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-ms-authentication.sarif'
@@ -180,7 +180,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/ms-inventory:dev'
+            image-ref: 'automated-vending/ms-inventory:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-ms-inventory.sarif'
@@ -209,7 +209,7 @@ jobs:
         - name: Run Trivy vulnerability scanner
           uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
           with:
-            image-ref: 'automated-checkout/ms-ledger:dev'
+            image-ref: 'automated-vending/ms-ledger:dev'
             format: 'template'
             template: '@/contrib/sarif.tpl'
             output: 'trivy-results-ms-ledger.sarif'

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright © 2020-2022, Intel Corporation
+Copyright © 2020-2023, Intel Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright © 2022 Intel Corporation. All rights reserved.
+# Copyright © 2022-2023 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 
 .PHONY: clean \
@@ -37,24 +37,26 @@ run-portainer:
 	docker compose -f docker-compose.portainer.yml up -d
 
 run:
-	docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml up -d
+	docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml up -d
+
+run-edgex:
+	docker compose -f docker-compose.edgex.yml up -d
 
 run-physical:
-	docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml -f docker-compose.physical.card-reader.yml -f docker-compose.physical.controller-board.yml up -d
+	docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml -f docker-compose.physical.card-reader.yml -f docker-compose.physical.controller-board.yml up -d
 
 run-physical-card-reader:
-	docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml -f docker-compose.physical.card-reader.yml up -d
+	docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml -f docker-compose.physical.card-reader.yml up -d
 
 run-physical-controller-board:
-	docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml -f docker-compose.physical.controller-board.yml up -d
+	docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml -f docker-compose.physical.controller-board.yml up -d
 
 down:
-	-docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml stop -t 1
-	-docker compose -f docker-compose.ac.yml -f docker-compose.edgex.yml down
+	-docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml stop -t 1
+	-docker compose -f docker-compose.av.yml -f docker-compose.edgex.yml down
 
 clean: down docker-rm
-	docker rmi -f $$(docker images | grep '<none>' | awk '{print $$3}') && \
-	docker rmi -f $$(docker images | grep automated-checkout | awk '{print $$3}') && \
+	docker rmi -f $$(docker images | grep 'automated-vending' | awk '{print $$3}') && \
 	docker volume prune -f && \
 	docker network prune -f
 

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# Automated Checkout
+# Automated Vending
 
-For complete documentation on the Automated Checkout Reference Design, please visit **[this repository's GitHub Pages site](https://intel-retail.github.io/automated-vending/index.html)**.
+For complete documentation on the Automated Vending Reference Design, please visit **[this repository's GitHub Pages site](https://intel-retail.github.io/automated-vending/index.html)**.
diff --git a/as-controller-board-status/.golangci.yml b/as-controller-board-status/.golangci.yml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Intel Corporation. All rights reserved.
+# Copyright © 2022-2023 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 
 run:

diff --git a/as-controller-board-status/Dockerfile b/as-controller-board-status/Dockerfile
@@ -1,14 +1,15 @@
-# Copyright © 2022 Intel Corporation. All rights reserved.
+# Copyright © 2023 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 
-FROM golang:1.18-alpine3.16 AS builder
+FROM golang:1.20-alpine3.17 AS builder
 
 LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
-  copyright='Copyright (c) 2022: Intel'
+  copyright='Copyright (c) 2023: Intel'
 
 
 # add git for go modules
-RUN apk update && apk add --no-cache make git gcc libc-dev zeromq-dev linux-headers
+# hadolint ignore=DL3018
+RUN apk update && apk add --no-cache make git
 
 ENV GO111MODULE=on
 WORKDIR /usr/local/bin/
@@ -28,13 +29,12 @@ COPY . .
 RUN make gobuild
 
 # Next image - Copy built Go binary into new workspace
-FROM alpine
+FROM alpine:3.17
 
 LABEL license='SPDX-License-Identifier: BSD-3-Clause' \
-  copyright='Copyright (c) 2022: Intel'
+  copyright='Copyright (c) 2023: Intel'
 
-RUN apk --no-cache add zeromq
-COPY --from=builder /usr/local/bin/as-controller-board-status/res/configuration.toml /res/configuration.toml
+COPY --from=builder /usr/local/bin/as-controller-board-status/res/configuration.yaml /res/configuration.yaml
 COPY --from=builder /usr/local/bin/as-controller-board-status/main /as-controller-board-status
 
 CMD [ "/as-controller-board-status", "-cp=consul.http://edgex-core-consul:8500", "-r"]
diff --git a/as-controller-board-status/LICENSE b/as-controller-board-status/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright © 2020-2022, Intel Corporation
+Copyright © 2020-2023, Intel Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/as-controller-board-status/Makefile b/as-controller-board-status/Makefile
@@ -1,9 +1,9 @@
-# Copyright © 2022 Intel Corporation. All rights reserved.
+# Copyright © 2023 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 
 .PHONY: build gobuild run gorun stop test lint
 
-MICROSERVICE=automated-checkout/as-controller-board-status
+MICROSERVICE=automated-vending/as-controller-board-status
 
 ARCH=$(shell uname -m)
 
@@ -19,7 +19,7 @@ docker:
 		.
 
 gobuild: tidy
-	CGO_ENABLED=1 GOOS=linux go build -ldflags='-s -w' -a -installsuffix cgo main.go
+	CGO_ENABLED=0 GOOS=linux go build -ldflags='-s -w' -a main.go
 
 run:
 	docker run \
@@ -34,10 +34,10 @@ stop:
 	docker rm -f $(MICROSERVICE):dev
 
 test:
-	go test -tags no_zmq -test.v -cover ./...
+	go test -test.v -cover ./...
 
 testHTML:
-	go test -tags no_zmq -test.v -coverprofile=test_coverage.out ./... && \
+	go test -test.v -coverprofile=test_coverage.out ./... && \
 	go tool cover -html=test_coverage.out
 
 lint:

diff --git a/as-controller-board-status/config/configuration.go b/as-controller-board-status/config/configuration.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2022-2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package config
@@ -19,7 +19,8 @@ type ControllerBoardStatusConfig struct {
 	DeviceName                                        string
 	MaxTemperatureThreshold                           float64
 	MinTemperatureThreshold                           float64
-	DoorStatusCommandEndpoint                         string
+	InferenceDeviceName                               string
+	InferenceDoorStatusCmd                            string
 	NotificationCategory                              string
 	NotificationEmailAddresses                        string
 	NotificationLabels                                string

diff --git a/as-controller-board-status/functions/common.go b/as-controller-board-status/functions/common.go
@@ -1,14 +1,13 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2022-2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package functions
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"net/http"
-
-	utilities "github.com/intel-iot-devkit/automated-checkout-utilities"
 )
 
 const (
@@ -22,13 +21,14 @@ const (
 // and submit it as part of the outbound REST request.
 func (boardStatus *CheckBoardStatus) RESTCommandJSON(restURL string, restMethod string, inputInterface interface{}) (err error) {
 	// Serialize the inputInterface
-	inputInterfaceJSON, err := utilities.GetAsJSON(inputInterface)
+	inputInterfaceJSON, err := json.Marshal(inputInterface)
+
 	if err != nil {
 		return fmt.Errorf("failed to serialize the input interface as JSON: %v", err.Error())
 	}
 
 	// Build out the request
-	req, err := http.NewRequest(restMethod, restURL, bytes.NewBuffer([]byte(inputInterfaceJSON)))
+	req, err := http.NewRequest(restMethod, restURL, bytes.NewBuffer(inputInterfaceJSON))
 	if err != nil {
 		return fmt.Errorf("failed to build the REST %v request for the URL %v due to error: %v", restMethod, restURL, err.Error())
 	}

diff --git a/as-controller-board-status/functions/common_test.go b/as-controller-board-status/functions/common_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package functions
@@ -20,7 +20,6 @@ const (
 	DeviceName                                = "DeviceName"
 	MaxTemperatureThreshold                   = "MaxTemperatureThreshold"
 	MinTemperatureThreshold                   = "MinTemperatureThreshold"
-	DoorStatusCommandEndpoint                 = "DoorStatusCommandEndpoint"
 	NotificationCategory                      = "NotificationCategory"
 	NotificationEmailAddresses                = "NotificationEmailAddresses"
 	NotificationLabels                        = "NotificationLabels"
@@ -43,12 +42,13 @@ func GetCommonSuccessConfig() *config.ControllerBoardStatusConfig {
 		DeviceName:                                        "controller-board",
 		MaxTemperatureThreshold:                           83.0,
 		MinTemperatureThreshold:                           10.0,
-		DoorStatusCommandEndpoint:                         "http://localhost:48082/api/v2/device/name/Inference-device/vendingDoorStatus",
+		InferenceDeviceName:                               "Inference-device",
+		InferenceDoorStatusCmd:                            "inferenceDoorStatus",
 		NotificationCategory:                              "HW_HEALTH",
 		NotificationEmailAddresses:                        "[email protected],[email protected]",
 		NotificationLabels:                                "HW_HEALTH",
 		NotificationReceiver:                              "System Administrator",
-		NotificationSender:                                "Automated Checkout Maintenance Notification",
+		NotificationSender:                                "Automated Vending Maintenance Notification",
 		NotificationSeverity:                              "CRITICAL",
 		NotificationName:                                  "maintenance-notification",
 		NotificationSubscriptionMaxRESTRetries:            10,
@@ -166,7 +166,7 @@ func prepRESTCommandJSONTest() ([]testTableRESTCommandJSONStruct, []*httptest.Se
 				"test": make(chan bool),
 			},
 			HTTPTestServer: testServerStatusOK,
-			Output:         fmt.Errorf("failed to serialize the input interface as JSON: Failed to marshal into JSON string: json: unsupported type: chan bool"),
+			Output:         fmt.Errorf("failed to serialize the input interface as JSON: json: unsupported type: chan bool"),
 		})
 	output = append(output,
 		testTableRESTCommandJSONStruct{

diff --git a/as-controller-board-status/functions/models.go b/as-controller-board-status/functions/models.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package functions
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces"
+	"github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces"
 )
 
 // ControllerBoardStatusAppSettings is a data structure that holds the
@@ -19,7 +19,6 @@ type ControllerBoardStatusAppSettings struct {
 	DeviceName                                string
 	MaxTemperatureThreshold                   float64
 	MinTemperatureThreshold                   float64
-	DoorStatusCommandEndpoint                 string
 	NotificationCategory                      string
 	NotificationEmailAddresses                []string
 	NotificationLabels                        []string
@@ -70,6 +69,7 @@ type CheckBoardStatus struct {
 	Configuration                             *config.ControllerBoardStatusConfig
 	SubscriptionClient                        interfaces.SubscriptionClient
 	NotificationClient                        interfaces.NotificationClient
+	CommandClient                             interfaces.CommandClient
 	ControllerBoardStatus                     *ControllerBoardStatus
 	averageTemperatureMeasurement             time.Duration
 	notificationSubscriptionRESTRetryInterval time.Duration
@@ -79,15 +79,6 @@ type CheckBoardStatus struct {
 	notificationLabels                        []string
 }
 
-// VendingDoorStatus is a string representation of a boolean whose state corresponds
-// to the whether the doorClosed state is true or false. This data is sent
-// to the MQTT device service for processing by the Automated Checkout inference
-// algorithm, which will act if the door state flips from open (false) to
-// closed (true).
-type VendingDoorStatus struct {
-	VendingDoorStatus string `json:"inferenceDoorStatus"` // TODO: remove inference and rename to vendingDoorStatus
-}
-
 func (checkBoardStatus *CheckBoardStatus) ParseStringConfigurations() error {
 	var err error
 	checkBoardStatus.notificationEmailAddresses = strings.Split(checkBoardStatus.Configuration.NotificationEmailAddresses, ",")

diff --git a/as-controller-board-status/functions/notify.go b/as-controller-board-status/functions/notify.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package functions
@@ -9,8 +9,8 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/dtos"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests"
+	"github.com/edgexfoundry/go-mod-core-contracts/v3/dtos"
+	"github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests"
 )
 
 // SubscribeToNotificationService configures an email notification and submits

diff --git a/as-controller-board-status/functions/notify_test.go b/as-controller-board-status/functions/notify_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Intel Corporation. All rights reserved.
+// Copyright © 2023 Intel Corporation. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
 package functions
@@ -10,8 +10,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	client_mocks "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces/mocks"
-	edgex_errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors"
+	client_mocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces/mocks"
+	edgex_errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors"
 	assert "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )