fix: sbom: do not append arch

This was found to be useless and create issues

Signed-off-by: Dmitrii Sharshakov <[email protected]>

Author: dsseng

cmd/bldr/cmd/sbom.go

@@ -41,7 +41,7 @@ and outputs a Software Bill of Materials (SBOM) for it in SPDX format.
 
 		pkg := graph.Root.Pkg
 
-		sbomDoc, err := sbom.CreatePackageSBOM(pkg, options.TargetPlatform.Arch)
+		sbomDoc, err := sbom.CreatePackageSBOM(pkg)
 		if err != nil {
 			log.Fatalf("failed to create SBOM for package %q: %v", pkg.Name, err)
 		}

internal/pkg/convert/node.go

@@ -344,7 +344,7 @@ func (node *NodeLLB) stepSBOM(root llb.State, step v1alpha2.Step) llb.State {
 		return root
 	}
 
-	sbomDoc, err := sbom.CreatePackageSBOM(node.Pkg, node.Graph.Options.TargetPlatform.Arch)
+	sbomDoc, err := sbom.CreatePackageSBOM(node.Pkg)
 	if err != nil {
 		return root
 	}

internal/pkg/integration/testdata/sbom/final/ref.json

@@ -2,8 +2,8 @@
  "spdxVersion": "SPDX-2.3",
  "dataLicense": "CC0-1.0",
  "SPDXID": "SPDXRef-DOCUMENT",
- "name": "sidero-pkgs-pkg-x86_64",
- "documentNamespace": "https://anchore.com/bldr/dir/sidero-pkgs-pkg-x86_64-97243b75-0983-540c-895d-1cd532c9e5df",
+ "name": "sidero-pkgs-pkg",
+ "documentNamespace": "https://anchore.com/bldr/dir/sidero-pkgs-pkg-a8cdf0e2-4206-53f6-8d4e-0aa423d0c72c",
  "creationInfo": {
   "licenseListVersion": "3.25",
   "creators": [
@@ -14,8 +14,8 @@
  },
  "packages": [
   {
-   "name": "pkg-x86_64",
-   "SPDXID": "SPDXRef-Package-bldr-package-pkg-x86-64-925d1dbf64888231",
+   "name": "pkg",
+   "SPDXID": "SPDXRef-Package-bldr-package-pkg-aa88761304262ca3",
    "versionInfo": "2.1.2",
    "supplier": "NOASSERTION",
    "downloadLocation": "NOASSERTION",
@@ -38,8 +38,8 @@
    ]
   },
   {
-   "name": "sidero-pkgs-pkg-x86_64",
-   "SPDXID": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg-x86-64",
+   "name": "sidero-pkgs-pkg",
+   "SPDXID": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg",
    "versionInfo": "2.1.2",
    "supplier": "NOASSERTION",
    "downloadLocation": "NOASSERTION",
@@ -52,13 +52,13 @@
  ],
  "relationships": [
   {
-   "spdxElementId": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg-x86-64",
-   "relatedSpdxElement": "SPDXRef-Package-bldr-package-pkg-x86-64-925d1dbf64888231",
+   "spdxElementId": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg",
+   "relatedSpdxElement": "SPDXRef-Package-bldr-package-pkg-aa88761304262ca3",
    "relationshipType": "CONTAINS"
   },
   {
    "spdxElementId": "SPDXRef-DOCUMENT",
-   "relatedSpdxElement": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg-x86-64",
+   "relatedSpdxElement": "SPDXRef-DocumentRoot-Directory-sidero-pkgs-pkg",
    "relationshipType": "DESCRIBES"
   }
  ]

internal/pkg/sbom/sbom.go

@@ -65,7 +65,7 @@ func addPkgSources(sbomDoc *sbom.SBOM, bldrPkg *v1alpha2.Pkg, syftPkg pkg.Packag
 }
 
 // CreatePackageSBOM populates an SBOM document with data from the provided package.
-func CreatePackageSBOM(bldrPkg *v1alpha2.Pkg, arch string) (*sbom.SBOM, error) {
+func CreatePackageSBOM(bldrPkg *v1alpha2.Pkg) (*sbom.SBOM, error) {
 	// Sample. Actually we would get metadata when instructed to generate SBOM
 	sbomMetadata := bldrPkg.Steps[0].SBOM
 
@@ -78,7 +78,7 @@ func CreatePackageSBOM(bldrPkg *v1alpha2.Pkg, arch string) (*sbom.SBOM, error) {
 		Source: source.Description{
 			ID:       "sidero-pkgs",
 			Metadata: source.DirectoryMetadata{},
-			Name:     "sidero-pkgs-" + bldrPkg.Name + "-" + arch,
+			Name:     "sidero-pkgs-" + bldrPkg.Name,
 			Version:  sbomMetadata.Version,
 		},
 		Descriptor: sbom.Descriptor{
@@ -93,7 +93,7 @@ func CreatePackageSBOM(bldrPkg *v1alpha2.Pkg, arch string) (*sbom.SBOM, error) {
 	}
 
 	syftPkg := pkg.Package{
-		Name:    bldrPkg.Name + "-" + arch,
+		Name:    bldrPkg.Name,
 		Version: sbomMetadata.Version,
 		PURL:    sbomMetadata.PURL,
 		Type:    pkg.Type("bldr-package"),