fix: change access to fs/promises lib (#113)

SAP · Jun 30, 2021 · 2dd4a36 · 2dd4a36
1 parent 7217f97
commit 2dd4a36
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@sap/cf-tools",
 	"displayName": "cf-tools",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "Cloud Foundry API tools",
 	"bugs": {
 		"url": "https://github.com/sap-staging/cloud-foundry-tools-api.git/issues"

diff --git a/src/task.ts b/src/task.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as path from "path";
 import * as _ from "lodash";
 import { parse, stringify } from "comment-json";
@@ -12,7 +12,7 @@ const DEFAULT_TASKS_JSON_CONTENT: any = { version: "2.0.0", tasks: [] };
 
 async function getTaskJsonContentAsJsonObject(taskJsonFilePath: string): Promise<any> {
     try {
-        const tasksJsonString = await fs.readFile(taskJsonFilePath, { encoding: "utf8" });
+        const tasksJsonString = await fs.promises.readFile(taskJsonFilePath, { encoding: "utf8" });
         const tasksJson: any = parse(tasksJsonString);
         return _.assign(DEFAULT_TASKS_JSON_CONTENT, tasksJson);
     } catch (e) {
@@ -32,5 +32,5 @@ export async function saveTaskConfiguration(wsFolderPath: string, configuration:
         tasksJson.tasks.push(configuration);
     }
 
-    await fs.writeFile(taskJsonFilePath, stringify(tasksJson, undefined, "  "));
+    await fs.promises.writeFile(taskJsonFilePath, stringify(tasksJson, undefined, "  "));
 }
diff --git a/src/utils.ts b/src/utils.ts
@@ -4,15 +4,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 import * as _ from "lodash";
 import * as os from "os";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as path from "path";
 import { parse } from "comment-json";
 import { messages } from "./messages";
 import { IServiceQuery, CF_PAGE_SIZE, IServiceFilters, eFilters, eServiceTypes } from "./types";
 
 export async function dataContentAsObject(filePath: string) {
     try {
-        return _.reduce(_.split(await fs.readFile(filePath, { encoding: "utf8" }), os.EOL), (data: any, line: string) => {
+        return _.reduce(_.split(await fs.promises.readFile(filePath, { encoding: "utf8" }), os.EOL), (data: any, line: string) => {
             const parts = _.split(line, '=');
             if (_.size(parts) > 1) {
                 data[_.trim(parts[0])] = _.trim(parts[1]);
@@ -93,7 +93,7 @@ export function isUpsType(resource: any): boolean {
  */
 export async function cfGetConfigFileJson(target?: string): Promise<unknown> {
     try {
-        return parse(await fs.readFile(cfGetConfigFilePath(target), { encoding: "utf8" }));
+        return parse(await fs.promises.readFile(cfGetConfigFilePath(target), { encoding: "utf8" }));
     } catch (error) {
         // empty or non existing file
     }

diff --git a/tests/cf-local-a.spec.ts b/tests/cf-local-a.spec.ts
@@ -2,7 +2,7 @@
 import { expect, assert } from "chai";
 import * as _ from "lodash";
 import { SinonSandbox, SinonMock, createSandbox } from "sinon";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as cfLocal from "../src/cf-local";
 import * as cli from "../src/cli";
 import { fail } from "assert";
@@ -28,7 +28,7 @@ describe("cf-local-a unit tests", () => {
 
     beforeEach(() => {
         cliMock = sandbox.mock(cli.Cli);
-        fsMock = sandbox.mock(fs);
+        fsMock = sandbox.mock(fs.promises);
     });
 
     afterEach(() => {

diff --git a/tests/cf-local-b.spec.ts b/tests/cf-local-b.spec.ts
@@ -3,7 +3,7 @@
 import { expect, assert } from "chai";
 import * as _ from "lodash";
 import { SinonSandbox, SinonMock, createSandbox } from "sinon";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as cfLocal from "../src/cf-local";
 import * as cli from "../src/cli";
 import { fail } from "assert";
@@ -27,7 +27,7 @@ describe("cf-local-b unit tests", () => {
 
     beforeEach(() => {
         cliMock = sandbox.mock(cli.Cli);
-        fsMock = sandbox.mock(fs);
+        fsMock = sandbox.mock(fs.promises);
     });
 
     afterEach(() => {

diff --git a/tests/cf-local.spec.ts b/tests/cf-local.spec.ts
@@ -3,7 +3,7 @@
 import { expect, assert } from "chai";
 import * as _ from "lodash";
 import { SinonSandbox, SinonMock, createSandbox } from "sinon";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as cfLocal from "../src/cf-local";
 import * as cli from "../src/cli";
 import { messages } from "../src/messages";
@@ -32,7 +32,7 @@ describe("cf-local unit tests", () => {
 
     beforeEach(() => {
         cliMock = sandbox.mock(cli.Cli);
-        fsMock = sandbox.mock(fs);
+        fsMock = sandbox.mock(fs.promises);
     });
 
     afterEach(() => {
@@ -163,7 +163,7 @@ describe("cf-local unit tests", () => {
         it("exception:: cf space GUID not specified and default is undefined", async () => {
             instanceName = `${baseInstanceName}161`;
             sandbox.restore();
-            fsMock = sandbox.mock(fs);
+            fsMock = sandbox.mock(fs.promises);
             fsMock.expects("readFile").withExactArgs(configFilePath, { encoding: "utf8" }).resolves(`{}`);
             try {
                 await cfLocal.cfCreateService(planGuid, instanceName, {}, [], null);

diff --git a/tests/task.spec.ts b/tests/task.spec.ts
@@ -1,6 +1,6 @@
 import { stringify } from "comment-json";
 import { SinonSandbox, SinonMock, createSandbox } from "sinon";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import * as path from "path";
 import { saveTaskConfiguration } from "../src/task";
 
@@ -18,7 +18,7 @@ describe('task unit tests', () => {
     });
 
     beforeEach(() => {
-        fsMock = sandbox.mock(fs);
+        fsMock = sandbox.mock(fs.promises);
     });
 
     afterEach(() => {

diff --git a/tests/utils.spec.ts b/tests/utils.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { expect, assert } from "chai";
-import * as fs from "fs/promises";
+import * as fs from "fs";
 import { SinonSandbox, SinonMock, createSandbox } from "sinon";
 import * as os from "os";
 import * as path from "path";
@@ -24,7 +24,7 @@ describe("Util unit tests", () => {
     });
 
     beforeEach(() => {
-        fsMock = sandbox.mock(fs);
+        fsMock = sandbox.mock(fs.promises);
     });
 
     afterEach(() => {