Merge master into feature/emr

Author: aws-toolkit-automation

.gitignore

@@ -47,7 +47,6 @@ packages/amazonq/package.nls.json
 packages/amazonq/resources
 
 # Icons
-packages/*/resources/icons/cloud9/generated/**
 packages/*/resources/fonts/aws-toolkit-icons.woff
 packages/*/resources/css/icons.css
 

CONTRIBUTING.md

@@ -633,7 +633,7 @@ If you are contribuing visual assets from other open source repos, the source re
 ## Using new vscode APIs
 
 The minimum required vscode version specified in [package.json](https://github.com/aws/aws-toolkit-vscode/blob/07119655109bb06105a3f53bbcd86b812b32cdbe/package.json#L16)
-is decided by the version of vscode running in Cloud9 and other vscode-compatible targets.
+is decided by the version of vscode running in other supported vscode-compatible targets (e.g. web).
 
 But you can still use the latest vscode APIs, by checking the current running vscode version. For example, to use a vscode 1.64 API:
 

cloud9-toolkit-install.sh

@@ -81,13 +81,10 @@ that is a net cost.
 -   Telemetry: "active" vs "passive"
     -   Active (`passive:false`) metrics are those intended to appear in DAU count.
 -   Icons:
-    -   Where possible, use IDE-specific standard icons (e.g. standard VSCode
-        standard icons in VSCode, and Cloud9 standard icons in Cloud9). The typical
-        (maintainable) way to do this is to use _named_ icons (what VSCode calls
+    -   Where possible, use standard VSCode icons. The typical (maintainable)
+        way to do this is to use _named_ icons (what VSCode calls
         [codicons](https://microsoft.github.io/vscode-codicons/)) as opposed to
         icons shipped with the Toolkit build and referenced by _path_.
-    -   For cases where icons must be statically defined (package.json), if Cloud9
-        does not support the VSCode standard icon, use the Cloud9 icon.
 -   Changelog guidelines
     -   Prefer active voice: "You can do X" instead of "X can be done"
 -   Avoid unnecessary use of `lodash` (which we may remove in the future).
@@ -240,11 +237,11 @@ _See also [arch_develop.md](./arch_develop.md#exceptions)._
 
     -   PREFER:
         ```ts
-        things.filter(o => o.isFoo)
+        things.filter((o) => o.isFoo)
         ```
     -   INSTEAD OF:
         ```ts
-        things.filter(thing => thing.isFoo)
+        things.filter((thing) => thing.isFoo)
         ```
 
 ## User settings

docs/CODE_GUIDELINES.md

@@ -31,8 +31,6 @@ If you must define a new key (is it _really_ necessary?), follow these guideline
 These keys are currently set by the core/ package, but many of them may eventually be migrated to
 toolkit/ or amazonq/ if appropriate.
 
--   `isCloud9`: This is hardcoded by Cloud9 itself, not the Toolkit.
-    -   Cloud9 _does not support setContext_. So this is the only usable key there.
 -   `aws.codecatalyst.connected`: CodeCatalyst connection is active.
 -   `aws.codewhisperer.connected`: CodeWhisperer connection is active.
 -   `aws.codewhisperer.connectionExpired`: CodeWhisperer connection is active, but the connection is expired.

docs/arch_runtime.md

@@ -4,7 +4,6 @@ All icons that are used in the extensions can be found in `resources/icons`.
 
 A [build script](../scripts/generateIcons.ts) generates extension artifacts in [core/](../packages/core/):
 
--   `resources/icons/cloud9/generated`
 -   `resources/fonts/aws-toolkit-icons.woff`
 -   `resources/css/icons.css`
 -   `contributes.icons` in [amazonq package.json](../packages/amazonq/package.json) and [toolkit package.json](../packages/toolkit/package.json)
@@ -31,7 +30,7 @@ If your desired icon does not work well as a font, see [Theme Overrides](#theme-
 
 ## Identifiers
 
-Icons (except those in `cloud9`) can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
+Icons can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
 
 Examples:
 
@@ -50,11 +49,6 @@ For example, if I wanted to use a special App Runner service icon, then I need t
 -   `resources/icons/aws/dark/apprunner-service.svg`
 -   `resources/icons/aws/light/apprunner-service.svg`
 
-A similar format is used for overriding icons only on Cloud9:
-
--   `resources/icons/cloud9/dark/aws-apprunner-service.svg`
--   `resources/icons/cloud9/light/aws-apprunner-service.svg`
-
 These icons will **not** be usuable as Codicons or as font icons.
 
 ## Third Party

docs/icons.md

@@ -10,7 +10,6 @@ import * as vscode from 'vscode'
 import { Credentials } from '@aws-sdk/types'
 import { authHelpUrl } from '../../shared/constants'
 import globals from '../../shared/extensionGlobals'
-import { isCloud9 } from '../../shared/extensionUtilities'
 import { messages, showMessageWithCancel, showViewLogsMessage } from '../../shared/utilities/messages'
 import { Timeout, waitTimeout } from '../../shared/utilities/timeoutUtils'
 import { fromExtensionManifest } from '../../shared/settings'
@@ -37,8 +36,8 @@ export function asEnvironmentVariables(credentials: Credentials): NodeJS.Process
 export function showLoginFailedMessage(credentialsId: string, errMsg: string): void {
     const getHelp = localize('AWS.generic.message.getHelp', 'Get Help...')
     const editCreds = messages.editCredentials(false)
-    // TODO: getHelp page for Cloud9.
-    const buttons = isCloud9() ? [editCreds] : [editCreds, getHelp]
+    // TODO: Any work towards web/another cloud9 -esqe IDE may need different getHelp docs:
+    const buttons = [editCreds, getHelp]
 
     void showViewLogsMessage(
         localize('AWS.message.credentials.invalid', 'Credentials "{0}" failed to connect: {1}', credentialsId, errMsg),