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

refactor: merge trivy-iac #5692

Closed
wants to merge 7 commits into from
Closed

refactor: merge trivy-iac #5692

wants to merge 7 commits into from

Conversation

nikpivkin
Copy link
Contributor

@nikpivkin nikpivkin commented Dec 1, 2023 •
edited
Loading

Description

Related issues

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@nikpivkin nikpivkin mentioned this pull request Dec 1, 2023
Closed
9 tasks
@simar7 simar7 marked this pull request as ready for review December 4, 2023 23:49
simar7
simar7 approved these changes Dec 4, 2023
View reviewed changes
Copy link
Member

@simar7 simar7 left a comment

Choose a reason for hiding this comment

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

lgtm to @nikpivkin - just need to iron out a merge conflict

@simar7
Copy link
Member

simar7 commented Dec 5, 2023

@knqyf263 when you have time, could you help us review it?

@knqyf263
Copy link
Collaborator

knqyf263 commented Dec 5, 2023

Don't we want to keep the commit history?
#2356

@simar7
Copy link
Member

simar7 commented Dec 5, 2023

Don't we want to keep the commit history?
#2356

trivy-iac doesn't have much of a commit history as of today. As for defsec repo itself, we split it up into three different repos and duplicating commit history would be unnecessary in each.

@knqyf263
Copy link
Collaborator

knqyf263 commented Dec 6, 2023

OK, but the change is huge. I need some time.

@simar7 simar7 marked this pull request as draft January 6, 2024 01:34
@simar7
Copy link
Member

simar7 commented Jan 6, 2024

Requires aquasecurity/trivy-iac#72 to be merged first and then this PR must be updated. Overall it'll be a smaller change once the aforementioned change is merged.

@simar7
Copy link
Member

simar7 commented Jan 30, 2024

@nikpivkin can we close this one?

@nikpivkin nikpivkin closed this Jan 30, 2024
@nikpivkin nikpivkin deleted the mrg-trivy-iac branch January 30, 2024 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simar7 simar7 simar7 approved these changes

@josedonizetti josedonizetti Awaiting requested review from josedonizetti

@chen-keinan chen-keinan Awaiting requested review from chen-keinan

@knqyf263 knqyf263 Awaiting requested review from knqyf263 knqyf263 is a code owner

@afdesk afdesk Awaiting requested review from afdesk afdesk will be requested when the pull request is marked ready for review afdesk is a code owner

@DmitriyLewen DmitriyLewen Awaiting requested review from DmitriyLewen DmitriyLewen will be requested when the pull request is marked ready for review DmitriyLewen is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

refactor(misconf): Merging trivy-iac into Trivy
3 participants
@nikpivkin @simar7 @knqyf263