Merge pull request #18 from crazy-max/username-required

Username required
docker · Oct 16, 2020 · 39ef12f · 39ef12f
2 parents 4b15841 + 1c402b7
commit 39ef12f
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 44 deletions.
diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -2,13 +2,21 @@ import osm = require('os');
 
 import {getInputs} from '../src/context';
 
+test('without username getInputs throws errors', async () => {
+  expect(() => {
+    getInputs();
+  }).toThrowError('Input required and not supplied: username');
+});
+
 test('without password getInputs throws errors', async () => {
+  process.env['INPUT_USERNAME'] = 'dbowie';
   expect(() => {
     getInputs();
   }).toThrowError('Input required and not supplied: password');
 });
 
-test('with password getInputs does not error', async () => {
+test('with password and username getInputs does not error', async () => {
+  process.env['INPUT_USERNAME'] = 'dbowie';
   process.env['INPUT_PASSWORD'] = 'groundcontrol';
   expect(() => {
     getInputs();

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -17,34 +17,51 @@ test('errors when not run on linux platform', async () => {
   expect(coreSpy).toHaveBeenCalledWith('Only supported on linux platform');
 });
 
+test('errors without username', async () => {
+  const platSpy = jest.spyOn(osm, 'platform');
+  platSpy.mockImplementation(() => 'linux');
+
+  const coreSpy: jest.SpyInstance = jest.spyOn(core, 'setFailed');
+
+  await run();
+
+  expect(coreSpy).toHaveBeenCalledWith('Input required and not supplied: username');
+});
+
 test('errors without password', async () => {
   const platSpy = jest.spyOn(osm, 'platform');
   platSpy.mockImplementation(() => 'linux');
 
   const coreSpy: jest.SpyInstance = jest.spyOn(core, 'setFailed');
 
+  const username: string = 'dbowie';
+  process.env[`INPUT_USERNAME`] = username;
+
   await run();
 
   expect(coreSpy).toHaveBeenCalledWith('Input required and not supplied: password');
 });
 
-test('successful with only password', async () => {
-    const platSpy = jest.spyOn(osm, 'platform');
-    platSpy.mockImplementation(() => 'linux');
-
-    const setRegistrySpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setRegistry');
-    const setLogoutSpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setLogout');
-    const dockerSpy: jest.SpyInstance = jest.spyOn(docker, 'login');
-    dockerSpy.mockImplementation(() => {});
-
-    const password: string = 'groundcontrol';
-    process.env[`INPUT_PASSWORD`] = password;
-
-    await run();
-
-    expect(setRegistrySpy).toHaveBeenCalledWith('');
-    expect(setLogoutSpy).toHaveBeenCalledWith('');
-    expect(dockerSpy).toHaveBeenCalledWith('', '', password);
+test('successful with username and password', async () => {
+  const platSpy = jest.spyOn(osm, 'platform');
+  platSpy.mockImplementation(() => 'linux');
+
+  const setRegistrySpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setRegistry');
+  const setLogoutSpy: jest.SpyInstance = jest.spyOn(stateHelper, 'setLogout');
+  const dockerSpy: jest.SpyInstance = jest.spyOn(docker, 'login');
+  dockerSpy.mockImplementation(() => {});
+
+  const username: string = 'dbowie';
+  process.env[`INPUT_USERNAME`] = username;
+
+  const password: string = 'groundcontrol';
+  process.env[`INPUT_PASSWORD`] = password;
+
+  await run();
+
+  expect(setRegistrySpy).toHaveBeenCalledWith('');
+  expect(setLogoutSpy).toHaveBeenCalledWith('');
+  expect(dockerSpy).toHaveBeenCalledWith('', username, password);
 });
 
 test('calls docker login', async () => {
@@ -66,7 +83,7 @@ test('calls docker login', async () => {
   process.env[`INPUT_REGISTRY`] = registry;
 
   const logout: string = 'true';
-  process.env['INPUT_LOGOUT'] = logout
+  process.env['INPUT_LOGOUT'] = logout;
 
   await run();
 

diff --git a/action.yml b/action.yml
@@ -12,7 +12,7 @@ inputs:
     required: false
   username:
     description: 'Username used to log against the Docker registry'
-    required: false
+    required: true
   password:
     description: 'Password or personal access token used to log against the Docker registry'
     required: true

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/context.ts b/src/context.ts
@@ -10,7 +10,7 @@ export interface Inputs {
 export function getInputs(): Inputs {
   return {
     registry: core.getInput('registry'),
-    username: core.getInput('username'),
+    username: core.getInput('username', {required: true}),
     password: core.getInput('password', {required: true}),
     logout: core.getInput('logout')
   };