From d83c83490f8ab83ba0a51654a041cb3766f2a7a5 Mon Sep 17 00:00:00 2001 From: ejahnGithub Date: Fri, 23 Feb 2024 08:41:44 -0800 Subject: [PATCH] fixed pr --- .gitignore | 2 ++ src/{helper => }/endpoints.ts | 0 src/helper/sbom.ts | 43 ----------------------------------- src/main.ts | 6 ++--- src/{helper => }/predicate.ts | 0 src/{helper => }/subject.ts | 0 6 files changed, 5 insertions(+), 46 deletions(-) rename src/{helper => }/endpoints.ts (100%) delete mode 100644 src/helper/sbom.ts rename src/{helper => }/predicate.ts (100%) rename src/{helper => }/subject.ts (100%) diff --git a/.gitignore b/.gitignore index 47fb503..2d19a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,5 @@ __tests__/runner/* .idea .vscode *.code-workspace + +packages/**/dist diff --git a/src/helper/endpoints.ts b/src/endpoints.ts similarity index 100% rename from src/helper/endpoints.ts rename to src/endpoints.ts diff --git a/src/helper/sbom.ts b/src/helper/sbom.ts deleted file mode 100644 index e5e37a2..0000000 --- a/src/helper/sbom.ts +++ /dev/null @@ -1,43 +0,0 @@ -import fs from 'fs' -import { SBOM } from '@actions/attest' - -export async function parseSBOMFromPath(path: string): Promise { - // Read the file content - const fileContent = await fs.promises.readFile(path, 'utf8') - - const sbom = JSON.parse(fileContent) - - if (checkIsSPDX(sbom)) { - return { type: 'spdx', object: sbom } - } else if (checkIsCycloneDX(sbom)) { - return { type: 'cyclonedx', object: sbom } - } - throw new Error('Unsupported SBOM format') -} - -function checkIsSPDX(sbomObject: { - spdxVersion?: string - SPDXID?: string -}): boolean { - if (sbomObject?.spdxVersion && sbomObject?.SPDXID) { - return true - } else { - return false - } -} - -function checkIsCycloneDX(sbomObject: { - bomFormat?: string - serialNumber?: string - specVersion?: string -}): boolean { - if ( - sbomObject?.bomFormat && - sbomObject?.serialNumber && - sbomObject?.specVersion - ) { - return true - } else { - return false - } -} diff --git a/src/main.ts b/src/main.ts index 9e338df..701c8da 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,9 +12,9 @@ import { REKOR_PUBLIC_GOOD_URL, SEARCH_PUBLIC_GOOD_URL, TSA_INTERNAL_URL -} from './helper/endpoints' -import { predicateFromInputs } from './helper/predicate' -import { subjectFromInputs } from './helper/subject' +} from './endpoints' +import { predicateFromInputs } from './predicate' +import { subjectFromInputs } from './subject' type Endpoints = { fulcioURL: string diff --git a/src/helper/predicate.ts b/src/predicate.ts similarity index 100% rename from src/helper/predicate.ts rename to src/predicate.ts diff --git a/src/helper/subject.ts b/src/subject.ts similarity index 100% rename from src/helper/subject.ts rename to src/subject.ts