Skip to content

Commit 90441f3

Browse files
JadenSimonjustinmk3
authored andcommitted
Completely disable CodeWhisperer in a dev env
1 parent 911435b commit 90441f3

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/codewhisperer/explorer/codewhispererNode.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ import { Commands } from '../../shared/vscode/commands2'
1919
import { RootNode } from '../../awsexplorer/localExplorer'
2020
import { isCloud9 } from '../../shared/extensionUtilities'
2121
import { AuthUtil } from '../util/authUtil'
22+
import { getCodeCatalystDevEnvId } from '../../shared/vscode/env'
2223

2324
export class CodeWhispererNode implements RootNode {
25+
private readonly isAvailable = getCodeCatalystDevEnvId() === undefined
26+
2427
public readonly id = 'codewhisperer'
2528
public readonly resource = this
2629
private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
@@ -70,6 +73,10 @@ export class CodeWhispererNode implements RootNode {
7073
}
7174

7275
public getChildren() {
76+
if (!this.isAvailable) {
77+
return []
78+
}
79+
7380
const termsAccepted = globals.context.globalState.get<boolean>(CodeWhispererConstants.termsAcceptedKey)
7481
const autoTriggerEnabled =
7582
globals.context.globalState.get<boolean>(CodeWhispererConstants.autoTriggerEnabledKey) || false

src/codewhisperer/util/authUtil.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ import { Commands } from '../../shared/vscode/commands2'
2323
import { isCloud9 } from '../../shared/extensionUtilities'
2424
import { TelemetryHelper } from './telemetryHelper'
2525
import { CancellationError } from '../../shared/utilities/timeoutUtils'
26+
import { getCodeCatalystDevEnvId } from '../../shared/vscode/env'
2627

2728
export const awsBuilderIdSsoProfile = createBuilderIdProfile()
2829
// No connections are valid within C9
2930
const isValidCodeWhispererConnection = (conn: Connection): conn is SsoConnection =>
3031
!isCloud9() && conn.type === 'sso' && codewhispererScopes.every(s => conn.scopes?.includes(s))
3132

3233
export class AuthUtil {
34+
private readonly isAvailable = getCodeCatalystDevEnvId() === undefined
3335
static #instance: AuthUtil
3436

3537
private usingEnterpriseSSO: boolean = false

src/extension.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import { AwsResourceManager } from './dynamicResources/awsResourceManager'
6262
import globals, { initialize } from './shared/extensionGlobals'
6363
import { join } from 'path'
6464
import { Experiments, Settings } from './shared/settings'
65-
import { isReleaseVersion } from './shared/vscode/env'
65+
import { getCodeCatalystDevEnvId, isReleaseVersion } from './shared/vscode/env'
6666
import { Commands, registerErrorHandler } from './shared/vscode/commands2'
6767
import { isUserCancelledError, ToolkitError } from './shared/errors'
6868
import { Logging } from './shared/logger/commands'
@@ -215,7 +215,9 @@ export async function activate(context: vscode.ExtensionContext) {
215215

216216
await activateS3(extContext)
217217

218-
await activateCodeWhisperer(extContext)
218+
if (getCodeCatalystDevEnvId() === undefined) {
219+
await activateCodeWhisperer(extContext)
220+
}
219221

220222
await activateEcr(context)
221223

0 commit comments

Comments
 (0)