fix: Update trimDocumentIdPrefix() and trimElementIdPrefix() to handle IDs without prefix

Signed-off-by: Souta Kawahara <souta.kawahara@almalinux.org>

Author: KAWAHARA-souta

spdx/v2/common/identifier.go

@@ -47,15 +47,9 @@ func prefixDocumentId(id DocumentID) string {
 	return val
 }
 
-// trimDocumentIdPrefix removes the DocumentRef- prefix from an document ID string or returns an error if it
-// does not start with DocumentRef-
+// trimDocumentIdPrefix removes the DocumentRef- prefix from an document ID string
 func trimDocumentIdPrefix(id string) (DocumentID, error) {
-	// handle DocumentRef-
-	if !strings.HasPrefix(id, documentRefPrefix) {
-		return "", fmt.Errorf("failed to parse SPDX identifier '%s'", id)
-	}
-	e := DocumentID(strings.TrimPrefix(id, documentRefPrefix))
-	return e, nil
+	return DocumentID(strings.TrimPrefix(id, documentRefPrefix)), nil
 }
 
 // ElementID represents the identifier string portion of an SPDX element
@@ -92,15 +86,9 @@ func prefixElementId(id ElementID) string {
 	return val
 }
 
-// trimElementIdPrefix removes the SPDXRef- prefix from an element ID string or returns an error if it
-// does not start with SPDXRef-
+// trimElementIdPrefix removes the SPDXRef- prefix from an element ID string
 func trimElementIdPrefix(id string) (ElementID, error) {
-	// handle SPDXRef-
-	if !strings.HasPrefix(id, spdxRefPrefix) {
-		return "", fmt.Errorf("failed to parse SPDX identifier '%s'", id)
-	}
-	e := ElementID(strings.TrimPrefix(id, spdxRefPrefix))
-	return e, nil
+	return ElementID(strings.TrimPrefix(id, spdxRefPrefix)), nil
 }
 
 // DocElementID represents an SPDX element identifier that could be defined

spdx/v2/common/identifier_test.go

@@ -103,14 +103,19 @@ func Test_DocElementIDDecoding(t *testing.T) {
 			},
 		},
 		{
-			name:  "DocumentRefID invalid ElementRefID",
-			value: "DocumentRef-a-doc:invalid",
-			err:   true,
+			name:  "DocumentRefID:ElementRefID without spdxref prefix",
+			value: "DocumentRef-a-doc:some-id",
+			expected: DocElementID{
+				DocumentRefID: "a-doc",
+				ElementRefID:  "some-id",
+			},
 		},
 		{
-			name:  "invalid format",
+			name:  "without spdxref prefix",
 			value: "some-id-without-spdxref",
-			err:   true,
+			expected: DocElementID{
+				ElementRefID: "some-id-without-spdxref",
+			},
 		},
 		{
 			name:  "SpecialID NONE",
@@ -203,9 +208,9 @@ func Test_ElementIDDecoding(t *testing.T) {
 			expected: ElementID("some-id"),
 		},
 		{
-			name:  "invalid format",
+			name:  "without prefix",
 			value: "some-id-without-spdxref",
-			err:   true,
+			expected: ElementID("some-id-without-spdxref"),
 		},
 	}
 
@@ -292,9 +297,11 @@ func Test_ElementIDStructDecoding(t *testing.T) {
 			value: `{"id":"SPDXRef-some-id"}`,
 		},
 		{
-			name:  "invalid format",
+			name:  "without prefix",
+			expected: typ{
+				Id: ElementID("some-id"),
+			},
 			value: `{"id":"some-id"}`,
-			err:   true,
 		},
 	}