chore: update deps, switch to parseFlags in actions-utils (#4)

Author: sethvargo

.github/workflows/unit.yml

@@ -20,7 +20,7 @@ on:
     - 'main'
   pull_request:
     branches:
-      - 'main'
+    - 'main'
   workflow_dispatch:
 
 concurrency:
@@ -55,4 +55,4 @@ jobs:
       run: 'npm run lint'
 
     - name: 'npm test'
-      run: npm run test
+      run: npm run test

dist/main/index.js

@@ -31,27 +31,27 @@
     "@actions/core": "^1.6.0",
     "@actions/exec": "^1.1.1",
     "@actions/tool-cache": "^1.7.2",
-    "@google-github-actions/actions-utils": "^0.1.6",
+    "@google-github-actions/actions-utils": "^0.2.0",
     "@google-github-actions/setup-cloud-sdk": "^0.5.0",
     "sshpk": "^1.17.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.0",
+    "@types/chai": "^4.3.1",
     "@types/mocha": "^9.1.0",
     "@types/sinon": "^10.0.11",
-    "@types/node": "^17.0.21",
+    "@types/node": "^17.0.24",
     "@types/sshpk": "^1.17.0",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
-    "@vercel/ncc": "^0.33.3",
-    "eslint": "^8.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/parser": "^5.19.0",
+    "@vercel/ncc": "^0.33.4",
+    "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "prettier": "^2.6.0",
+    "prettier": "^2.6.2",
     "ts-node": "^10.7.0",
-    "typescript": "^4.6.2",
+    "typescript": "^4.6.3",
     "mocha": "^9.2.2",
-    "sinon": "^13.0.1",
+    "sinon": "^13.0.2",
     "chai": "^4.3.6"
   }
 }

dist/post/index.js

@@ -24,12 +24,13 @@ import * as exec from '@actions/exec';
 import * as toolCache from '@actions/tool-cache';
 import * as setupGcloud from '@google-github-actions/setup-cloud-sdk';
 import {
+  errorMessage,
   exactlyOneOf,
   isPinnedToHead,
+  parseFlags,
   pinnedToHeadWarning,
-  errorMessage,
-  randomFilepath,
   presence,
+  randomFilepath,
 } from '@google-github-actions/actions-utils';
 
 import sshpk from 'sshpk';
@@ -43,10 +44,6 @@ import {
 export const GCLOUD_METRICS_ENV_VAR = 'CLOUDSDK_METRICS_ENVIRONMENT';
 export const GCLOUD_METRICS_LABEL = 'github-actions-ssh-compute';
 
-export function parseFlags(flags: string): RegExpMatchArray {
-  return flags.match(/(".*?"|[^"\s=]+)+(?=\s*|\s*$)/g)!; // Split on space or "=" if not in quotes
-}
-
 export async function run(): Promise<void> {
   try {
     core.exportVariable(GCLOUD_METRICS_ENV_VAR, GCLOUD_METRICS_LABEL);

package-lock.json

@@ -4,9 +4,9 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as setupGcloud from '@google-github-actions/setup-cloud-sdk';
 import { expect } from 'chai';
-import { run, parseFlags } from '../../src/main';
-import {run as postRun} from '../../src/post';
-import {EOL} from 'os';
+import { run } from '../../src/main';
+import { run as postRun } from '../../src/post';
+import { EOL } from 'os';
 
 import { promises as fs } from 'fs';
 
@@ -36,7 +36,7 @@ const fakeInputs: { [key: string]: string } = {
 };
 
 function getInputMock(name: string): string {
-    return fakeInputs[name];
+  return fakeInputs[name];
 }
 
 describe('#ssh-compute', function () {
@@ -95,8 +95,9 @@ describe('#ssh-compute', function () {
       this.stubs.getInput.withArgs('gcloud_component').returns('wrong_value');
       await run();
       expect(
-        this.stubs.setFailed.withArgs(`${ERROR_PREFIX} invalid input received for gcloud_component: wrong_value`)
-          .callCount,
+        this.stubs.setFailed.withArgs(
+          `${ERROR_PREFIX} invalid input received for gcloud_component: wrong_value`,
+        ).callCount,
       ).to.be.at.least(1);
     });
 
@@ -117,17 +118,19 @@ describe('#ssh-compute', function () {
       this.stubs.getInput.withArgs('command').returns('test command');
       await run();
       expect(
-        this.stubs.setFailed.withArgs(`${ERROR_PREFIX} either \`command\` or \`script\` should be set`)
-          .callCount,
+        this.stubs.setFailed.withArgs(
+          `${ERROR_PREFIX} either \`command\` or \`script\` should be set`,
+        ).callCount,
       ).to.be.at.least(1);
     });
 
     it('throws an error if neither script nor command is set', async function () {
       this.stubs.getInput.withArgs('command').returns(undefined);
       await run();
       expect(
-        this.stubs.setFailed.withArgs(`${ERROR_PREFIX} either \`command\` or \`script\` should be set`)
-          .callCount,
+        this.stubs.setFailed.withArgs(
+          `${ERROR_PREFIX} either \`command\` or \`script\` should be set`,
+        ).callCount,
       ).to.be.at.least(1);
     });
 
@@ -173,13 +176,17 @@ describe('#ssh-compute', function () {
     it('writes private key to the folder', async function () {
       this.stubs.getInput.withArgs('ssh_keys_dir').returns('temp-dir');
       await run();
-      expect(this.stubs.writeFile.withArgs('temp-dir/google_compute_engine.pub').callCount).to.eq(1);
+      expect(this.stubs.writeFile.withArgs('temp-dir/google_compute_engine.pub').callCount).to.eq(
+        1,
+      );
     });
 
     it('writes public key to the folder', async function () {
       this.stubs.getInput.withArgs('ssh_keys_dir').returns('temp-dir');
       await run();
-      expect(this.stubs.writeFile.withArgs('temp-dir/google_compute_engine.pub').callCount).to.eq(1);
+      expect(this.stubs.writeFile.withArgs('temp-dir/google_compute_engine.pub').callCount).to.eq(
+        1,
+      );
     });
 
     it('sets the correct command if script is provided', async function () {
@@ -227,76 +234,4 @@ describe('#ssh-compute', function () {
       expect(this.stubs.rm.callCount).to.eq(1);
     });
   });
-
-  describe('#parseFlags', () => {
-    const cases = [
-      {
-        name: `with equals`,
-        input: `--concurrency=2 --memory=2Gi`,
-        exp: [`--concurrency`, `2`, `--memory`, `2Gi`],
-      },
-      {
-        name: `with spaces`,
-        input: `--concurrency 2 --memory 2Gi`,
-        exp: [`--concurrency`, `2`, `--memory`, `2Gi`],
-      },
-      {
-        name: `with equals and spaces`,
-        input: `--concurrency 2 --memory=2Gi`,
-        exp: [`--concurrency`, `2`, `--memory`, `2Gi`],
-      },
-      {
-        name: `with equals and double quotes`,
-        input: `--memory="2Gi"`,
-        exp: [`--memory`, `"2Gi"`],
-      },
-      {
-        name: `with space and double quotes`,
-        input: `--memory "2Gi"`,
-        exp: [`--memory`, `"2Gi"`],
-      },
-      {
-        name: `with equals and space and double quotes`,
-        input: `--memory="2Gi" --concurrency "2"`,
-        exp: [`--memory`, `"2Gi"`, `--concurrency`, `"2"`],
-      },
-      {
-        name: `with equals and space and some double quotes`,
-        input: `--memory="2Gi" --concurrency 2`,
-        exp: [`--memory`, `"2Gi"`, `--concurrency`, `2`],
-      },
-      {
-        name: `with equals and single quotes`,
-        input: `--memory='2Gi'`,
-        exp: [`--memory`, `'2Gi'`],
-      },
-      {
-        name: `with space and single quotes`,
-        input: `--memory '2Gi'`,
-        exp: [`--memory`, `'2Gi'`],
-      },
-      {
-        name: `with equals and space and single quotes`,
-        input: `--memory='2Gi' --concurrency '2'`,
-        exp: [`--memory`, `'2Gi'`, `--concurrency`, `'2'`],
-      },
-      {
-        name: `with equals and space and some single quotes`,
-        input: `--memory='2Gi' --concurrency 2`,
-        exp: [`--memory`, `'2Gi'`, `--concurrency`, `2`],
-      },
-      {
-        name: `with double and single quotes`,
-        input: `--memory='2Gi' --concurrency="2"`,
-        exp: [`--memory`, `'2Gi'`, `--concurrency`, `"2"`],
-      },
-    ];
-
-    cases.forEach((tc) => {
-      it(tc.name, () => {
-        const result = parseFlags(tc.input);
-        expect(result).to.eql(tc.exp);
-      });
-    });
-  });
-});
+});