docker/actions-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some improvements

Browse Source 
- Use classes
- Split buildx/builder modules
- Additional tests

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-01-23 10:07:14 +01:00
parent c7dfb4c220
commit aae4a2d7bc
17 changed files with 1045 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
__tests__/util.test.ts
View File

@@ -1,76 +1,61 @@
import {describe, expect, it, jest, test} from '@jest/globals';
import {describe, expect, it, test} from '@jest/globals';
import * as fs from 'fs';
import * as path from 'path';
import * as util from '../src/util';
jest.spyOn(util, 'defaultContext').mockImplementation((): string => {
return 'https://github.com/docker/actions-toolkit.git#refs/heads/test-jest';
});
jest.spyOn(util, 'tmpDir').mockImplementation((): string => {
const tmpDir = path.join('/tmp/.docker-build-push-jest').split(path.sep).join(path.posix.sep);
if (!fs.existsSync(tmpDir)) {
fs.mkdirSync(tmpDir, {recursive: true});
}
return tmpDir;
});
jest.spyOn(util, 'tmpNameSync').mockImplementation((): string => {
return path.join('/tmp/.docker-build-push-jest', '.tmpname-jest').split(path.sep).join(path.posix.sep);
});
import {Util} from '../src/util';
describe('getInputList', () => {
it('single line correctly', async () => {
await setInput('foo', 'bar');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar']);
});
it('multiline correctly', async () => {
setInput('foo', 'bar\nbaz');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz']);
});
it('empty lines correctly', async () => {
setInput('foo', 'bar\n\nbaz');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz']);
});
it('comma correctly', async () => {
setInput('foo', 'bar,baz');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz']);
});
it('empty result correctly', async () => {
setInput('foo', 'bar,baz,');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz']);
});
it('different new lines correctly', async () => {
setInput('foo', 'bar\r\nbaz');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz']);
});
it('different new lines and comma correctly', async () => {
setInput('foo', 'bar\r\nbaz,bat');
const res = util.getInputList('foo');
const res = Util.getInputList('foo');
expect(res).toEqual(['bar', 'baz', 'bat']);
});
it('multiline and ignoring comma correctly', async () => {
setInput('cache-from', 'user/app:cache\ntype=local,src=path/to/dir');
const res = util.getInputList('cache-from', true);
const res = Util.getInputList('cache-from', true);
expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
});
it('different new lines and ignoring comma correctly', async () => {
setInput('cache-from', 'user/app:cache\r\ntype=local,src=path/to/dir');
const res = util.getInputList('cache-from', true);
const res = Util.getInputList('cache-from', true);
expect(res).toEqual(['user/app:cache', 'type=local,src=path/to/dir']);
});
@@ -83,7 +68,7 @@ bbbbbbb
ccccccccc"
FOO=bar`
);
const res = util.getInputList('secrets', true);
const res = Util.getInputList('secrets', true);
expect(res).toEqual([
'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
`MYSECRET=aaaaaaaa
@@ -106,7 +91,7 @@ FOO=bar
bbbb
ccc"`
);
const res = util.getInputList('secrets', true);
const res = Util.getInputList('secrets', true);
expect(res).toEqual([
'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
`MYSECRET=aaaaaaaa
@@ -129,7 +114,7 @@ bbbbbbb
ccccccccc
FOO=bar`
);
const res = util.getInputList('secrets', true);
const res = Util.getInputList('secrets', true);
expect(res).toEqual(['GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789', 'MYSECRET=aaaaaaaa', 'bbbbbbb', 'ccccccccc', 'FOO=bar']);
});
@@ -140,7 +125,7 @@ FOO=bar`
`"GPG_KEY=${pgp}"
FOO=bar`
);
const res = util.getInputList('secrets', true);
const res = Util.getInputList('secrets', true);
expect(res).toEqual([`GPG_KEY=${pgp}`, 'FOO=bar']);
});
@@ -153,7 +138,7 @@ bbbb""bbb
ccccccccc"
FOO=bar`
);
const res = util.getInputList('secrets', true);
const res = Util.getInputList('secrets', true);
expect(res).toEqual([
'GIT_AUTH_TOKEN=abcdefgh,ijklmno=0123456789',
`MYSECRET=aaaaaaaa
@@ -169,7 +154,7 @@ describe('asyncForEach', () => {
const testValues = [1, 2, 3, 4, 5];
const results: number[] = [];
await util.asyncForEach(testValues, async value => {
await Util.asyncForEach(testValues, async value => {
results.push(value);
});
@@ -183,7 +168,7 @@ describe('isValidUrl', () => {
['https://github.com/docker/buildx.git#refs/pull/648/head', true],
['v0.4.1', false]
])('given %p', async (url, expected) => {
expect(util.isValidUrl(url)).toEqual(expected);
expect(Util.isValidUrl(url)).toEqual(expected);
});
});