Skip to content

Commit 85bd3f8

Browse files
robertpatrickrobertpatrick
committed
sonar cleanup
1 parent 400afd5 commit 85bd3f8

15 files changed

+70
-88
lines changed

‎electron/app/js/fsUtils.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,15 @@ async function removeDirectoryRecursively(directoryToDelete) {
5555
exists(directoryToDelete)
5656
.then(doesExist => {
5757
if (doesExist) {
58-
fsPromises.rm(directoryToDelete, {
59-
force: true,
60-
recursive: true
61-
})
62-
.then(() => {
63-
exists(directoryToDelete).then(stillExists => {
64-
if (!stillExists) {
65-
resolve(!stillExists);
66-
} else {
67-
reject(`Failed to completely remove directory ${directoryToDelete}`);
68-
}
69-
}).catch(err => reject(err));
58+
fsPromises.rm(directoryToDelete, { force: true, recursive: true }).then(() => {
59+
exists(directoryToDelete).then(stillExists => {
60+
if (!stillExists) {
61+
resolve(true);
62+
} else {
63+
reject(`Failed to completely remove directory ${directoryToDelete}`);
64+
}
7065
}).catch(err => reject(err));
66+
}).catch(err => reject(err));
7167
} else {
7268
resolve(false);
7369
}

‎electron/app/js/project.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,9 @@ function _addOpenProject(targetWindow, file, pending, credentialManager) {
732732
// assign project file to window if none is assigned, or file path changes.
733733
// avoid unnecessary reassignments in order to keep credential manager between saves.
734734
function _assignProjectFile(targetWindow, projectFile) {
735-
const openProject = openProjects.get(targetWindow);
736-
const oldFile = openProject ? openProject.projectDirectory + '|' + openProject.projectFile : '';
737-
const newFile = path.resolve(path.dirname(projectFile)) + '|' + path.basename(projectFile);
735+
const existingProject = openProjects.get(targetWindow);
736+
const oldFile = existingProject ? `${existingProject.projectDirectory}|${existingProject.projectFile}` : '';
737+
const newFile = `${path.resolve(path.dirname(projectFile))}|${path.basename(projectFile)}`;
738738
if (newFile !== oldFile) {
739739
_addOpenProject(targetWindow, projectFile, false);
740740
}

‎electron/app/js/wktApp.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ class WktApp {
7474
throw new Error(`Failed to read version file ${versionFilePath}: ${errorUtils.getErrorMessage(err)}`);
7575
}
7676

77-
let version;
77+
let buildVersion;
7878
if (!contents) {
79-
version = defaultVersion;
79+
buildVersion = defaultVersion;
8080
} else if (contents.startsWith('-')) {
8181
// dev build so concatenate the app version with the qualifier from the file
82-
version = `${defaultVersion}${contents.trim()}`;
82+
buildVersion = `${defaultVersion}${contents.trim()}`;
8383
} else {
8484
return contents.trim();
8585
}
86-
return version;
86+
return buildVersion;
8787
}
8888
}
8989

‎electron/app/js/wktLogging.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function _getLogFileMaxFiles(fileLogConfig) {
284284

285285
function _getMustacheVariables(text) {
286286
const mustacheVariables = [];
287-
const mustacheRegex = /{{([a-zA-Z0-9\\_\\-\\.]+)}}/g;
287+
const mustacheRegex = /{{([a-zA-Z0-9_.-]+)}}/g;
288288

289289
if (text) {
290290
let match = mustacheRegex.exec(text);

‎electron/app/test/wktApp-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ describe('WKT App tests', () => {
4646
const WktMode = proxyquire('../js/wktMode', { electron: electronStub });
4747

4848
function getDefaultVersionNumber() {
49-
const packageJsonFileName = path.normalize(path.join(__dirname, '..', '..', 'package.json'));
50-
const packageJson = require(packageJsonFileName);
5149
const wktuiVersionFileName = path.normalize(path.join(__dirname, '..', '..', '..', 'WKTUI_VERSION.txt'));
5250
const qualifier = readFileSync(wktuiVersionFileName, { encoding: 'utf8'});
5351
return `${packageJson.version}${qualifier.trim()}`;

‎electron/build/notarize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function getAppId(context) {
6161
}
6262

6363
exports.default = async function notarizing(context) {
64-
const { electronPlatformName, appOutDir } = context;
64+
const { electronPlatformName } = context;
6565
if (electronPlatformName !== 'darwin' || process.env.CSC_IDENTITY_AUTO_DISCOVERY === 'false') {
6666
return;
6767
}

‎webui/scripts/hooks/after_build.js

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
/**
2-
Copyright (c) 2015, 2021, Oracle and/or its affiliates.
3-
Licensed under The Universal Permissive License (UPL), Version 1.0
4-
as shown at https://oss.oracle.com/licenses/upl/
5-
6-
*/
2+
Copyright (c) 2015, 2021, Oracle and/or its affiliates.
3+
Licensed under The Universal Permissive License (UPL), Version 1.0
4+
as shown at https://oss.oracle.com/licenses/upl/
5+
*/
76

87
'use strict';
98

109
const fs = require('fs');
1110
const fsPromises = require('fs/promises');
12-
const { copyFile, lstat, mkdir, readdir } = require('fs/promises');
11+
const { copyFile, mkdir, readdir } = require('fs/promises');
1312
const path = require('path');
1413

1514
const purgeLocations = [
@@ -22,44 +21,44 @@ const sourceDirectories = [
2221
const targetDirectory = path.normalize(path.join(__dirname, '..', '..', '..', 'electron', 'app'));
2322

2423
module.exports = function (configObj) {
25-
return new Promise(async (resolve, reject) => {
26-
console.log("Running after_build hook.");
24+
return new Promise(async (resolve) => {
25+
console.log("Running after_build hook.");
2726
console.log('Purging unnecessary files created by the build...');
2827
for (const purgeLocation of purgeLocations) {
2928
if (fs.existsSync(purgeLocation)) {
3029
fs.rmSync(purgeLocation, { force: true, recursive: true });
3130
}
3231
}
3332

34-
if (configObj.buildType === 'release') {
35-
console.log('Consolidating files for building the release');
36-
for (const sourceDirectory of sourceDirectories) {
37-
if (fs.existsSync(sourceDirectory)) {
33+
if (configObj.buildType === 'release') {
34+
console.log('Consolidating files for building the release');
35+
for (const sourceDirectory of sourceDirectories) {
36+
if (fs.existsSync(sourceDirectory)) {
3837
console.log(`Copying ${sourceDirectory} to ${targetDirectory}`)
3938
await copyDirectoryRecursively(sourceDirectory, targetDirectory);
4039
}
4140
}
4241
}
43-
resolve(configObj);
42+
resolve(configObj);
4443
});
4544
};
4645

4746
async function copyDirectoryRecursively(source, target) {
4847
let files = []
4948

50-
let targetDirectory = path.join(target, path.basename(source));
51-
if (!fs.existsSync(targetDirectory)) {
52-
await mkdir(targetDirectory);
49+
let _targetDirectory = path.join(target, path.basename(source));
50+
if (!fs.existsSync(_targetDirectory)) {
51+
await mkdir(_targetDirectory);
5352
}
5453

5554
if (await isDirectory(source)) {
5655
files = await readdir(source);
5756
for (const file of files) {
5857
const currentSource = path.join(source, file);
5958
if (await isDirectory(currentSource)) {
60-
await copyDirectoryRecursively(currentSource, targetDirectory);
59+
await copyDirectoryRecursively(currentSource, _targetDirectory);
6160
} else {
62-
await copyFileToDirectory(currentSource, targetDirectory);
61+
await copyFileToDirectory(currentSource, _targetDirectory);
6362
}
6463
}
6564
} else {
@@ -75,8 +74,8 @@ async function copyFileToDirectory(source, target) {
7574
await copyFile(source, targetFile);
7675
}
7776

78-
async function isDirectory(path) {
79-
const result = await fsPromises.lstat(path).catch(err => {
77+
async function isDirectory(testPath) {
78+
const result = await fsPromises.lstat(testPath).catch(err => {
8079
if (err.code === 'ENOENT') {
8180
return false;
8281
}

‎webui/src/js/utils/ingress-resource-generator.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,27 +138,15 @@ define(['models/wkt-project', 'js-yaml'],
138138
}
139139

140140
isSSLTerminateAtIngress(item) {
141-
if (item && item['tlsOption'] === 'ssl_terminate_ingress') {
142-
return true;
143-
} else {
144-
return false;
145-
}
141+
return (item && item['tlsOption'] === 'ssl_terminate_ingress');
146142
}
147143

148144
isSSLPassThrough(item) {
149-
if (item && item['tlsOption'] === 'ssl_passthrough') {
150-
return true;
151-
} else {
152-
return false;
153-
}
145+
return (item && item['tlsOption'] === 'ssl_passthrough');
154146
}
155147

156148
isPlainHTTP(item) {
157-
if (item && item['tlsOption'] === 'plain') {
158-
return true;
159-
} else {
160-
return false;
161-
}
149+
return (item && item['tlsOption'] === 'plain');
162150
}
163151

164152
createTraefikMiddlewaresAsYaml(item) {

‎webui/src/js/utils/observable-properties.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ define(['knockout', 'utils/common-utilities', 'utils/validation-helper', 'utils/
693693
}
694694

695695
function escape(s) {
696-
return /[,;\n\s]/.test(s) ? `"${s}"` : s;
696+
return /[,;\s]/.test(s) ? `"${s}"` : s;
697697
}
698698

699699
function arrayToString(array) {

‎webui/src/js/utils/validation-helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,15 +369,15 @@ function(i18n, Validator, ojvalidationError, RegExpValidator, LengthValidator, N
369369
}
370370
}
371371

372-
const K8S_MEMORY_REGEX = /^[1-9]\d*((E|P|T|G|M|K)i?)?$/;
372+
const K8S_MEMORY_REGEX = /^[1-9]\d*([EPTGMK]i?)?$/;
373373
const K8S_MEMORY_HELP_URL = 'https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory';
374374
function _validateK8sMemoryValue(value) {
375375
if (value && !K8S_MEMORY_REGEX.test(value)) {
376376
throw new Error(i18n.t('validation-helper-k8s-memory-error', { value: value, url: K8S_MEMORY_HELP_URL }));
377377
}
378378
}
379379

380-
const JAVA_MEMORY_REGEX = /^[1-9]\d*(k|K|m|M|g|G)?$/;
380+
const JAVA_MEMORY_REGEX = /^[1-9]\d*[kKmMgG]?$/;
381381
const JAVA_MEMORY_HELP_URL = 'https://docs.oracle.com/javase/8/docs/technotes/tools/windows/java.html#BABDJJFI';
382382
function _validateJavaMemoryValue(value) {
383383
if (value && !JAVA_MEMORY_REGEX.test(value)) {

0 commit comments

Comments
 (0)