From ba6fdd5a323518965aa126da89917f95687ba196 Mon Sep 17 00:00:00 2001 From: Aiden Fujiwara Date: Wed, 27 Sep 2023 22:00:23 -0700 Subject: [PATCH] use find-up library instead of going up parent directories ourselves --- __tests__/hello.test.ts | 2 +- package-lock.json | 55 +++++++++++++++++++---------------------- package.json | 1 + src/configFile.ts | 31 ++++++----------------- src/main.ts | 10 ++++---- 5 files changed, 40 insertions(+), 59 deletions(-) diff --git a/__tests__/hello.test.ts b/__tests__/hello.test.ts index fc90be7..597fa4b 100644 --- a/__tests__/hello.test.ts +++ b/__tests__/hello.test.ts @@ -1,6 +1,6 @@ // who needs tests? import configFile from "../src/configFile"; -import { parse } from "toml"; +import {parse} from "toml"; test("get off my back, Jest", () => { expect(5).toEqual(5); diff --git a/package-lock.json b/package-lock.json index c7e5bc6..14aac99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@actions/github": "^2.1.1", "@actions/tool-cache": "^1.3.1", "axios": "^0.21.2", + "find-up": "5.0.0", "semver": "^7.1.3", "toml": "^3.0.0" }, @@ -104,9 +105,9 @@ } }, "node_modules/@actions/tool-cache/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -191,9 +192,9 @@ "dev": true }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -234,9 +235,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3138,9 +3139,9 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3201,9 +3202,9 @@ } }, "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3512,7 +3513,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -4351,9 +4351,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -5095,7 +5095,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -5509,7 +5508,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -5524,7 +5522,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -5578,7 +5575,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "engines": { "node": ">=8" } @@ -6780,9 +6776,9 @@ } }, "node_modules/windows-release/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -6818,9 +6814,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -6907,7 +6903,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, "engines": { "node": ">=10" }, diff --git a/package.json b/package.json index 0432d82..3f596b2 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@actions/github": "^2.1.1", "@actions/tool-cache": "^1.3.1", "axios": "^0.21.2", + "find-up": "5.0.0", "semver": "^7.1.3", "toml": "^3.0.0" }, diff --git a/src/configFile.ts b/src/configFile.ts index dded0dd..c4d51bc 100644 --- a/src/configFile.ts +++ b/src/configFile.ts @@ -1,6 +1,6 @@ -import {join, dirname} from "path"; -import {parse} from "toml"; -import {readFile, existsSync} from "fs"; +import { parse } from "toml"; +import { readFile } from "fs"; +let findUp = require("find-up"); interface foremanConfig { tools: foremanTool[]; } @@ -14,19 +14,6 @@ interface foremanTool { const MANIFEST = "foreman.toml"; -function findManifestPath(): string | null { - let directory = __dirname; - while (directory != "/") { - const configFilePath = join(directory, MANIFEST); - if (existsSync(configFilePath)) { - return configFilePath; - } else { - directory = dirname(directory); - } - } - return null; -} - function checkSameOrgToolSpecs(manifestContent: foremanConfig): boolean { const tools = manifestContent.tools; if (tools == null) { @@ -61,7 +48,7 @@ function checkSameOrgToolSpecs(manifestContent: foremanConfig): boolean { } async function checkSameOrgInConfig(): Promise { - const manifestPath = findManifestPath(); + const manifestPath = await findUp(MANIFEST); if (manifestPath == null) { throw new Error("Foreman config file could not be found"); } @@ -70,12 +57,10 @@ async function checkSameOrgInConfig(): Promise { if (err) { throw new Error("Could not read Foreman config file"); } - { - const manifestContent = parse(data); - const sameGithubOrgSource = checkSameOrgToolSpecs(manifestContent); - if (sameGithubOrgSource == false) { - throw new Error("Not all GitHub orgs are the same"); - } + const manifestContent = parse(data); + const sameGithubOrgSource = checkSameOrgToolSpecs(manifestContent); + if (sameGithubOrgSource == false) { + throw new Error("Not all GitHub orgs are the same"); } }); } diff --git a/src/main.ts b/src/main.ts index f4e04ea..d7cdf74 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,8 +1,8 @@ -import {getInput, debug, addPath, setFailed} from "@actions/core"; -import {downloadTool, extractZip} from "@actions/tool-cache"; -import {GitHub} from "@actions/github"; -import {resolve} from "path"; -import {exec} from "@actions/exec"; +import { getInput, debug, addPath, setFailed } from "@actions/core"; +import { downloadTool, extractZip } from "@actions/tool-cache"; +import { GitHub } from "@actions/github"; +import { resolve } from "path"; +import { exec } from "@actions/exec"; import configFile from "./configFile"; import foreman from "./foreman";