move constants to the main constant file

Signed-off-by: nkomonen-amazon <[email protected]>

Author: nkomonen-amazon

packages/core/src/shared/constants.ts

@@ -138,3 +138,14 @@ export const amazonQHelpUrl = 'https://aws.amazon.com/q/'
 // URL for Amazon Q VS Code
 export const amazonQVscodeMarketplace =
     'https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode'
+
+/**
+ * Names of directories relevant to the crash reporting functionality.
+ *
+ * Moved here to resolve circular dependency issues.
+ */
+export const crashMonitoringDirName = {
+    root: 'crashMonitoring',
+    running: 'running',
+    shutdown: 'shutdown',
+} as const

packages/core/src/shared/crashMonitoring/constants.ts

@@ -14,8 +14,8 @@ import { Logger } from '../logger'
 import { isNewOsSession } from '../utilities/osUtils'
 import nodeFs from 'fs/promises'
 import fs from '../fs/fs'
-import * as CrashMonitoringConstants from './constants'
 import { getLogger } from '../logger/logger'
+import { crashMonitoringDirName } from '../constants'
 
 const className = 'CrashMonitoring'
 
@@ -375,7 +375,7 @@ export class FileSystemState {
      * Use {@link crashMonitoringStateFactory} to make an instance
      */
     constructor(protected readonly deps: MementoStateDependencies) {
-        this.stateDirPath = path.join(this.deps.workDirPath, CrashMonitoringConstants.rootDir)
+        this.stateDirPath = path.join(this.deps.workDirPath, crashMonitoringDirName.root)
 
         this.deps.devLogger?.debug(`crashMonitoring: pid: ${this.deps.pid}`)
         this.deps.devLogger?.debug(`crashMonitoring: sessionId: ${this.deps.sessionId.slice(0, 8)}-...`)
@@ -480,13 +480,13 @@ export class FileSystemState {
         return `${ext.extHostPid}_${ext.sessionId}`
     }
     private async runningExtsDir(): Promise<string> {
-        const p = path.join(this.stateDirPath, CrashMonitoringConstants.runningExtDir)
+        const p = path.join(this.stateDirPath, crashMonitoringDirName.running)
         // ensure the dir exists
         await withFailCtx('ensureRunningExtsDir', () => fs.mkdir(p))
         return p
     }
     private async shutdownExtsDir() {
-        const p = path.join(this.stateDirPath, CrashMonitoringConstants.shutdownExtDir)
+        const p = path.join(this.stateDirPath, crashMonitoringDirName.shutdown)
         // Since this runs in `deactivate()` it cannot use the VS Code FS api
         await withFailCtx('ensureShutdownExtsDir', () => nodeFs.mkdir(p, { recursive: true }))
         return p

packages/core/src/shared/crashMonitoring/crashMonitoring.ts

@@ -15,7 +15,7 @@ import type * as os from 'os'
 import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
 import { driveLetterRegex } from './utilities/pathUtils'
 import { getLogger } from './logger/logger'
-import * as CrashMonitoring from './crashMonitoring/constants'
+import { crashMonitoringDirName } from './constants'
 
 let _username = 'unknown-user'
 let _isAutomation = false
@@ -380,9 +380,9 @@ export function scrubNames(s: string, username?: string) {
         'tmp',
         'aws-toolkit-vscode',
         'globalStorage', // from vscode globalStorageUri
-        CrashMonitoring.rootDir,
-        CrashMonitoring.runningExtDir,
-        CrashMonitoring.shutdownExtDir,
+        crashMonitoringDirName.root,
+        crashMonitoringDirName.running,
+        crashMonitoringDirName.shutdown,
     ])
 
     if (username && username.length > 2) {