-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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 pkg/specs from trivy-policies into trivy
#6021
Closed
Closed
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a893f3f
refactor(deps): Merge trivy-iac into Trivy
simar7 f769b1d
fix lint
simar7 971bddb
use go-version/pkg/semver
simar7 5d69511
fix unit tests
simar7 65e6aa5
fix unit test
simar7 81cdcc7
remove testutil dep
simar7 67c7c1e
add a todo
simar7 0896c9b
skip certain tests on windows
simar7 4e26740
mv pkgs under pkg/iac
simar7 e01ae36
fix lint
simar7 0d7c0fa
update codeowners.md
simar7 3e5b28f
refactor(deps): Move pkg/spec from trivy-policies to trivy
simar7 a334eff
revert docker upgrade
simar7 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package extrafs | ||
|
|
||
| import ( | ||
| "io/fs" | ||
| "os" | ||
| "path/filepath" | ||
| ) | ||
|
|
||
| /* | ||
| Go does not currently support symlinks in io/fs. | ||
| We work around this by wrapping the fs.FS returned by os.DirFS with our own type which bolts on the ReadLinkFS | ||
| */ | ||
|
|
||
| type OSFS interface { | ||
| fs.FS | ||
| fs.StatFS | ||
| } | ||
|
|
||
| type ReadLinkFS interface { | ||
| ResolveSymlink(name, dir string) (string, error) | ||
| } | ||
|
|
||
| type FS interface { | ||
| OSFS | ||
| ReadLinkFS | ||
| } | ||
|
|
||
| type filesystem struct { | ||
| root string | ||
| underlying OSFS | ||
| } | ||
|
|
||
| func OSDir(path string) FS { | ||
| return &filesystem{ | ||
| root: path, | ||
| underlying: os.DirFS(path).(OSFS), | ||
| } | ||
| } | ||
|
|
||
| func (f *filesystem) Open(name string) (fs.File, error) { | ||
| return f.underlying.Open(name) | ||
| } | ||
|
|
||
| func (f *filesystem) Stat(name string) (fs.FileInfo, error) { | ||
| return f.underlying.Stat(name) | ||
| } | ||
|
|
||
| func (f *filesystem) ResolveSymlink(name, dir string) (string, error) { | ||
| link, err := os.Readlink(filepath.Join(f.root, dir, name)) | ||
| if err == nil { | ||
| return filepath.Join(dir, link), nil | ||
| } | ||
| return name, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package arm | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/aquasecurity/defsec/pkg/providers/azure" | ||
| "github.com/aquasecurity/defsec/pkg/state" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/appservice" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/authorization" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/compute" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/container" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/database" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/datafactory" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/datalake" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/keyvault" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/monitor" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/network" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/securitycenter" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/storage" | ||
| "github.com/aquasecurity/trivy/pkg/iac/adapters/arm/synapse" | ||
| scanner "github.com/aquasecurity/trivy/pkg/iac/scanners/azure" | ||
| ) | ||
|
|
||
| // Adapt adapts an azure arm instance | ||
| func Adapt(ctx context.Context, deployment scanner.Deployment) *state.State { | ||
| return &state.State{ | ||
| Azure: adaptAzure(deployment), | ||
| } | ||
| } | ||
|
|
||
| func adaptAzure(deployment scanner.Deployment) azure.Azure { | ||
|
|
||
| return azure.Azure{ | ||
| AppService: appservice.Adapt(deployment), | ||
| Authorization: authorization.Adapt(deployment), | ||
| Compute: compute.Adapt(deployment), | ||
| Container: container.Adapt(deployment), | ||
| Database: database.Adapt(deployment), | ||
| DataFactory: datafactory.Adapt(deployment), | ||
| DataLake: datalake.Adapt(deployment), | ||
| KeyVault: keyvault.Adapt(deployment), | ||
| Monitor: monitor.Adapt(deployment), | ||
| Network: network.Adapt(deployment), | ||
| SecurityCenter: securitycenter.Adapt(deployment), | ||
| Storage: storage.Adapt(deployment), | ||
| Synapse: synapse.Adapt(deployment), | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a need to upgrade the docker version?
oras.land/oras-gois not compatible with this version.