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.

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

docs(devcontainer): add trivy and its VSCode Extension #3307

Merged

Conversation

ashnashahgrover
Copy link
Contributor

@ashnashahgrover ashnashahgrover commented Jun 11, 2024

Primary Changes

  1. updated trivy version in the .devcontainer file and included trivy vs-code extension

Changes required to incorporate 1)
3) included trivy vs-code extension in the .vscode/extensions.json file

Fixes https://github.com/hyperledger/cacti/issues/2650

Signed-off-by: ashnashahgrover as19@williams.edu

Pull Request Requirements

  • Rebased onto upstream/main branch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.
  • Have git sign off at the end of commit message to avoid being marked red. You can add -s flag when using git commit command. You may refer to this link for more information.
  • Follow the Commit Linting specification. You may refer to this link for more information.

Character Limit

  • Pull Request Title and Commit Subject must not exceed 72 characters (including spaces and special characters).
  • Commit Message per line must not exceed 80 characters (including spaces and special characters).

A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@ashnashahgrover LGTM with comments

.devcontainer/devcontainer.json Outdated Show resolved Hide resolved
.github/workflows/cacti-dev-container-vscode-publish.yaml Outdated Show resolved Hide resolved
.github/workflows/ci.yaml Outdated Show resolved Hide resolved
install_nvm.sh Outdated Show resolved Hide resolved
jwtsecret.hex Outdated Show resolved Hide resolved
Copy link
Contributor

@jagpreetsinghsasan jagpreetsinghsasan left a comment

Choose a reason for hiding this comment

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

LGTM @ashnashahgrover (You still have to update the commit message, some typos and point 4 is not valid anymore)

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@petermetz
Copy link
Contributor

@ashnashahgrover Are you still working on this? If not, we can close it down and pick it back up later. I'm trying to keep the PR queue fresh.

@jagpreetsinghsasan
Copy link
Contributor

@ashnashahgrover please read the PR message again (and similarly, commit message)

@ashnashahgrover ashnashahgrover force-pushed the ashnashahgrover/issue2650 branch 2 times, most recently from 3a9d66a to 8a99b95 Compare July 23, 2024 07:47
Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@ashnashahgrover Seems like a rebase gone wrong type of situation. Please remove the non-relevant lines from the diff.

@ashnashahgrover
Copy link
Contributor Author

@ashnashahgrover Seems like a rebase gone wrong type of situation. Please remove the non-relevant lines from the diff.

@petermetz I deleted the non-relevant lines, please let me know if you still see any issues.

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@ashnashahgrover The diff still has parts that looks like parts of a different commit / older version of the file:

image

Copy link
Contributor

@RafaelAPB RafaelAPB left a comment

Choose a reason for hiding this comment

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

@ashnashahgrover are you still working on this? If yes please rebase with latest main and address the other comments please.

@ashnashahgrover
Copy link
Contributor Author

@ashnashahgrover are you still working on this? If yes please rebase with latest main and address the other comments please.

@RafaelAPB, all changes have been addressed can you re review?

Copy link
Contributor

@RafaelAPB RafaelAPB left a comment

Choose a reason for hiding this comment

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

LGTM

Primary Changes
1) updated trivy version in the .devcontainer file and included trivy vs-code extension

Changes required to incorporate 1)
3) included trivy vs-code extension in the .vscode/extensions.json file

Fixes hyperledger-cacti#2650

Signed-off-by: ashnashahgrover <as19@williams.edu>
@petermetz petermetz merged commit c3bbbfe into hyperledger-cacti:main Sep 16, 2024
147 of 148 checks passed
@petermetz petermetz deleted the ashnashahgrover/issue2650 branch September 16, 2024 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docs(devcontainer): add trivy and its VSCode Extension
5 participants