Merge pull request #76 from crazy-max/bool-input

Use `core.getBooleanInput`
docker · Jun 22, 2021 · 4608add · 4608add
2 parents e2346b6 + 4fd5d8e
commit 4608add
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,27 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+  logout:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        logout:
+          - false
+          - true
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Login to GitHub Container Registry
+        uses: ./
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          logout: ${{ matrix.logout }}
+
   dind:
     runs-on: ubuntu-latest
     env:

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -5,6 +5,7 @@ import {getInputs} from '../src/context';
 test('with password and username getInputs does not throw error', async () => {
   process.env['INPUT_USERNAME'] = 'dbowie';
   process.env['INPUT_PASSWORD'] = 'groundcontrol';
+  process.env['INPUT_LOGOUT'] = 'true';
   expect(() => {
     getInputs();
   }).not.toThrowError();

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -10,6 +10,8 @@ test('errors without username and password', async () => {
   const platSpy = jest.spyOn(osm, 'platform');
   platSpy.mockImplementation(() => 'linux');
 
+  process.env['INPUT_LOGOUT'] = 'true'; // default value
+
   const coreSpy: jest.SpyInstance = jest.spyOn(core, 'setFailed');
 
   await run();
@@ -32,10 +34,13 @@ test('successful with username and password', async () => {
   const password: string = 'groundcontrol';
   process.env[`INPUT_PASSWORD`] = password;
 
+  const logout: boolean = false;
+  process.env['INPUT_LOGOUT'] = String(logout);
+
   await run();
 
   expect(setRegistrySpy).toHaveBeenCalledWith('');
-  expect(setLogoutSpy).toHaveBeenCalledWith('');
+  expect(setLogoutSpy).toHaveBeenCalledWith(logout);
   expect(dockerSpy).toHaveBeenCalledWith('', username, password);
 });
 
@@ -57,8 +62,8 @@ test('calls docker login', async () => {
   const registry: string = 'ghcr.io';
   process.env[`INPUT_REGISTRY`] = registry;
 
-  const logout: string = 'true';
-  process.env['INPUT_LOGOUT'] = logout;
+  const logout: boolean = true;
+  process.env['INPUT_LOGOUT'] = String(logout);
 
   await run();
 

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/context.ts b/src/context.ts
@@ -4,14 +4,14 @@ export interface Inputs {
   registry: string;
   username: string;
   password: string;
-  logout: string;
+  logout: boolean;
 }
 
 export function getInputs(): Inputs {
   return {
     registry: core.getInput('registry'),
     username: core.getInput('username'),
     password: core.getInput('password'),
-    logout: core.getInput('logout')
+    logout: core.getBooleanInput('logout')
   };
 }
diff --git a/src/state-helper.ts b/src/state-helper.ts
@@ -8,7 +8,7 @@ export function setRegistry(registry: string) {
   core.saveState('registry', registry);
 }
 
-export function setLogout(logout: string) {
+export function setLogout(logout: boolean) {
   core.saveState('logout', logout);
 }