Merge pull request #38 from crazy-max/util-quote

util: handle quote opt with the same api for input list

__tests__/util.test.ts

@@ -79,9 +79,15 @@ describe('getInputList', () => {
     expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
   });
 
+  it('do not escape surrounding quotes', async () => {
+    setInput('driver-opts', `"env.no_proxy=localhost,127.0.0.1,.mydomain"`);
+    const res = Util.getInputList('driver-opts', {ignoreComma: true, quote: false});
+    expect(res).toEqual(['"env.no_proxy=localhost,127.0.0.1,.mydomain"']);
+  });
+
   it('escape surrounding quotes', async () => {
     setInput('platforms', 'linux/amd64\n"linux/arm64,linux/arm/v7"');
-    const res = Util.getInputList('platforms', {escapeQuotes: true});
+    const res = Util.getInputList('platforms');
     expect(res).toEqual(['linux/amd64', 'linux/arm64', 'linux/arm/v7']);
   });
 

src/toolkit.ts

@@ -17,6 +17,7 @@
 import {Context} from './context';
 import {Buildx} from './buildx/buildx';
 import {Install} from './buildx/install';
+import {Builder} from './buildx/builder';
 import {BuildKit} from './buildkit/buildkit';
 import {GitHub} from './github';
 
@@ -33,6 +34,7 @@ export class Toolkit {
   public github: GitHub;
   public buildx: Buildx;
   public buildxInstall: Install;
+  public builder: Builder;
   public buildkit: BuildKit;
 
   constructor(opts: ToolkitOpts = {}) {
@@ -40,6 +42,7 @@ export class Toolkit {
     this.github = new GitHub({token: opts.githubToken});
     this.buildx = new Buildx({context: this.context});
     this.buildxInstall = new Install({context: this.context, standalone: this.buildx.standalone});
+    this.builder = new Builder({context: this.context, buildx: this.buildx});
     this.buildkit = new BuildKit({context: this.context, buildx: this.buildx});
   }
 }

src/util.ts

@@ -19,7 +19,7 @@ import {parse} from 'csv-parse/sync';
 
 export interface InputListOpts {
   ignoreComma?: boolean;
-  escapeQuotes?: boolean;
+  quote?: string | boolean | Buffer | null;
 }
 
 export class Util {
@@ -37,7 +37,7 @@ export class Util {
       comment: '#',
       relaxColumnCount: true,
       skipEmptyLines: true,
-      quote: opts?.escapeQuotes ?? `"`
+      quote: opts?.quote
     });
 
     for (const record of records as Array<string[]>) {