remove more occurences of fs-extra

Author: Hweinstock

packages/core/src/codecatalyst/model.ts

@@ -18,7 +18,6 @@ import { DevEnvClient } from '../shared/clients/devenvClient'
 import { getLogger } from '../shared/logger'
 import { AsyncCollection, toCollection } from '../shared/utilities/asyncCollection'
 import { getCodeCatalystSpaceName, getCodeCatalystProjectName, getCodeCatalystDevEnvId } from '../shared/vscode/env'
-import { writeFile } from 'fs-extra'
 import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../shared/extensions/ssh'
 import { ChildProcess } from '../shared/utilities/processUtils'
 import { isDevenvVscode } from './utils'
@@ -31,6 +30,7 @@ import { ToolkitError } from '../shared/errors'
 import { Result } from '../shared/utilities/result'
 import { VscodeRemoteConnection, ensureDependencies } from '../shared/remoteSession'
 import { SshConfig, sshLogFileLocation } from '../shared/sshConfig'
+import { fs } from '../shared'
 
 export type DevEnvironmentId = Pick<DevEnvironment, 'id' | 'org' | 'project'>
 export const connectScriptPrefix = 'codecatalyst_connect'
@@ -134,7 +134,7 @@ export function createBoundProcess(envProvider: EnvProvider): typeof ChildProces
 }
 
 export async function cacheBearerToken(bearerToken: string, devenvId: string): Promise<void> {
-    await writeFile(bearerTokenCacheLocation(devenvId), `${bearerToken}`, 'utf8')
+    await fs.writeFile(bearerTokenCacheLocation(devenvId), `${bearerToken}`, 'utf8')
 }
 
 export function bearerTokenCacheLocation(devenvId: string): string {

packages/core/src/dev/codecatalyst.ts

@@ -4,7 +4,6 @@
  */
 
 import { glob } from 'glob'
-import * as fs from 'fs-extra'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import * as manifest from '../../package.json'
@@ -21,6 +20,7 @@ import { startVscodeRemote } from '../shared/extensions/ssh'
 import { isValidResponse } from '../shared/wizards/wizard'
 import { createQuickPick } from '../shared/ui/pickerPrompter'
 import { createCommonButtons } from '../shared/ui/buttons'
+import { fs } from '../shared'
 
 type LazyProgress<T> = vscode.Progress<T> & vscode.Disposable & { getToken(): Timeout }
 
@@ -217,7 +217,7 @@ async function installVsix(
     if (path.extname(resp) !== '.vsix') {
         progress.report({ message: 'Copying extension...' })
 
-        const packageData = await fs.readFile(path.join(resp, 'package.json'), 'utf-8')
+        const packageData = await fs.readFileAsString(path.join(resp, 'package.json'))
         const targetManfiest: typeof manifest = JSON.parse(packageData)
         const destName = `${extPath}/${extId}-${targetManfiest.version}`
         const source = `${resp}${path.sep}`

packages/core/src/dynamicResources/awsResourceManager.ts

@@ -4,7 +4,6 @@
  */
 
 import { writeFileSync } from 'fs'
-import { remove } from 'fs-extra'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { CloudFormationClient } from '../shared/clients/cloudFormationClient'
@@ -20,6 +19,7 @@ import { ResourceNode } from './explorer/nodes/resourceNode'
 import { ResourceTypeNode } from './explorer/nodes/resourceTypeNode'
 import { isCloud9 } from '../shared/extensionUtilities'
 import globals from '../shared/extensionGlobals'
+import { fs } from '../shared'
 
 export const resourceFileGlobPattern = '**/*.awsResource.json'
 
@@ -97,7 +97,7 @@ export class AwsResourceManager {
             }
 
             if (uri.scheme === 'file') {
-                await remove(uri.fsPath)
+                await fs.delete(uri.fsPath)
 
                 globals.schemaService.registerMapping({
                     uri,

packages/core/src/lambda/commands/createNewSamApp.ts

@@ -42,13 +42,13 @@ import { waitUntil } from '../../shared/utilities/timeoutUtils'
 import { debugNewSamAppUrl, launchConfigDocUrl } from '../../shared/constants'
 import { getIdeProperties, isCloud9 } from '../../shared/extensionUtilities'
 import { execFileSync } from 'child_process'
-import { writeFile } from 'fs-extra'
 import { checklogs } from '../../shared/localizedText'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { LambdaArchitecture, Result, Runtime } from '../../shared/telemetry/telemetry'
 import { getTelemetryReason, getTelemetryResult } from '../../shared/errors'
 import { openUrl, replaceVscodeVars } from '../../shared/utilities/vsCodeUtils'
+import { fs } from '../../shared'
 
 export const samInitTemplateFiles: string[] = ['template.yaml', 'template.yml']
 export const samInitReadmeFile: string = 'README.TOOLKIT.md'
@@ -472,7 +472,7 @@ export async function writeToolkitReadme(
                     : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html'
             )
 
-        await writeFile(readmeLocation, readme)
+        await fs.writeFile(readmeLocation, readme)
         getLogger().debug(`writeToolkitReadme: wrote file: %O`, readmeLocation)
 
         return true

packages/core/src/lambda/commands/downloadLambda.ts

@@ -4,7 +4,6 @@
  */
 
 import AdmZip from 'adm-zip'
-import * as fs from 'fs-extra'
 import * as _ from 'lodash'
 import * as path from 'path'
 import * as vscode from 'vscode'
@@ -26,6 +25,7 @@ import { Progress } from 'got/dist/source'
 import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { Result, Runtime } from '../../shared/telemetry/telemetry'
+import { fs } from '../../shared'
 
 export async function downloadLambdaCommand(functionNode: LambdaFunctionNode) {
     const result = await runDownloadLambda(functionNode)
@@ -57,7 +57,7 @@ async function runDownloadLambda(functionNode: LambdaFunctionNode): Promise<Resu
     const downloadLocation = path.join(selectedUri.fsPath, functionName, path.sep)
     const downloadLocationName = vscode.workspace.asRelativePath(downloadLocation, true)
 
-    if (await fs.pathExists(downloadLocation)) {
+    if (await fs.exists(downloadLocation)) {
         const isConfirmed = await showConfirmationMessage({
             prompt: localize(
                 'AWS.lambda.download.prompt',

packages/core/src/lambda/config/templates.ts

@@ -5,18 +5,19 @@
 
 // Use jsonc-parser.parse instead of JSON.parse, as JSONC can handle comments. VS Code uses jsonc-parser
 // under the hood to provide symbols for JSON documents, so this will keep us consistent with VS code.
-import { access, writeFile, ensureDir } from 'fs-extra'
 import * as jsonParser from 'jsonc-parser'
 import * as os from 'os'
 import * as _path from 'path'
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 import * as fsUtils from '../../shared/filesystemUtilities'
+import * as fsExtra from 'fs-extra'
 import { getLogger, Logger } from '../../shared/logger'
 import { ReadonlyJsonObject } from '../../shared/sam/debugger/awsSamDebugConfiguration'
 import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
 import { getNormalizedRelativePath } from '../../shared/utilities/pathUtils'
 import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
+import { fs } from '../../shared'
 
 const localize = nls.loadMessageBundle()
 
@@ -197,11 +198,11 @@ export function showTemplatesConfigurationError(
 }
 
 export async function ensureTemplatesConfigFileExists(path: string): Promise<void> {
-    await ensureDir(_path.dirname(path))
+    await fs.mkdir(_path.dirname(path))
     try {
-        await access(path)
+        await fsExtra.access(path)
     } catch {
-        await writeFile(path, '{}')
+        await fs.writeFile(path, '{}')
     }
 }
 

packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs-extra'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
@@ -36,6 +35,7 @@ import globals from '../../../shared/extensionGlobals'
 import { VueWebview } from '../../../webviews/main'
 import { Commands } from '../../../shared/vscode/commands2'
 import { telemetry } from '../../../shared/telemetry/telemetry'
+import { fs } from '../../../shared'
 
 const localize = nls.loadMessageBundle()
 
@@ -220,7 +220,7 @@ export class SamInvokeWebview extends VueWebview {
      * @param config Config to save
      */
     public async saveLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<void> {
-        const uri = getUriFromLaunchConfig(config)
+        const uri = await getUriFromLaunchConfig(config)
         if (!uri) {
             // TODO Localize
             void vscode.window.showErrorMessage(
@@ -289,7 +289,7 @@ export class SamInvokeWebview extends VueWebview {
             resolveWorkspaceFolderVariable(undefined, config),
             'Editor-Created Debug Config'
         )
-        const targetUri = getUriFromLaunchConfig(finalConfig)
+        const targetUri = await getUriFromLaunchConfig(finalConfig)
         const folder = targetUri ? vscode.workspace.getWorkspaceFolder(targetUri) : undefined
 
         // Cloud9 currently can't resolve the `aws-sam` debug config provider.
@@ -321,7 +321,7 @@ export function registerSamInvokeVueCommand(context: ExtContext): vscode.Disposa
     })
 }
 
-function getUriFromLaunchConfig(config: AwsSamDebuggerConfiguration): vscode.Uri | undefined {
+async function getUriFromLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<vscode.Uri | undefined> {
     let targetPath: string
     if (isTemplateTargetProperties(config.invokeTarget)) {
         targetPath = config.invokeTarget.templatePath
@@ -342,7 +342,7 @@ function getUriFromLaunchConfig(config: AwsSamDebuggerConfiguration): vscode.Uri
     const workspaceFolders = vscode.workspace.workspaceFolders || []
     for (const workspaceFolder of workspaceFolders) {
         const absolutePath = tryGetAbsolutePath(workspaceFolder, targetPath)
-        if (fs.pathExistsSync(absolutePath)) {
+        if (await fs.exists(absolutePath)) {
             return vscode.Uri.file(absolutePath)
         }
     }

packages/core/src/shared/sshConfig.ts

@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as nls from 'vscode-nls'
 import { getLogger } from './logger'
 import { ChildProcess, ChildProcessResult } from './utilities/processUtils'
@@ -17,6 +16,8 @@ import { CancellationError } from './utilities/timeoutUtils'
 import { getSshConfigPath } from './extensions/ssh'
 import globals from './extensionGlobals'
 import { fileExists, readFileAsString } from './filesystemUtilities'
+import { chmodSync } from 'fs'
+import fs from './fs/fs'
 
 const localize = nls.loadMessageBundle()
 
@@ -109,9 +110,17 @@ export class SshConfig {
         const sshConfigPath = getSshConfigPath()
         const section = this.createSSHConfigSection(proxyCommand)
         try {
-            await fs.ensureDir(path.dirname(path.dirname(sshConfigPath)), { mode: 0o755 })
-            await fs.ensureDir(path.dirname(sshConfigPath), 0o700)
-            await fs.appendFile(sshConfigPath, section, { mode: 0o600 })
+            const parentsDir = path.dirname(sshConfigPath)
+            const grandParentsDir = path.dirname(parentsDir)
+            // TODO: replace w/ fs.chmod once stub is merged.
+            await fs.mkdir(grandParentsDir)
+            chmodSync(grandParentsDir, 0o755)
+
+            await fs.mkdir(parentsDir)
+            chmodSync(parentsDir, 0o700)
+
+            await fs.appendFile(sshConfigPath, section)
+            chmodSync(sshConfigPath, 0o600)
         } catch (e) {
             const message = localize(
                 'AWS.sshConfig.error.writeFail',
@@ -218,7 +227,7 @@ export async function ensureConnectScript(
         const isOutdated = contents1 !== contents2
 
         if (isOutdated) {
-            await fs.copyFile(versionedScript.fsPath, connectScript.fsPath)
+            await fs.copy(versionedScript.fsPath, connectScript.fsPath)
             getLogger().info('ssh: updated connect script')
         }