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(specs): Expose specs as a pkg #158

Merged
merged 1 commit into from
Jun 20, 2024
Merged

feat(specs): Expose specs as a pkg #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.2

require (
github.com/aquasecurity/trivy v0.52.1-0.20240619045823-eb6d0d9779db
github.com/aquasecurity/trivy v0.52.1-0.20240619054236-36b3b772df21
github.com/docker/docker v26.1.3+incompatible
github.com/liamg/iamgo v0.0.9
github.com/liamg/memoryfs v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
github.com/aquasecurity/go-version v0.0.0-20240603093900-cf8a8d29271d h1:4zour5Sh9chOg+IqIinIcJ3qtr3cIf8FdFY6aArlXBw=
github.com/aquasecurity/go-version v0.0.0-20240603093900-cf8a8d29271d/go.mod h1:1cPOp4BaQZ1G2F5fnw4dFz6pkOyXJI9KTuak8ghIl3U=
github.com/aquasecurity/trivy v0.52.1-0.20240619045823-eb6d0d9779db h1:YmLi+1oP7N5sdnwJJOl+699SnQWp30RChdx5wFeKFU8=
github.com/aquasecurity/trivy v0.52.1-0.20240619045823-eb6d0d9779db/go.mod h1:n6nge/wMfmdNfWxKnSFMDoOYStcYDrZDGrbkP2KASIk=
github.com/aquasecurity/trivy v0.52.1-0.20240619054236-36b3b772df21 h1:iNOllxng7JZvCjf4UG6IZhZ9FjyGn3qH/+G631u4y7g=
github.com/aquasecurity/trivy v0.52.1-0.20240619054236-36b3b772df21/go.mod h1:NSz5jJqsVcABONnEr90DYBeUyy0r6voIw+riatbT3XY=
github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
Expand Down
2 changes: 1 addition & 1 deletion pkg/spec/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package spec

import (
"github.com/aquasecurity/trivy-checks/specs"
"github.com/aquasecurity/trivy-checks/pkg/specs"
)

// Loader access compliance specs
Expand Down
0 specs/compliance/aws-cis-1.2.yaml → pkg/specs/compliance/aws-cis-1.2.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/aws-cis-1.4.yaml → pkg/specs/compliance/aws-cis-1.4.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/docker-cis-1.6.0.yaml → pkg/specs/compliance/docker-cis-1.6.0.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/eks-cis-1.4.yaml → pkg/specs/compliance/eks-cis-1.4.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/k8s-cis-1.23.yaml → pkg/specs/compliance/k8s-cis-1.23.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/k8s-nsa-1.0.yaml → pkg/specs/compliance/k8s-nsa-1.0.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/k8s-pss-baseline-0.1.yaml → ...pecs/compliance/k8s-pss-baseline-0.1.yaml
View file
Open in desktop
File renamed without changes.
0 specs/compliance/k8s-pss-restricted-0.1.yaml → ...cs/compliance/k8s-pss-restricted-0.1.yaml
View file
Open in desktop
File renamed without changes.
0 specs/loader.go → pkg/specs/loader.go
View file
Open in desktop
File renamed without changes.
0 specs/loader_test.go → pkg/specs/loader_test.go
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions scripts/bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ for dir in config; do
rsync -avr commands/$dir/* bundle/commands/$dir
done

mkdir -p bundle/specs/compliance
rsync -avr pkg/specs/compliance bundle/specs

cp checks/.manifest bundle/
rm bundle/policies/.manifest
sed -i -e "s/\[GITHUB_SHA\]/${RELEASE_VERSION}/" bundle/.manifest
Expand Down