Skip to content

Commit 2891c86

Browse files
authored
Fix style errors reported by codacy (#4)
1 parent 66f387c commit 2891c86

File tree

3 files changed

+59
-49
lines changed

3 files changed

+59
-49
lines changed

.codacy.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
exclude_paths:
3+
- '.github/**'
4+
- '.vscode/**'
5+
- 'CHANGELOG.md'
6+
- 'CODE_OF_CONDUCT.md'
7+
- 'CONTRIBUTING.md'
8+
- 'docs/**'
9+
- 'README.md'

dist/index.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12949,8 +12949,8 @@ async function up() {
1294912949
try {
1295012950
await compose.upAll({ config: __nccwpck_require__.ab + "docker-compose.yml", log: false })
1295112951
.then(
12952-
() => { console.log('compose started')},
12953-
err => { core.setFailed(`compose up failed ${err}`)}
12952+
() => { core.info("compose started"); },
12953+
(err) => { core.setFailed(`compose up failed ${err}`); }
1295412954
);
1295512955
} catch (error) {
1295612956
core.setFailed(error.message);
@@ -12961,8 +12961,8 @@ async function down() {
1296112961
try {
1296212962
await compose.down({ config: __nccwpck_require__.ab + "docker-compose.yml", log: false })
1296312963
.then(
12964-
() => { console.log('compose down')},
12965-
err => { core.setFailed(`compose down failed ${err}`)}
12964+
() => { core.info("compose down"); },
12965+
(err) => { core.setFailed(`compose down failed ${err}`); }
1296612966
);
1296712967
} catch (error) {
1296812968
core.setFailed(error.message);
@@ -12972,48 +12972,48 @@ async function down() {
1297212972
async function init() {
1297312973

1297412974
if (!fs.existsSync(__nccwpck_require__.ab + "exec.yml")) {
12975-
console.log('exec.yml not found');
12975+
core.info("exec.yml not found");
1297612976
} else {
12977-
let container_commands = yaml.load(fs.readFileSync(__nccwpck_require__.ab + "exec.yml", 'utf8'));
12977+
let containerCommands = yaml.load(fs.readFileSync(__nccwpck_require__.ab + "exec.yml", "utf8"));
1297812978

12979-
for(const cc of container_commands['exec_list']) {
12979+
for(const cc of containerCommands["exec_list"]) {
1298012980
try {
12981-
console.log(`executing "${cc.name}" inside "${cc.container}"`);
12982-
for(const c of cc['commands'])
12983-
{
12984-
await compose.exec(cc.container, c, { config: __nccwpck_require__.ab + "docker-compose.yml", log: true })
12985-
}
12981+
core.info(`executing "${cc.name}" inside "${cc.container}"`);
12982+
execInContainer(cc.container, cc.commands, { config: __nccwpck_require__.ab + "docker-compose.yml", log: false });
1298612983
} catch (error) {
1298712984
core.setFailed(error.message);
1298812985
}
1298912986
}
1299012987
}
1299112988
}
1299212989

12990+
async function execInContainer(container, commands, options={}) {
12991+
for(const c of commands)
12992+
{
12993+
await compose.exec(container, c, options);
12994+
}
12995+
}
12996+
1299312997
try {
12994-
fs.existsSync(__nccwpck_require__.ab + "docker-compose.yml")
12998+
fs.existsSync(__nccwpck_require__.ab + "docker-compose.yml");
1299512999
} catch (error) {
1299613000
core.setFailed(error.message);
1299713001
}
1299813002

1299913003
switch (myArgs[0]) {
13000-
case 'up': {
13004+
case "up":
1300113005
up();
1300213006
break;
13003-
}
13004-
case 'init': {
13007+
case "init":
1300513008
init();
1300613009
break;
13007-
}
13008-
case 'down': {
13010+
case "down":
1300913011
down();
1301013012
break;
13011-
}
13012-
default: {
13013-
console.log('staring phpipam in action mode')
13013+
default:
13014+
core.info("staring phpipam in action mode");
1301413015
up();
1301513016
setTimeout(init, 30000);
13016-
}
1301713017
}
1301813018

1301913019
})();

main.js

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
const core = require('@actions/core');
2-
const compose = require('docker-compose');
3-
const fs = require('fs');
4-
const yaml = require('js-yaml');
5-
const { exit } = require('process');
1+
const core = require("@actions/core");
2+
const compose = require("docker-compose");
3+
const fs = require("fs");
4+
const yaml = require("js-yaml");
65

76
const myArgs = process.argv.slice(2);
87

@@ -13,8 +12,8 @@ async function up() {
1312
try {
1413
await compose.upAll({ config: composeFile, log: false })
1514
.then(
16-
() => { console.log('compose started')},
17-
err => { core.setFailed(`compose up failed ${err}`)}
15+
() => { core.info("compose started"); },
16+
(err) => { core.setFailed(`compose up failed ${err}`); }
1817
);
1918
} catch (error) {
2019
core.setFailed(error.message);
@@ -25,28 +24,33 @@ async function down() {
2524
try {
2625
await compose.down({ config: composeFile, log: false })
2726
.then(
28-
() => { console.log('compose down')},
29-
err => { core.setFailed(`compose down failed ${err}`)}
27+
() => { core.info("compose down"); },
28+
(err) => { core.setFailed(`compose down failed ${err}`); }
3029
);
3130
} catch (error) {
3231
core.setFailed(error.message);
3332
}
3433
}
3534

35+
async function execInContainer(container, commands, options={}) {
36+
for(const c of commands)
37+
{
38+
await compose.exec(container, c, options);
39+
}
40+
}
41+
3642
async function init() {
3743

3844
if (!fs.existsSync(execFile)) {
39-
console.log('exec.yml not found');
45+
core.info("exec.yml not found");
4046
} else {
41-
let container_commands = yaml.load(fs.readFileSync(execFile, 'utf8'));
47+
/* eslint-disable-next-line security/detect-non-literal-fs-filename -- Safe as no value holds user input */
48+
let containerCommands = yaml.load(fs.readFileSync(execFile, "utf8"));
4249

43-
for(const cc of container_commands['exec_list']) {
50+
for(const cc of containerCommands["exec_list"]) {
4451
try {
45-
console.log(`executing "${cc.name}" inside "${cc.container}"`);
46-
for(const c of cc['commands'])
47-
{
48-
await compose.exec(cc.container, c, { config: composeFile, log: true })
49-
}
52+
core.info(`executing "${cc.name}" inside "${cc.container}"`);
53+
execInContainer(cc.container, cc.commands, { config: composeFile, log: false });
5054
} catch (error) {
5155
core.setFailed(error.message);
5256
}
@@ -55,27 +59,24 @@ async function init() {
5559
}
5660

5761
try {
58-
fs.existsSync(composeFile)
62+
/* eslint-disable-next-line security/detect-non-literal-fs-filename -- Safe as no value holds user input */
63+
fs.existsSync(composeFile);
5964
} catch (error) {
6065
core.setFailed(error.message);
6166
}
6267

6368
switch (myArgs[0]) {
64-
case 'up': {
69+
case "up":
6570
up();
6671
break;
67-
}
68-
case 'init': {
72+
case "init":
6973
init();
7074
break;
71-
}
72-
case 'down': {
75+
case "down":
7376
down();
7477
break;
75-
}
76-
default: {
77-
console.log('staring phpipam in action mode')
78+
default:
79+
core.info("staring phpipam in action mode");
7880
up();
7981
setTimeout(init, 30000);
80-
}
8182
}

0 commit comments

Comments
 (0)