Small refactor

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Aug 12, 2020 · 26b3a3b · 26b3a3b
1 parent ec2628b
commit 26b3a3b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 26 deletions.
diff --git a/setup-buildx/__tests__/buildx.test.ts b/setup-buildx/__tests__/buildx.test.ts
@@ -16,6 +16,13 @@ describe('buildx', () => {
     expect(countBuilders).toBeGreaterThan(0);
   });
 
+  it('platforms', async () => {
+    const platforms = await buildx.platforms();
+    console.log(`platforms: ${platforms}`);
+    expect(platforms).not.toBeUndefined();
+    expect(platforms).not.toEqual('');
+  });
+
   it('acquires v0.2.2 version of buildx', async () => {
     const buildxBin = await buildx.install('v0.2.2', tmpDir);
     console.log(buildxBin);

diff --git a/setup-buildx/dist/index.js b/setup-buildx/dist/index.js
diff --git a/setup-buildx/src/buildx.ts b/setup-buildx/src/buildx.ts
@@ -28,6 +28,19 @@ export async function countBuilders(): Promise<number> {
   });
 }
 
+export async function platforms(): Promise<String | undefined> {
+  return await exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => {
+    if (res.stderr != '' && !res.success) {
+      throw new Error(res.stderr);
+    }
+    for (const line of res.stdout.trim().split(`\n`)) {
+      if (line.startsWith('Platforms')) {
+        return line.replace('Platforms: ', '').replace(/\s/g, '').trim();
+      }
+    }
+  });
+}
+
 export async function install(inputVersion: string, dockerConfigHome: string): Promise<string> {
   const release: github.GitHubRelease | null = await github.getRelease(inputVersion);
   if (!release) {

diff --git a/setup-buildx/src/main.ts b/setup-buildx/src/main.ts
@@ -50,21 +50,8 @@ async function run(): Promise<void> {
       await exec.exec('docker', ['buildx', 'install'], false);
     }
 
-    core.info('🐳 Docker info');
-    await exec.exec('docker', ['info'], false);
-
     core.info('🛒 Extracting available platforms...');
-    await exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => {
-      if (res.stderr != '' && !res.success) {
-        throw new Error(res.stderr);
-      }
-      for (const line of res.stdout.trim().split(os.EOL)) {
-        if (line.startsWith('Platforms')) {
-          core.setOutput('platforms', line.replace('Platforms: ', '').replace(/\s/g, '').trim());
-          break;
-        }
-      }
-    });
+    core.setOutput('platforms', await buildx.platforms());
   } catch (error) {
     core.setFailed(error.message);
   }