fix: Make sure all invalid chars are replaced for artifact names -- f…

…ixes #396 (#417) Signed-off-by: lts-po <[email protected]> Signed-off-by: Keith Zantow <[email protected]> Co-authored-by: lts-po <[email protected]> Co-authored-by: Keith Zantow <[email protected]>
anchore · May 3, 2023 · a59054d · a59054d
1 parent ea7104d
commit a59054d
Show file tree

Hide file tree

Showing 8 changed files with 253 additions and 229 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: npm ci
-      - run: npm audit --production
       - run: npm run package
       - run: git status --porcelain
       - run: git diff

diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js
diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js
diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,19 +41,19 @@
     "@actions/http-client": "^2.1.0",
     "@actions/tool-cache": "^2.0.1",
     "@octokit/core": "^4.2.0",
-    "@octokit/webhooks": "^10.7.0",
+    "@octokit/webhooks": "^11.0.0",
     "fast-safe-stringify": "^2.1.1",
-    "npm-check-updates": "^16.9.0"
+    "npm-check-updates": "^16.10.9"
   },
   "devDependencies": {
-    "@octokit/webhooks-types": "^6.10.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.15.11",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
+    "@octokit/webhooks-types": "^6.11.0",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^18.16.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
     "@vercel/ncc": "^0.36.1",
     "eol-converter-cli": "^1.0.8",
-    "eslint": "^8.37.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
@@ -62,11 +62,11 @@
     "jest": "^29.5.0",
     "js-yaml": "^4.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.8.7",
+    "prettier": "2.8.8",
     "prettier-plugin-organize-imports": "^3.2.2",
     "pretty-quick": "^3.1.3",
-    "ts-jest": "^29.0.5",
-    "type-fest": "^3.7.2",
-    "typescript": "^5.0.3"
+    "ts-jest": "^29.1.0",
+    "type-fest": "^3.9.0",
+    "typescript": "^5.0.4"
   }
 }
diff --git a/src/github/SyftGithubAction.ts b/src/github/SyftGithubAction.ts
@@ -71,7 +71,7 @@ export function getArtifactName(): string {
     if (parts.length > 2) {
       parts.splice(0, 1);
     }
-    const prefix = parts.join("-").replace(/[^-a-zA-Z0-9]/, "_");
+    const prefix = parts.join("-").replace(/[^-a-zA-Z0-9]/g, "_");
     return `${prefix}.${extension}`;
   }
 

diff --git a/tests/SyftGithubAction.test.ts b/tests/SyftGithubAction.test.ts
@@ -385,6 +385,17 @@ describe("Action", () => {
     });
 
     expect(action.getArtifactName()).toBe("img.cyclonedx.json");
+
+  });
+
+  it("correctly encode tags", () => {
+    setData({
+      inputs: {
+        image: "ghcr.io/something-something/image-image:0.1.2-dev"
+      }
+    });
+
+    expect(action.getArtifactName()).toBe("something-something-image-image_0_1_2-dev.spdx.json");
   });
 
   it ("properly maps paths for WSL", () => {