oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 17:03:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update scripts and add new dir output for snippets

Browse Source 
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
Christopher Phillips 2023-12-19 11:16:17 -05:00
parent de87abf029
commit 2bf99715af
No known key found for this signature in database
GPG Key ID: 17F8FF2EA7EF0AA0
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/check_binary_fixture_size.sh vendored
View File

@ -8,6 +8,9 @@ fi
directory="$1" directory="$1"
# Remove trailing slash using parameter expansion
directory="${directory%/}"
# Check if the directory exists # Check if the directory exists
if [ ! -d "$directory" ]; then if [ ! -d "$directory" ]; then
echo "Directory not found: $directory" echo "Directory not found: $directory"

18
syft/pkg/cataloger/binary/cataloger_test.go
View File

@ -133,13 +133,13 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
}, },
{ {
name: "positive-memcached-1.6.18", name: "positive-memcached-1.6.14",
fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.18", fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.14",
expected: pkg.Package{ expected: pkg.Package{
Name: "memcached", Name: "memcached",
Version: "1.6.18", Version: "1.6.14",
Type: "binary", Type: "binary",
PURL: "pkg:generic/memcached@1.6.18", PURL: "pkg:generic/memcached@1.6.14",
Locations: locations("memcached"), Locations: locations("memcached"),
Metadata: metadata("memcached-binary"), Metadata: metadata("memcached-binary"),
}, },
@ -546,7 +546,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
{ {
name: "positive-java-openjdk", name: "positive-java-openjdk",
fixtureDir: "test-fixtures/classifiers/positive/openjdk", fixtureDir: "test-fixtures/classifiers/positive/openjdk-1.8.0",
expected: pkg.Package{ expected: pkg.Package{
Name: "java", Name: "java",
Version: "1.8.0_352-b08", Version: "1.8.0_352-b08",
@ -558,7 +558,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
{ {
name: "positive-java-openjdk-lts", name: "positive-java-openjdk-lts",
fixtureDir: "test-fixtures/classifiers/positive/openjdk-lts", fixtureDir: "test-fixtures/classifiers/positive/openjdk-lts-11.0.17",
expected: pkg.Package{ expected: pkg.Package{
Name: "java", Name: "java",
Version: "11.0.17+8-LTS", Version: "11.0.17+8-LTS",
@ -570,7 +570,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
{ {
name: "positive-java-oracle", name: "positive-java-oracle",
fixtureDir: "test-fixtures/classifiers/positive/oracle", fixtureDir: "test-fixtures/classifiers/positive/oracle-java-19.0.1",
expected: pkg.Package{ expected: pkg.Package{
Name: "java", Name: "java",
Version: "19.0.1+10-21", Version: "19.0.1+10-21",
@ -582,7 +582,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
{ {
name: "positive-java-oracle-macos", name: "positive-java-oracle-macos",
fixtureDir: "test-fixtures/classifiers/positive/oracle-macos", fixtureDir: "test-fixtures/classifiers/positive/oracle-macos-19.0.1",
expected: pkg.Package{ expected: pkg.Package{
Name: "java", Name: "java",
Version: "19.0.1+10-21", Version: "19.0.1+10-21",
@ -594,7 +594,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
}, },
{ {
name: "positive-java-ibm", name: "positive-java-ibm",
fixtureDir: "test-fixtures/classifiers/positive/ibm", fixtureDir: "test-fixtures/classifiers/positive/ibm-java-1.8.0",
expected: pkg.Package{ expected: pkg.Package{
Name: "java", Name: "java",
Version: "1.8.0-foreman_2022_09_22_15_30-b00", Version: "1.8.0-foreman_2022_09_22_15_30-b00",

5
syft/pkg/cataloger/binary/test-fixtures/get-fixture-snippet.sh
View File

@ -113,7 +113,10 @@ DATE=$(date)
BASE64_PATTERN=$(echo -n "$PATTERN" | base64) BASE64_PATTERN=$(echo -n "$PATTERN" | base64)
FILENAME=$(basename "$BINARY_FILE") FILENAME=$(basename "$BINARY_FILE")
INFO=$(file -b "$BINARY_FILE") INFO=$(file -b "$BINARY_FILE")
OUTPUT_FILE="classifiers/positive/$FILENAME-$SHA256-$OFFSET-$LENGTH.snippet" OUTPUT_DIRECTORY="classifiers/positive/$FILENAME-$PATTERN-$SHA256-$OFFSET-$LENGTH"
mkdir "$OUTPUT_DIRECTORY"
OUTPUT_FILE="$OUTPUT_DIRECTORY/$FILENAME"
cat > "$OUTPUT_FILE" <<EOF cat > "$OUTPUT_FILE" <<EOF
### generated by script $(basename $0) at $DATE ### ### generated by script $(basename $0) at $DATE ###