Skip to content
Snippets Groups Projects
Unverified Commit 46ec89e4 authored by Sergio Zharinov's avatar Sergio Zharinov Committed by GitHub
Browse files

refactor: Replace those 'fs-extra' functions in which we can be sure (#6666)

parent 632ceaf0
No related branches found
No related tags found
No related merge requests found
import fs from 'fs-extra';
import { quote } from 'shlex'; import { quote } from 'shlex';
import upath from 'upath';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { exec } from '../../util/exec'; import { exec } from '../../util/exec';
import { BinarySource } from '../../util/exec/common'; import { BinarySource } from '../../util/exec/common';
import { readLocalFile } from '../../util/fs'; import { readLocalFile, writeLocalFile } from '../../util/fs';
import { UpdateArtifact, UpdateArtifactsResult } from '../common'; import { UpdateArtifact, UpdateArtifactsResult } from '../common';
export async function updateArtifacts({ export async function updateArtifacts({
...@@ -27,8 +25,7 @@ export async function updateArtifacts({ ...@@ -27,8 +25,7 @@ export async function updateArtifacts({
const lockFileName = 'mix.lock'; const lockFileName = 'mix.lock';
try { try {
const localPackageFileName = upath.join(cwd, packageFileName); await writeLocalFile(packageFileName, newPackageFileContent);
await fs.outputFile(localPackageFileName, newPackageFileContent);
} catch (err) { } catch (err) {
logger.warn({ err }, 'mix.exs could not be written'); logger.warn({ err }, 'mix.exs could not be written');
return [ return [
...@@ -80,8 +77,7 @@ export async function updateArtifacts({ ...@@ -80,8 +77,7 @@ export async function updateArtifacts({
]; ];
} }
const localLockFileName = upath.join(cwd, lockFileName); const newMixLockContent = await readLocalFile(lockFileName, 'utf8');
const newMixLockContent = await fs.readFile(localLockFileName, 'utf8');
if (existingLockFileContent === newMixLockContent) { if (existingLockFileContent === newMixLockContent) {
logger.debug('mix.lock is unchanged'); logger.debug('mix.lock is unchanged');
return null; return null;
......
import { ensureDir, outputFile, readFile, remove } from 'fs-extra'; import { ensureDir } from 'fs-extra';
import { join } from 'upath'; import { join } from 'upath';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { platform } from '../../platform'; import { platform } from '../../platform';
import { ExecOptions, exec } from '../../util/exec'; import { ExecOptions, exec } from '../../util/exec';
import { readLocalFile } from '../../util/fs'; import { deleteLocalFile, readLocalFile, writeLocalFile } from '../../util/fs';
import { import {
UpdateArtifact, UpdateArtifact,
UpdateArtifactsConfig, UpdateArtifactsConfig,
...@@ -54,11 +54,9 @@ export async function updateArtifacts({ ...@@ -54,11 +54,9 @@ export async function updateArtifacts({
return null; return null;
} }
try { try {
const localPipfileFileName = join(config.localDir, pipfileName); await writeLocalFile(pipfileName, newPipfileContent);
await outputFile(localPipfileFileName, newPipfileContent);
const localLockFileName = join(config.localDir, lockFileName);
if (config.isLockFileMaintenance) { if (config.isLockFileMaintenance) {
await remove(localLockFileName); await deleteLocalFile(lockFileName);
} }
const cmd = 'pipenv lock'; const cmd = 'pipenv lock';
const tagConstraint = getPythonConstraint(existingLockFileContent, config); const tagConstraint = getPythonConstraint(existingLockFileContent, config);
...@@ -85,7 +83,7 @@ export async function updateArtifacts({ ...@@ -85,7 +83,7 @@ export async function updateArtifacts({
{ {
file: { file: {
name: lockFileName, name: lockFileName,
contents: await readFile(localLockFileName, 'utf8'), contents: await readLocalFile(lockFileName, 'utf8'),
}, },
}, },
]; ];
......
import is from '@sindresorhus/is'; import is from '@sindresorhus/is';
import fs from 'fs-extra';
import { quote } from 'shlex'; import { quote } from 'shlex';
import { parse } from 'toml'; import { parse } from 'toml';
import { logger } from '../../logger'; import { logger } from '../../logger';
import { ExecOptions, exec } from '../../util/exec'; import { ExecOptions, exec } from '../../util/exec';
import { import {
deleteLocalFile,
getSiblingFileName, getSiblingFileName,
readLocalFile, readLocalFile,
writeLocalFile, writeLocalFile,
...@@ -65,7 +65,7 @@ export async function updateArtifacts({ ...@@ -65,7 +65,7 @@ export async function updateArtifacts({
await writeLocalFile(packageFileName, newPackageFileContent); await writeLocalFile(packageFileName, newPackageFileContent);
const cmd: string[] = []; const cmd: string[] = [];
if (config.isLockFileMaintenance) { if (config.isLockFileMaintenance) {
await fs.remove(lockFileName); await deleteLocalFile(lockFileName);
cmd.push('poetry update --lock --no-interaction'); cmd.push('poetry update --lock --no-interaction');
} else { } else {
for (let i = 0; i < updatedDeps.length; i += 1) { for (let i = 0; i < updatedDeps.length; i += 1) {
......
...@@ -2,6 +2,7 @@ import fs from 'fs-extra'; ...@@ -2,6 +2,7 @@ import fs from 'fs-extra';
import { RenovateConfig } from '../../config'; import { RenovateConfig } from '../../config';
import { logger, setMeta } from '../../logger'; import { logger, setMeta } from '../../logger';
import { platform } from '../../platform'; import { platform } from '../../platform';
import { deleteLocalFile } from '../../util/fs';
import { addSplit, getSplits, splitInit } from '../../util/split'; import { addSplit, getSplits, splitInit } from '../../util/split';
import handleError from './error'; import handleError from './error';
import { finaliseRepo } from './finalise'; import { finaliseRepo } from './finalise';
...@@ -52,7 +53,7 @@ export async function renovateRepository( ...@@ -52,7 +53,7 @@ export async function renovateRepository(
} }
await platform.cleanRepo(); await platform.cleanRepo();
if (config.localDir && !config.persistRepoData) { if (config.localDir && !config.persistRepoData) {
await fs.remove(config.localDir); await deleteLocalFile('.');
} }
const splits = getSplits(); const splits = getSplits();
logger.debug(splits, 'Repository timing splits (milliseconds)'); logger.debug(splits, 'Repository timing splits (milliseconds)');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment