Merge master into feature/flare-mega

Author: aws-toolkit-automation

packages/core/src/codewhisperer/ui/statusBarMenu.ts

@@ -107,7 +107,7 @@ export function getQuickPickItems(): DataQuickPickItem<string>[] {
         createSettingsNode(),
         ...(AuthUtil.instance.isIdcConnection() && regionProfile ? [createSelectRegionProfileNode(regionProfile)] : []),
         ...(AuthUtil.instance.isConnected() && !hasVendedIamCredentials() && !hasVendedCredentialsFromMetadata()
-            ? [createManageSubscription(), createSignout()]
+            ? [...(AuthUtil.instance.isBuilderIdInUse() ? [createManageSubscription()] : []), createSignout()]
             : []),
     ]
 

packages/core/src/test/codewhisperer/commands/basicCommands.test.ts

@@ -446,13 +446,7 @@ describe('CodeWhisperer-basicCommands', function () {
             sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
 
             getTestWindow().onDidShowQuickPick((e) => {
-                e.assertContainsItems(
-                    createReconnect(),
-                    createLearnMore(),
-                    ...genericItems(),
-                    createManageSubscription(),
-                    createSignout()
-                )
+                e.assertContainsItems(createReconnect(), createLearnMore(), ...genericItems(), createSignout())
                 e.dispose() // skip needing to select an item to continue
             })
 
@@ -472,7 +466,6 @@ describe('CodeWhisperer-basicCommands', function () {
                     switchToAmazonQNode(),
                     ...genericItems(),
                     createSettingsNode(),
-                    createManageSubscription(),
                     createSignout()
                 )
                 e.dispose() // skip needing to select an item to continue
@@ -498,7 +491,6 @@ describe('CodeWhisperer-basicCommands', function () {
                     switchToAmazonQNode(),
                     ...genericItems(),
                     createSettingsNode(),
-                    createManageSubscription(),
                     createSignout()
                 )
                 e.dispose() // skip needing to select an item to continue