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: Edgex 3.0 update #175

Merged
merged 52 commits into from
Oct 17, 2023
Merged

feat: Edgex 3.0 update #175

merged 52 commits into from
Oct 17, 2023

Conversation

brian-intel
Copy link
Contributor

@brian-intel brian-intel commented Oct 17, 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
  • [ x 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?

Update automated vending reference solution to EdgeX 3.0

Issue this PR will close

Anything the reviewer should know when reviewing this PR?

Test Instructions if applicable

  • make docker
  • make run
  • ./smoke-test.sh
  • All calls reporting 200

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

Leonard Goodell and others added 30 commits September 6, 2023 11:06
refactor: Migrate Edgex compose to 3.0
6bb52aa 
closes #121

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
Merge pull request #122 from intel-retail/edgex-compose
44edae1 
refactor: Migrate Edgex compose to 3.0
@seanohair22
feat(ms-authentication): Update ms-authentication service to EdgeX v3…
8d5db35 
….0 (#126)

* feat(ms-authentication): Update ms-authentication service to EdgeX v3.0
---------

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>
@seanohair22
feat: Migrate device-mqtt service files and add ENV overrides for mqt…
90f9f5d 
…t topics (#128)

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>
@brian-intel @jim-wang-intel
feat: Migrate as-vending microservice to EdgeX 3.0 (#139)
add46cf 
* feat: Migrate as-vending microservice to EdgeX 3.0

Signed-off-by: Brian McGinn <brian.mcginn@intel.com>

---------

Signed-off-by: Brian McGinn <brian.mcginn@intel.com>
Co-authored-by: Lenny Goodell <leonard.goodell@intel.com>
Co-authored-by: Jim Wang @ Intel <yutsung.jim.wang@intel.com>
@jim-wang-intel
feat: update as controller board to use EdgeX-3.0 (#140)
f50f06c 
* 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 <yutsung.jim.wang@intel.com>

---------

Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>
@NeethuES-intel
feat: Migrate ms-ledger microservice to EdgeX 3.0 (#141)
09eae36 
* feat: Migrate ms-ledger microservice to EdgeX 3.0

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: Migration changes in docker-compose

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: removed zmq references

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: change image name in trivyimagescan

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

---------

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>
@vli11
feat: update ds-card-reader to use EdgeX-3.0 (#144)
a07e54f 
* feat: update ds-card-reader to use EdgeX-3.0

Closes: #133
Signed-off-by: Valina Li <valina.li@intel.com>
@NeethuES-intel
feat: Migrate ds-controller microservice to EdgeX 3.0 (#145)
4ee86d6 
* feat: Migrate ds-controller to EdgeX 3.0

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: handle hadolint + remove zeromq

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: add hadolint flag

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* feat: changed devicelist toml to yaml

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* fix: typo

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* fix: change device-list in dockerfile

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

* fix: yaml indentation

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>

---------

Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>
build: Upgrade portianer to CE version
cfb35e5 
closes #136

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
@seanohair22
feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0 (#130)
dac1698 
* feat(ms-inventory): Migrate ms-inventory to EdgeX v3.0
---------

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>
Merge pull request #146 from intel-retail/portainer
5ec26f3 
build: Upgrade portianer to CE version
@ejlee3
feat: Migrate ds-cv-inferencing to be EdgeX 3.0 compatible
d4fc2b4 
Closes #135

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: address pr comments
6e3e324 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: remove top level go.mod and go.sum
c7fac9b 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
Merge pull request #147 from ejlee3/update-cv-inference
f4ea352 
feat: Migrate ds-cv-inferencing to be EdgeX 3.0 compatible
@ejlee3
fix: Address Lenny's PR comments
2323b24 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@presatish
refactor: added code for command client
8ab3ad8 
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@ejlee3
fix: address pr feedback
c1ebf6b 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: address jim's comments
402f1ea 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@presatish
refactor: added mock command client for the unit tests
6405d0e 
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@ejlee3
Merge pull request #148 from ejlee3/fix-cv-inference
80dd866 
fix: Address Lenny's PR comments
@jim-wang-intel
feat: update license year to include 2023 (#149)
0b355ac 
Closes: #138

Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>
@presatish
refactor: updated unit test to pass by adding mock command client tha…
1e43e76 
…t returns error

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@presatish
refactor: cleaned up the code
c25ef22 
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@presatish
Merge branch 'Edgex-3.0' into use-command-client
23a2dfd
@presatish
refactor: addressed Lenny's code review comments
46e3189 
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@ejlee3
feat: Update test script for v3 endpoints
9bbc4a0 
Closes #150

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@presatish
refactor: addressed more of Lenny's code review comments
d28be27 
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
@ejlee3
refactor: Fix naming of checkout-> vending and fix service names
58fbc59 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
ejlee3 and others added 12 commits October 2, 2023 08:39
@ejlee3
fix: broken unit tests
5a3d098 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: address pr comments
f0cd4c5 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: adjust return statement
71ea81a 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
Merge pull request #160 from ejlee3/refactor-utils
ab1b968 
refactor: remove use of intel devtools utils package
@brian-intel @ejlee3
fix: Revert cv-inference back to OpenVINO 2021.
90c4aea 
Update controller-board device-list format
Removed double escape in smoke-test string

Closes #161

Signed-off-by: Brian McGinn <brian.mcginn@intel.com>
@ejlee3
fix: remove ioutil to update to os package
9813688 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: address pr comments
3d75483 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
Merge pull request #162 from ejlee3/revert-openvino
8b1b6b5 
refactor: Revert openvino to 2021
@ejlee3
fix: Integration issues with upgrade to EdgeX 3.0
9632903 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
fix: adjust unit tests
d2abf7b 
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
@ejlee3
Merge pull request #163 from ejlee3/integration-fixes
07b2e34 
fix: Integration issues with upgrade to EdgeX 3.0
@brian-intel
fix: Dependabot reference updates (#174)
5216fff 
Signed-off-by: Brian McGinn <brian.mcginn@intel.com>
@lenny-goodell lenny-goodell self-requested a review October 17, 2023 17:37
@brian-intel brian-intel added enhancement New feature or request go Pull requests that update Go code labels Oct 17, 2023
@brian-intel brian-intel changed the title Edgex 3.0 feat: Edgex 3.0 update Oct 17, 2023
@brian-intel brian-intel marked this pull request as ready for review October 17, 2023 17:40
@brian-intel brian-intel merged commit 6a7a1cf into main Oct 17, 2023
13 of 14 checks passed
@lenny-goodell lenny-goodell deleted the Edgex-3.0 branch October 17, 2023 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

@antoniomtz antoniomtz Awaiting requested review from antoniomtz

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

@vli11 vli11 Awaiting requested review from vli11

@ejlee3 ejlee3 Awaiting requested review from ejlee3

@seanohair22 seanohair22 Awaiting requested review from seanohair22

Assignees
No one assigned
Labels
enhancement New feature or request go Pull requests that update Go code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@brian-intel @jim-wang-intel @lenny-goodell @seanohair22 @NeethuES-intel @vli11 @ejlee3 @presatish