Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0 #130

Merged
merged 5 commits into from
Sep 20, 2023
Merged

feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0 #130

merged 5 commits into from
Sep 20, 2023

Conversation

seanohair22
Copy link
Contributor

@seanohair22 seanohair22 commented Sep 15, 2023 •
edited
Loading

PR Checklist

  • Added label to the Pull Request for easier discoverability and search
  • Commit Message meets guidelines as indicated in the URL https://github.com/intel-retail/automated-vending/blob/main/.github/CONTRIBUTING.md
  • Every commit is a single defect fix and does not mix feature addition or changes
  • Unit Tests have been added for new changes
  • Updated Documentation as relevant to the changes
  • All commented out code has been removed
  • If you've added a dependency, you've ensured license is compatible with repository license and clearly outlined the added dependency.
  • PR change contains code related to security
  • PR introduces changes that breaks compatibility with other modules (If YES, please provide details below)

What are you changing?

Issue this PR will close

close: #129

closes #129

Anything the reviewer should know when reviewing this PR?

Test Instructions if applicable

  • Comment out lines, 8-31, lines 58 - 238 and line 240 in docker-compose.ac.yml (so that only ms-inventory service and inventory volume are not commented out)
  • Run make docker in ms-inventory dir
  • Run make run in automated-vending dir
  • Run make run-portainer and check ms-inventory logs

If the there are associated PRs in other repositories, please link them here (i.e. intel-retail/automated-vending )

@seanohair22 seanohair22 self-assigned this Sep 15, 2023
@seanohair22 seanohair22 linked an issue Sep 15, 2023 that may be closed by this pull request
Migrate ms-inventory to 3.0.1 App SDK #129
Closed
lenny-goodell
lenny-goodell suggested changes Sep 18, 2023
View reviewed changes
ms-inventory/Dockerfile Outdated Show resolved Hide resolved
ejlee3
ejlee3 requested changes Sep 18, 2023
View reviewed changes
ms-inventory/res/configuration.yaml Outdated Show resolved Hide resolved
lenny-goodell
lenny-goodell reviewed Sep 18, 2023
View reviewed changes
Copy link
Contributor

@lenny-goodell lenny-goodell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to change all instances of automated-checkout to automated-vending

lenny-goodell
lenny-goodell reviewed Sep 19, 2023
View reviewed changes
Copy link
Contributor

@lenny-goodell lenny-goodell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove -tags no_zmq from test targets in makefile

lenny-goodell
lenny-goodell approved these changes Sep 19, 2023
View reviewed changes
Copy link
Contributor

@lenny-goodell lenny-goodell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

lenny-goodell
lenny-goodell approved these changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@lenny-goodell lenny-goodell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ejlee3
ejlee3 approved these changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@ejlee3 ejlee3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@seanohair22 seanohair22 merged commit dac1698 into intel-retail:Edgex-3.0 Sep 20, 2023
@seanohair22 seanohair22 deleted the EdgeX-3.0_ms-inventory branch September 20, 2023 21:42
brian-intel added a commit that referenced this pull request Oct 17, 2023
@brian-intel @seanohair22
@jim-wang-intel @NeethuES-intel @vli11 @ejlee3 @presatish
feat: Edgex 3.0 update (#175)
6a7a1cf 
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ejlee3 ejlee3 ejlee3 approved these changes

@brian-intel brian-intel brian-intel approved these changes

@lenny-goodell lenny-goodell lenny-goodell approved these changes

@jim-wang-intel jim-wang-intel jim-wang-intel approved these changes

@NeethuES-intel NeethuES-intel Awaiting requested review from NeethuES-intel

@presatish presatish Awaiting requested review from presatish

@vli11 vli11 Awaiting requested review from vli11

Assignees

@seanohair22 seanohair22

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Migrate ms-inventory to 3.0.1 App SDK
5 participants
@seanohair22 @jim-wang-intel @lenny-goodell @brian-intel @ejlee3