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

buildkit(config): rename methods

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-02-03 14:45:32 +01:00
parent fdfeb2486a
commit 11bdb1082a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/buildkit/config.test.ts
View File

@@ -45,7 +45,7 @@ afterEach(() => {
rimraf.sync(tmpDir); rimraf.sync(tmpDir);
}); });
describe('generate', () => { describe('resolve', () => {
test.each([ test.each([
['debug = true', false, 'debug = true', null], ['debug = true', false, 'debug = true', null],
[`notfound.toml`, true, '', new Error('config file notfound.toml not found')], [`notfound.toml`, true, '', new Error('config file notfound.toml not found')],
@@ -65,9 +65,9 @@ describe('generate', () => {
}); });
let config: string; let config: string;
if (file) { if (file) {
config = buildkit.config.generateFromFile(val); config = buildkit.config.resolveFromFile(val);
} else { } else {
config = buildkit.config.generateFromString(val); config = buildkit.config.resolveFromString(val);
} }
expect(config).toEqual(tmpName); expect(config).toEqual(tmpName);
const configValue = fs.readFileSync(tmpName, 'utf-8'); const configValue = fs.readFileSync(tmpName, 'utf-8');

10
src/buildkit/config.ts
View File

@@ -25,15 +25,15 @@ export class Config {
this.context = context; this.context = context;
} }
public generateFromString(s: string): string { public resolveFromString(s: string): string {
return this.generate(s, false); return this.resolve(s, false);
} }
public generateFromFile(s: string): string { public resolveFromFile(s: string): string {
return this.generate(s, true); return this.resolve(s, true);
} }
private generate(s: string, file: boolean): string { private resolve(s: string, file: boolean): string {
if (file) { if (file) {
if (!fs.existsSync(s)) { if (!fs.existsSync(s)) {
throw new Error(`config file ${s} not found`); throw new Error(`config file ${s} not found`);