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: update ds-card-reader to use EdgeX-3.0 #144

Merged
merged 7 commits into from
Sep 20, 2023
Merged

feat: update ds-card-reader to use EdgeX-3.0 #144

merged 7 commits into from
Sep 20, 2023

Conversation

vli11
Copy link
Contributor

@vli11 vli11 commented Sep 19, 2023

Closes: #133

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: #133

Anything the reviewer should know when reviewing this PR?

Test Instructions if applicable

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

@vli11
feat: update ds-card-reader to use EdgeX-3.0
57f8933 
Closes: intel-retail#133
Signed-off-by: Valina Li <valina.li@intel.com>
@vli11 vli11 added the enhancement New feature or request label Sep 19, 2023
@vli11 vli11 self-assigned this Sep 19, 2023
@vli11
fix: trivyimagescan and halolint error
84ca67e 
Signed-off-by: Valina Li <valina.li@intel.com>
@vli11
fix: hadolint problem
2230451 
Signed-off-by: Valina Li <valina.li@intel.com>
jim-wang-intel
jim-wang-intel requested changes Sep 19, 2023
View reviewed changes
ds-card-reader/Dockerfile Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
@vli11
fix: remove common config configurations
1565d54 
Signed-off-by: Valina Li <valina.li@intel.com>
lenny-goodell
lenny-goodell suggested changes Sep 20, 2023
View reviewed changes
ds-card-reader/driver/driver.go Outdated Show resolved Hide resolved
ds-card-reader/driver/driver.go Outdated Show resolved Hide resolved
ds-card-reader/driver/driver_test.go Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/devices/device-list.yaml Outdated
Comment on lines 5 to 16
- Name: card-reader
ProfileName: rfid-card-reader
Protocols:
other:
Address: simple01
Port: 300
AutoEvents:
- Interval: 3s
OnChange: true
SourceName: status
Properties:
Tags:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- Name: card-reader
ProfileName: rfid-card-reader
Protocols:
other:
Address: simple01
Port: 300
AutoEvents:
- Interval: 3s
OnChange: true
SourceName: status
Properties:
Tags:
- name: card-reader
profileName: rfid-card-reader
protocols:
other:
Address: simple01
Port: 300
autoEvents:
- interval: 3s
onChange: true
sourceName: status

lenny-goodell
lenny-goodell suggested changes Sep 20, 2023
View reviewed changes
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
ds-card-reader/res/configuration.yaml Outdated Show resolved Hide resolved
@vli11
fix: comments
b742320 
Signed-off-by: Valina Li <valina.li@intel.com>
@vli11
fix: unit test initialize
793bdcb 
Signed-off-by: Valina Li <valina.li@intel.com>
@vli11 vli11 requested a review from lenny-goodell September 20, 2023 01:36
jim-wang-intel
jim-wang-intel approved these changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@jim-wang-intel jim-wang-intel 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 suggested 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.

Still need to fix device-list.yaml

ds-card-reader/res/devices/device-list.yaml Outdated Show resolved Hide resolved
@vli11
fix: update device list to camelCase in yaml
b66036b 
Signed-off-by: Valina Li <valina.li@intel.com>
@vli11 vli11 requested a review from lenny-goodell September 20, 2023 16:56
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

@vli11 vli11 merged commit a07e54f into intel-retail:Edgex-3.0 Sep 20, 2023
11 checks passed
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 <leonard.goodell@intel.com>

* 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 <sean.ohair@intel.com>

* feat: Migrate device-mqtt service files and add ENV overrides for mqtt topics (#128)

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>

* feat: Migrate as-vending microservice to EdgeX 3.0 (#139)

* 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>

* 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 <yutsung.jim.wang@intel.com>

---------

Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>

* 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 <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>

* 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 <valina.li@intel.com>

* feat: Migrate ds-controller microservice to EdgeX 3.0 (#145)

* 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

closes #136

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>

* 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 <sean.ohair@intel.com>

* feat: Migrate ds-cv-inferencing to be EdgeX 3.0 compatible

Closes #135

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: address pr comments

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: remove top level go.mod and go.sum

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: Address Lenny's PR comments

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* refactor: added code for command client

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* fix: address pr feedback

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: address jim's comments

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* refactor: added mock command client for the unit tests

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* feat: update license year to include 2023 (#149)

Closes: #138

Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>

* refactor: updated unit test to pass by adding mock command client that returns error

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* refactor: cleaned up the code

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* refactor: addressed Lenny's code review comments

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* feat: Update test script for v3 endpoints

Closes #150

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* refactor: addressed more of Lenny's code review comments

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* refactor: Fix naming of checkout-> vending and fix service names

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* refactor: addressed more code review comments

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* refactor: changed some of the error logs to debug from info mode

Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>

* feat: update docs for edgex 3.0 update (#152)

* feat: update docs for edgex 3.0 update

Closes: #137
Signed-off-by: Valina Li <valina.li@intel.com>

* feat: update and cleanup compose-av env file (#157)

-------

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>

* feat: update references of automated-checkout to automated-vending (#159)

Signed-off-by: Sean O'Hair <sean.ohair@intel.com>

* refactor: remove use of iot-devkit utilities package, fix ioutil calls

Closes #158

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: broken unit tests

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: address pr comments

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: adjust return statement

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* 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 <brian.mcginn@intel.com>

* fix: remove ioutil to update to os package

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: address pr comments

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: Integration issues with upgrade to EdgeX 3.0

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: adjust unit tests

Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>

* fix: Dependabot reference updates (#174)

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

---------

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
Signed-off-by: Sean O'Hair <sean.ohair@intel.com>
Signed-off-by: Brian McGinn <brian.mcginn@intel.com>
Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>
Signed-off-by: Neethu Elizabeth Simon <neethu.elizabeth.simon@intel.com>
Signed-off-by: Valina Li <valina.li@intel.com>
Signed-off-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
Signed-off-by: preethi-satishcandra <preethi.satishchandra@intel.com>
Co-authored-by: Leonard Goodell <leonard.goodell@intel.com>
Co-authored-by: seanohair22 <97766291+seanohair22@users.noreply.github.com>
Co-authored-by: Jim Wang @ Intel <yutsung.jim.wang@intel.com>
Co-authored-by: NeethuES <neethu.elizabeth.simon@intel.com>
Co-authored-by: Valina Li <valina.li@intel.com>
Co-authored-by: Elizabeth J Lee <elizabeth.j.lee@intel.com>
Co-authored-by: preethi-satishcandra <preethi.satishchandra@intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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

@ejlee3 ejlee3 Awaiting requested review from ejlee3

@seanohair22 seanohair22 Awaiting requested review from seanohair22

Assignees

@vli11 vli11

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vli11 @jim-wang-intel @lenny-goodell @brian-intel