diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1865bf5..5760c29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,12 +4,13 @@ on: - master pull_request_target: types: [opened, reopened, synchronize] + workflow_dispatch: jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: diff --git a/integrationTests/basic/integration.test.js b/integrationTests/basic/integration.test.js index d879142..d324911 100644 --- a/integrationTests/basic/integration.test.js +++ b/integrationTests/basic/integration.test.js @@ -109,17 +109,17 @@ describe('integration', () => { jest.resetAllMocks(); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce(`${vaultUrl}`); when(core.getInput) - .calledWith('token') + .calledWith('token', expect.anything()) .mockReturnValueOnce('testtoken'); }); function mockInput(secrets) { when(core.getInput) - .calledWith('secrets') + .calledWith('secrets', expect.anything()) .mockReturnValueOnce(secrets); } diff --git a/integrationTests/basic/jwt_auth.test.js b/integrationTests/basic/jwt_auth.test.js index 6d283ed..505bcad 100644 --- a/integrationTests/basic/jwt_auth.test.js +++ b/integrationTests/basic/jwt_auth.test.js @@ -141,23 +141,23 @@ describe('jwt auth', () => { jest.resetAllMocks(); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce(`${vaultUrl}`); when(core.getInput) - .calledWith('method') + .calledWith('method', expect.anything()) .mockReturnValueOnce('jwt'); when(core.getInput) - .calledWith('jwtPrivateKey') + .calledWith('jwtPrivateKey', expect.anything()) .mockReturnValueOnce(privateRsaKeyBase64); when(core.getInput) - .calledWith('role') + .calledWith('role', expect.anything()) .mockReturnValueOnce('default'); when(core.getInput) - .calledWith('secrets') + .calledWith('secrets', expect.anything()) .mockReturnValueOnce('secret/data/test secret'); }); @@ -191,29 +191,29 @@ describe('jwt auth', () => { jest.resetAllMocks(); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce(`${vaultUrl}`); when(core.getInput) - .calledWith('method') + .calledWith('method', expect.anything()) .mockReturnValueOnce('jwt'); when(core.getInput) - .calledWith('jwtPrivateKey') + .calledWith('jwtPrivateKey', expect.anything()) .mockReturnValueOnce(''); when(core.getInput) - .calledWith('secrets') + .calledWith('secrets', expect.anything()) .mockReturnValueOnce('secret/data/test secret'); }); it('successfully authenticates', async () => { when(core.getInput) - .calledWith('role') + .calledWith('role', expect.anything()) .mockReturnValueOnce('default'); when(core.getIDToken) - .calledWith() + .calledWith(undefined) .mockReturnValueOnce(defaultGithubJwt); await exportSecrets(); @@ -222,15 +222,15 @@ describe('jwt auth', () => { it('successfully authenticates with `jwtGithubAudience` set to `sigstore`', async () => { when(core.getInput) - .calledWith('role') + .calledWith('role', expect.anything()) .mockReturnValueOnce('default-sigstore'); when(core.getInput) - .calledWith('jwtGithubAudience') + .calledWith('jwtGithubAudience', expect.anything()) .mockReturnValueOnce('sigstore'); when(core.getIDToken) - .calledWith() + .calledWith(expect.anything()) .mockReturnValueOnce(mockGithubOIDCResponse('sigstore')); await exportSecrets(); @@ -239,11 +239,11 @@ describe('jwt auth', () => { it('successfully authenticates as default role without specifying it', async () => { when(core.getInput) - .calledWith('role') + .calledWith('role', expect.anything()) .mockReturnValueOnce(null); when(core.getIDToken) - .calledWith() + .calledWith(undefined) .mockReturnValueOnce(defaultGithubJwt); await exportSecrets(); diff --git a/integrationTests/enterprise/enterprise.test.js b/integrationTests/enterprise/enterprise.test.js index b791022..7ba9583 100644 --- a/integrationTests/enterprise/enterprise.test.js +++ b/integrationTests/enterprise/enterprise.test.js @@ -43,15 +43,15 @@ describe('integration', () => { jest.resetAllMocks(); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce(`${vaultUrl}`); when(core.getInput) - .calledWith('token') + .calledWith('token', expect.anything()) .mockReturnValueOnce('testtoken'); when(core.getInput) - .calledWith('namespace') + .calledWith('namespace', expect.anything()) .mockReturnValueOnce('ns1'); }); @@ -211,16 +211,16 @@ describe('authenticate with approle', () => { .calledWith('method', expect.anything()) .mockReturnValueOnce('approle'); when(core.getInput) - .calledWith('roleId') + .calledWith('roleId', expect.anything()) .mockReturnValueOnce(roleId); when(core.getInput) - .calledWith('secretId') + .calledWith('secretId', expect.anything()) .mockReturnValueOnce(secretId); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce(`${vaultUrl}`); when(core.getInput) - .calledWith('namespace') + .calledWith('namespace', expect.anything()) .mockReturnValueOnce('ns2'); }); @@ -286,18 +286,6 @@ async function writeSecret(engine, path, namespace, version, data) { function mockInput(secrets) { when(core.getInput) - .calledWith('secrets') + .calledWith('secrets', expect.anything()) .mockReturnValueOnce(secrets); } - -function mockEngineName(name) { - when(core.getInput) - .calledWith('path') - .mockReturnValueOnce(name); -} - -function mockVersion(version) { - when(core.getInput) - .calledWith('kv-version') - .mockReturnValueOnce(version); -} diff --git a/src/action.test.js b/src/action.test.js index 83ffed7..56af744 100644 --- a/src/action.test.js +++ b/src/action.test.js @@ -94,7 +94,7 @@ describe('parseSecretsInput', () => { describe('parseHeaders', () => { it('parses simple header', () => { when(core.getInput) - .calledWith('extraHeaders') + .calledWith('extraHeaders', undefined) .mockReturnValueOnce('TEST: 1'); const result = parseHeadersInput('extraHeaders'); expect(Array.from(result)).toContainEqual(['test', '1']); @@ -102,7 +102,7 @@ describe('parseHeaders', () => { it('parses simple header with whitespace', () => { when(core.getInput) - .calledWith('extraHeaders') + .calledWith('extraHeaders', undefined) .mockReturnValueOnce(` TEST: 1 `); @@ -112,7 +112,7 @@ describe('parseHeaders', () => { it('parses multiple headers', () => { when(core.getInput) - .calledWith('extraHeaders') + .calledWith('extraHeaders', undefined) .mockReturnValueOnce(` TEST: 1 FOO: bAr @@ -124,7 +124,7 @@ describe('parseHeaders', () => { it('parses null response', () => { when(core.getInput) - .calledWith('extraHeaders') + .calledWith('extraHeaders', undefined) .mockReturnValueOnce(null); const result = parseHeadersInput('extraHeaders'); expect(Array.from(result)).toHaveLength(0); @@ -136,29 +136,29 @@ describe('exportSecrets', () => { jest.resetAllMocks(); when(core.getInput) - .calledWith('url') + .calledWith('url', expect.anything()) .mockReturnValueOnce('http://vault:8200'); when(core.getInput) - .calledWith('token') + .calledWith('token', expect.anything()) .mockReturnValueOnce('EXAMPLE'); }); function mockInput(key) { when(core.getInput) - .calledWith('secrets') + .calledWith('secrets', expect.anything()) .mockReturnValueOnce(key); } function mockVersion(version) { when(core.getInput) - .calledWith('kv-version') + .calledWith('kv-version', expect.anything()) .mockReturnValueOnce(version); } function mockExtraHeaders(headerString) { when(core.getInput) - .calledWith('extraHeaders') + .calledWith('extraHeaders', expect.anything()) .mockReturnValueOnce(headerString); } @@ -181,7 +181,7 @@ describe('exportSecrets', () => { function mockExportToken(doExport) { when(core.getInput) - .calledWith('exportToken') + .calledWith('exportToken', expect.anything()) .mockReturnValueOnce(doExport); } diff --git a/src/auth.test.js b/src/auth.test.js index c86415b..769a4e3 100644 --- a/src/auth.test.js +++ b/src/auth.test.js @@ -16,7 +16,7 @@ const { function mockInput(name, key) { when(core.getInput) - .calledWith(name) + .calledWith(name, expect.anything()) .mockReturnValueOnce(key); }