Change code according to review points

This commit is contained in:
Ivan Zosimov (Akvelon INC) 2022-02-28 15:30:28 +03:00
parent 86d1cd689b
commit 8d80cd6b60
5 changed files with 18 additions and 16 deletions

View file

@ -3944,7 +3944,8 @@ exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, vo
if (!package_managers_1.supportedPackageManagers[packageManager]) { if (!package_managers_1.supportedPackageManagers[packageManager]) {
throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`); throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`);
} }
return package_managers_1.supportedPackageManagers[packageManager]; const obtainedPackageManager = package_managers_1.supportedPackageManagers[packageManager];
return obtainedPackageManager;
}); });
exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () { exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand); const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand);
@ -46368,10 +46369,11 @@ function run() {
} }
exports.run = run; exports.run = run;
const cachePackages = () => __awaiter(void 0, void 0, void 0, function* () { const cachePackages = () => __awaiter(void 0, void 0, void 0, function* () {
const cachingFlag = core.getBooleanInput('cache'); const cacheInput = core.getInput('cache');
if (!cachingFlag) if (!cacheInput) {
return; return;
const packageManager = core.getInput('package-manager'); }
const packageManager = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
const state = core.getState(constants_1.State.CacheMatchedKey); const state = core.getState(constants_1.State.CacheMatchedKey);
const primaryKey = core.getState(constants_1.State.CachePrimaryKey); const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager); const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);

6
dist/setup/index.js vendored
View file

@ -3705,7 +3705,8 @@ function run() {
// stable will be true unless false is the exact input // stable will be true unless false is the exact input
// since getting unstable versions should be explicit // since getting unstable versions should be explicit
let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE'; let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
const cache = core.getBooleanInput('cache'); const cacheInput = core.getInput('cache');
const cache = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`); core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
if (versionSpec) { if (versionSpec) {
let token = core.getInput('token'); let token = core.getInput('token');
@ -4188,7 +4189,8 @@ exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, vo
if (!package_managers_1.supportedPackageManagers[packageManager]) { if (!package_managers_1.supportedPackageManagers[packageManager]) {
throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`); throw new Error(`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`);
} }
return package_managers_1.supportedPackageManagers[packageManager]; const obtainedPackageManager = package_managers_1.supportedPackageManagers[packageManager];
return obtainedPackageManager;
}); });
exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () { exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand); const stdout = yield exports.getCommandOutput(packageManagerInfo.getCacheFolderCommand);

View file

@ -21,14 +21,13 @@ export async function run() {
} }
const cachePackages = async () => { const cachePackages = async () => {
const cache = core.getInput('cache');
const cacheInput = core.getInput('cache'); if (!cache) {
if (!cacheInput) {
return; return;
} }
const packageManager = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
const packageManager = cache.toUpperCase() === 'TRUE' ? 'default' : cache;
const state = core.getState(State.CacheMatchedKey); const state = core.getState(State.CacheMatchedKey);
const primaryKey = core.getState(State.CachePrimaryKey); const primaryKey = core.getState(State.CachePrimaryKey);

View file

@ -24,7 +24,7 @@ export const getPackageManagerInfo = async (packageManager: string) => {
`It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.` `It's not possible to use ${packageManager}, please, check correctness of the package manager name spelling.`
); );
} }
const obtainedPackageManager = supportedPackageManagers[packageManager] const obtainedPackageManager = supportedPackageManagers[packageManager];
return obtainedPackageManager; return obtainedPackageManager;
}; };

View file

@ -19,9 +19,8 @@ export async function run() {
// since getting unstable versions should be explicit // since getting unstable versions should be explicit
let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE'; let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
const cacheInput = core.getInput('cache'); const cache = core.getInput('cache');
const cache = cacheInput.toUpperCase() === 'TRUE' ? 'default' : cacheInput;
core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`); core.info(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
if (versionSpec) { if (versionSpec) {
@ -49,7 +48,7 @@ export async function run() {
if (isGhes()) { if (isGhes()) {
throw new Error('Caching is not supported on GHES'); throw new Error('Caching is not supported on GHES');
} }
const packageManager = core.getInput('package-manager'); const packageManager = cache.toUpperCase() === 'TRUE' ? 'default' : cache;
const cacheDependencyPath = core.getInput('cache-dependency-path'); const cacheDependencyPath = core.getInput('cache-dependency-path');
await restoreCache(packageManager, cacheDependencyPath); await restoreCache(packageManager, cacheDependencyPath);
} }