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

refactor(deps): Merge defsec into Trivy #6006

Closed
wants to merge 3 commits into from
Closed

refactor(deps): Merge defsec into Trivy #6006

wants to merge 3 commits into from

Conversation

simar7
Copy link
Member

@simar7 simar7 commented Jan 25, 2024

Description

This is stacked PR on top of #6005

Merges defsec into Trivy + trivy-iac branch.

Related issues

Related PRs

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).

@@ -434,3 +433,5 @@ replace oras.land/oras-go => oras.land/oras-go v1.2.4-0.20230801060855-932dd06d3
// testcontainers-go has a bug with versions v0.25.0 and v0.26.0
// ref: https://github.com/testcontainers/testcontainers-go/issues/1782
replace github.com/testcontainers/testcontainers-go => github.com/testcontainers/testcontainers-go v0.23.0

replace github.com/aquasecurity/trivy-aws => /Users/simarpreetsingh/repos/trivy-aws
Copy link
Member Author

Choose a reason for hiding this comment

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

This PR requires the changes here to be merged.

Comment on lines +19 to +30
type State struct {
AWS aws.AWS
Azure azure.Azure
CloudStack cloudstack.CloudStack
DigitalOcean digitalocean.DigitalOcean
GitHub github.GitHub
Google google.Google
Kubernetes kubernetes.Kubernetes
OpenStack openstack.OpenStack
Oracle oracle.Oracle
Nifcloud nifcloud.Nifcloud
}
Copy link
Member Author

Choose a reason for hiding this comment

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

@nikpivkin the state will live as an importable package in the Trivy repo. What do you think?

@simar7
Copy link
Member Author

simar7 commented Feb 12, 2024

Close in favor of #6109

@simar7 simar7 closed this Feb 12, 2024
@knqyf263 knqyf263 deleted the merge-defsec branch May 20, 2024 05:55
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.

refactor(misconf): Merging trivy-iac into Trivy
1 participant