Merge pull request #175 from crazy-max/input-list-quotes

escape surrounding quotes for platforms input
docker · Oct 18, 2022 · 8c0edbc · 8c0edbc
2 parents 693fdd6 + 1fb9cbd
commit 8c0edbc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -124,6 +124,21 @@ describe('getCreateArgs', () => {
         '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
       ]
     ],
+    [
+      6,
+      new Map<string, string>([
+        ['install', 'false'],
+        ['use', 'false'],
+        ['platforms', 'linux/amd64\n"linux/arm64,linux/arm/v7"'],
+      ]),
+      [
+        'create',
+        '--name', 'builder-9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
+        '--driver', 'docker-container',
+        '--buildkitd-flags', '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
+        '--platform', 'linux/amd64,linux/arm64,linux/arm/v7'
+      ]
+    ],
   ])(
     '[%d] given %p as inputs, returns %p',
     async (num: number, inputs: Map<string, string>, expected: Array<string>) => {

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/context.ts b/src/context.ts
@@ -45,7 +45,7 @@ export async function getInputs(): Promise<Inputs> {
     driver: core.getInput('driver') || 'docker-container',
     driverOpts: await getInputList('driver-opts', true),
     buildkitdFlags: core.getInput('buildkitd-flags') || '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-    platforms: await getInputList('platforms'),
+    platforms: await getInputList('platforms', false, true),
     install: core.getBooleanInput('install'),
     use: core.getBooleanInput('use'),
     endpoint: core.getInput('endpoint'),
@@ -118,7 +118,7 @@ export async function getInspectArgs(inputs: Inputs, buildxVersion: string): Pro
   return args;
 }
 
-export async function getInputList(name: string, ignoreComma?: boolean): Promise<string[]> {
+export async function getInputList(name: string, ignoreComma?: boolean, escapeQuotes?: boolean): Promise<string[]> {
   const res: Array<string> = [];
 
   const items = core.getInput(name);
@@ -132,7 +132,7 @@ export async function getInputList(name: string, ignoreComma?: boolean): Promise
     comment: '#',
     relaxColumnCount: true,
     skipEmptyLines: true,
-    quote: false
+    quote: escapeQuotes ? `"` : false
   });
 
   for (const record of records as Array<string[]>) {