From 2bf99715af021d47acc38c62233d86ff743d385d Mon Sep 17 00:00:00 2001
From: Christopher Phillips <christopher.phillips@anchore.com>
Date: Tue, 19 Dec 2023 11:16:17 -0500
Subject: [PATCH] chore: update scripts and add new dir output for snippets

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
---
 .github/scripts/check_binary_fixture_size.sh   |  3 +++
 syft/pkg/cataloger/binary/cataloger_test.go    | 18 +++++++++---------
 .../test-fixtures/get-fixture-snippet.sh       |  5 ++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/scripts/check_binary_fixture_size.sh b/.github/scripts/check_binary_fixture_size.sh
index a530d7c05..f39904999 100755
--- a/.github/scripts/check_binary_fixture_size.sh
+++ b/.github/scripts/check_binary_fixture_size.sh
@@ -8,6 +8,9 @@ fi
 
 directory="$1"
 
+# Remove trailing slash using parameter expansion
+directory="${directory%/}"
+
 # Check if the directory exists
 if [ ! -d "$directory" ]; then
   echo "Directory not found: $directory"
diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go
index e7aa36cd8..b470439c8 100644
--- a/syft/pkg/cataloger/binary/cataloger_test.go
+++ b/syft/pkg/cataloger/binary/cataloger_test.go
@@ -133,13 +133,13 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 			},
 		},
 		{
-			name:       "positive-memcached-1.6.18",
-			fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.18",
+			name:       "positive-memcached-1.6.14",
+			fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.14",
 			expected: pkg.Package{
 				Name:      "memcached",
-				Version:   "1.6.18",
+				Version:   "1.6.14",
 				Type:      "binary",
-				PURL:      "pkg:generic/memcached@1.6.18",
+				PURL:      "pkg:generic/memcached@1.6.14",
 				Locations: locations("memcached"),
 				Metadata:  metadata("memcached-binary"),
 			},
@@ -546,7 +546,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 		},
 		{
 			name:       "positive-java-openjdk",
-			fixtureDir: "test-fixtures/classifiers/positive/openjdk",
+			fixtureDir: "test-fixtures/classifiers/positive/openjdk-1.8.0",
 			expected: pkg.Package{
 				Name:      "java",
 				Version:   "1.8.0_352-b08",
@@ -558,7 +558,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 		},
 		{
 			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{
 				Name:      "java",
 				Version:   "11.0.17+8-LTS",
@@ -570,7 +570,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 		},
 		{
 			name:       "positive-java-oracle",
-			fixtureDir: "test-fixtures/classifiers/positive/oracle",
+			fixtureDir: "test-fixtures/classifiers/positive/oracle-java-19.0.1",
 			expected: pkg.Package{
 				Name:      "java",
 				Version:   "19.0.1+10-21",
@@ -582,7 +582,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 		},
 		{
 			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{
 				Name:      "java",
 				Version:   "19.0.1+10-21",
@@ -594,7 +594,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 		},
 		{
 			name:       "positive-java-ibm",
-			fixtureDir: "test-fixtures/classifiers/positive/ibm",
+			fixtureDir: "test-fixtures/classifiers/positive/ibm-java-1.8.0",
 			expected: pkg.Package{
 				Name:      "java",
 				Version:   "1.8.0-foreman_2022_09_22_15_30-b00",
diff --git a/syft/pkg/cataloger/binary/test-fixtures/get-fixture-snippet.sh b/syft/pkg/cataloger/binary/test-fixtures/get-fixture-snippet.sh
index b30b8542d..9d0659647 100755
--- a/syft/pkg/cataloger/binary/test-fixtures/get-fixture-snippet.sh
+++ b/syft/pkg/cataloger/binary/test-fixtures/get-fixture-snippet.sh
@@ -113,7 +113,10 @@ DATE=$(date)
 BASE64_PATTERN=$(echo -n "$PATTERN" | base64)
 FILENAME=$(basename "$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
 ### generated by script $(basename $0) at $DATE ###