undo gitSecrets changes

Author: Hweinstock

packages/core/src/testLint/gitSecrets.test.ts

@@ -8,9 +8,8 @@ import { describe } from 'mocha'
 import assert from 'assert'
 import * as path from 'path'
 import { platform } from 'os'
-//import { existsSync, mkdirSync, unlinkSync, writeFileSync } from 'fs'
+import { existsSync, mkdirSync, unlinkSync, writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports
 import { runCmd } from './testUtils'
-import { fs } from '../shared'
 
 /**
  * NOTES:
@@ -41,22 +40,22 @@ describe('git-secrets', function () {
         })
     }
 
-    async function setupTestFixturesDir(toolkitProjectDir: string) {
+    function setupTestFixturesDir(toolkitProjectDir: string) {
         const testFixturesPath = path.join(toolkitProjectDir, 'src', 'testFixtures', 'bin')
-        await fs.mkdir(testFixturesPath)
+        mkdirSync(testFixturesPath, { recursive: true })
         return testFixturesPath
     }
 
-    async function setupAccessKeyFile(testFixturesPath: string) {
+    function setupAccessKeyFile(testFixturesPath: string) {
         const accessKeyFilePath = path.join(testFixturesPath, 'fileWithAccessKey.ts')
-        await deleteFileIfExists(accessKeyFilePath)
+        deleteFileIfExists(accessKeyFilePath)
         return accessKeyFilePath
     }
 
-    async function setupGitSecretsExecutable(testFixturesPath: string) {
+    function setupGitSecretsExecutable(testFixturesPath: string) {
         const gitSecretsExecutablePath = path.join(testFixturesPath, 'git-secrets')
 
-        if (await fs.exists(gitSecretsExecutablePath)) {
+        if (existsSync(gitSecretsExecutablePath)) {
             console.log('INFO: git-secrets already installed')
         } else {
             console.log('INFO: Installing git-secrets...')
@@ -73,13 +72,13 @@ describe('git-secrets', function () {
         return gitSecretsExecutablePath
     }
 
-    async function deleteFileIfExists(filePath: string) {
-        if (await fs.exists(filePath)) {
-            await fs.delete(filePath)
+    function deleteFileIfExists(filePath: string) {
+        if (existsSync(filePath)) {
+            unlinkSync(filePath)
         }
     }
 
-    async function createFileWithSecretKey(accessKeyFilePath: string) {
+    function createFileWithSecretKey(accessKeyFilePath: string) {
         // Create file in project that has secret key value.
         // Need to build access key string incrementally to not trigger git-secrets.
         const keyValue = 'yAki21XLhAIBiKvyaxr4p/ltr8OxkZTHISISFAKE'
@@ -92,36 +91,36 @@ describe('git-secrets', function () {
 
 ${mySecretAccessKey}
 `.trim()
-        await fs.writeFile(accessKeyFilePath, fileContent)
+        writeFileSync(accessKeyFilePath, fileContent)
     }
 
-    before(async function () {
+    before(function () {
         if (platform() === 'win32') {
             this.skip()
         }
 
         toolkitProjectDir = path.resolve()
-        testFixturesPath = await setupTestFixturesDir(toolkitProjectDir)
-        gitSecrets = await setupGitSecretsExecutable(testFixturesPath)
-        accessKeyFilePath = await setupAccessKeyFile(testFixturesPath)
+        testFixturesPath = setupTestFixturesDir(toolkitProjectDir)
+        gitSecrets = setupGitSecretsExecutable(testFixturesPath)
+        accessKeyFilePath = setupAccessKeyFile(testFixturesPath)
 
         // Register all patterns with `git-secrets`
         runCmd([gitSecrets, '--register-aws'], { cwd: toolkitProjectDir })
         setDenyListPatterns(gitSecrets)
         setAllowListPatterns(gitSecrets)
     })
 
-    afterEach(async function () {
-        await deleteFileIfExists(accessKeyFilePath)
+    afterEach(function () {
+        deleteFileIfExists(accessKeyFilePath)
     })
 
     it('ensures no git secrets are found', function () {
         const result = runCmd([gitSecrets, '--scan'], { cwd: toolkitProjectDir })
         assert.strictEqual(result.status, 0, `Failure output: ${result.stderr.toString()}`)
     })
 
-    it('sanity check it finds secrets', async function () {
-        await createFileWithSecretKey(accessKeyFilePath)
+    it('sanity check it finds secrets', function () {
+        createFileWithSecretKey(accessKeyFilePath)
         const result = runCmd([gitSecrets, '--scan', accessKeyFilePath], { cwd: toolkitProjectDir, throws: false })
         assert.strictEqual(result.status, 1)
     })