Merge remote-tracking branch 'origin/master' into floralph/nep-master

floralph · floralph · commit 9d7d3e17185e · 2025-06-26T10:54:07.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.79.0.json b/packages/amazonq/.changes/1.79.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "1.79.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Added automatic system certificate detection and VSCode proxy settings support"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Amazon Linux 2 support with better SageMaker environment detection"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: run all builds client-side"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-a06c2136-a87a-41af-9304-454bc77aaecc.json b/packages/amazonq/.changes/next-release/Bug Fix-a06c2136-a87a-41af-9304-454bc77aaecc.json
diff --git a/packages/amazonq/.changes/next-release/Feature-d46a67ff-b237-46cc-b6e7-8de8f2e87f45.json b/packages/amazonq/.changes/next-release/Feature-d46a67ff-b237-46cc-b6e7-8de8f2e87f45.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.79.0 2025-06-25
+
+- **Bug Fix** Added automatic system certificate detection and VSCode proxy settings support
+- **Bug Fix** Improved Amazon Linux 2 support with better SageMaker environment detection
+- **Feature** /transform: run all builds client-side
+
 ## 1.78.0 2025-06-20
 
 - **Bug Fix** Resolve missing chat options in Amazon Q chat interface.
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.79.0-SNAPSHOT",
+    "version": "1.80.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -38,6 +38,7 @@ import {
     isAmazonLinux2,
     getClientId,
     extensionVersion,
+    isSageMaker,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
@@ -54,11 +55,24 @@ import { CursorUpdateManager } from '../app/inline/cursorUpdateManager'
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
 
-export const glibcLinker: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
-export const glibcPath: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
-
 export function hasGlibcPatch(): boolean {
-    return glibcLinker.length > 0 && glibcPath.length > 0
+    // Skip GLIBC patching for SageMaker environments
+    if (isSageMaker()) {
+        getLogger('amazonqLsp').info('SageMaker environment detected in hasGlibcPatch, skipping GLIBC patching')
+        return false // Return false to ensure SageMaker doesn't try to use GLIBC patching
+    }
+
+    // Check for environment variables (for CDM)
+    const glibcLinker = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
+    const glibcPath = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
+
+    if (glibcLinker.length > 0 && glibcPath.length > 0) {
+        getLogger('amazonqLsp').info('GLIBC patching environment variables detected')
+        return true
+    }
+
+    // No environment variables, no patching needed
+    return false
 }
 
 export async function startLanguageServer(
@@ -83,9 +97,24 @@ export async function startLanguageServer(
     const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
     let executable: string[] = []
     // apply the GLIBC 2.28 path to node js runtime binary
-    if (isAmazonLinux2() && hasGlibcPatch()) {
-        executable = [glibcLinker, '--library-path', glibcPath, resourcePaths.node]
-        getLogger('amazonqLsp').info(`Patched node runtime with GLIBC to ${executable}`)
+    if (isSageMaker()) {
+        // SageMaker doesn't need GLIBC patching
+        getLogger('amazonqLsp').info('SageMaker environment detected, skipping GLIBC patching')
+        executable = [resourcePaths.node]
+    } else if (isAmazonLinux2() && hasGlibcPatch()) {
+        // Use environment variables if available (for CDM)
+        if (process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER && process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH) {
+            executable = [
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER,
+                '--library-path',
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH,
+                resourcePaths.node,
+            ]
+            getLogger('amazonqLsp').info(`Patched node runtime with GLIBC using env vars to ${executable}`)
+        } else {
+            // No environment variables, use the node executable directly
+            executable = [resourcePaths.node]
+        }
     } else {
         executable = [resourcePaths.node]
     }
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts
@@ -704,7 +704,10 @@ ${codeSnippet}
     }
 
     public async sendCustomDependencyVersionMessage(tabID: string) {
-        const message = CodeWhispererConstants.chooseConfigFileMessage
+        let message = CodeWhispererConstants.chooseConfigFileMessageLibraryUpgrade
+        if (transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion()) {
+            message = CodeWhispererConstants.chooseConfigFileMessageJdkUpgrade
+        }
         const buttons: ChatItemButton[] = []
 
         buttons.push({
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -646,8 +646,11 @@ export const continueWithoutConfigFileMessage =
 export const receivedValidConfigFileMessage =
     'The dependency upgrade file looks good. I will use this information to upgrade the dependencies you specified.'
 
-export const chooseConfigFileMessage =
-    'Would you like to provide a custom dependency upgrade file? You can specify first-party dependencies to upgrade in a YAML file, and I will upgrade them during the JDK upgrade (for example, Java 8 to 17). You can initiate a separate transformation (17 to 17 or 21 to 21) after the initial JDK upgrade to transform third-party dependencies.\n\nWithout a YAML file, I can perform a minimum JDK upgrade, and then you can initiate a separate transformation to upgrade all third-party dependencies as part of a maximum transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).'
+export const chooseConfigFileMessageJdkUpgrade =
+    'Would you like to provide a dependency upgrade file? You can specify first party dependencies and their versions in a YAML file, and I will upgrade them during the JDK upgrade transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).'
+
+export const chooseConfigFileMessageLibraryUpgrade =
+    'Would you like to provide a dependency upgrade file? You can specify third party dependencies and their versions in a YAML file, and I will only upgrade these dependencies during the library upgrade transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).'
 
 export const enterJavaHomePlaceholder = 'Enter the path to your Java installation'
 
diff --git a/packages/core/src/shared/extensionUtilities.ts b/packages/core/src/shared/extensionUtilities.ts
@@ -11,7 +11,7 @@ import { getLogger } from './logger/logger'
 import { VSCODE_EXTENSION_ID, extensionAlphaVersion } from './extensions'
 import { Ec2MetadataClient } from './clients/ec2MetadataClient'
 import { DefaultEc2MetadataClient } from './clients/ec2MetadataClient'
-import { extensionVersion, getCodeCatalystDevEnvId } from './vscode/env'
+import { extensionVersion, getCodeCatalystDevEnvId, hasSageMakerEnvVars } from './vscode/env'
 import globals from './extensionGlobals'
 import { once } from './utilities/functionUtils'
 import {
@@ -176,6 +176,13 @@ export function isCloud9(flavor: 'classic' | 'codecatalyst' | 'any' = 'any'): bo
  * @returns true if the current system is SageMaker(SMAI or SMUS)
  */
 export function isSageMaker(appName: 'SMAI' | 'SMUS' = 'SMAI'): boolean {
+    // Check for SageMaker-specific environment variables first
+    if (hasSageMakerEnvVars()) {
+        getLogger().debug('SageMaker environment detected via environment variables')
+        return true
+    }
+
+    // Fall back to app name checks
     switch (appName) {
         case 'SMAI':
             return vscode.env.appName === sageMakerAppname
diff --git a/packages/core/src/shared/utilities/proxyUtil.ts b/packages/core/src/shared/utilities/proxyUtil.ts
@@ -70,6 +70,12 @@ export class ProxyUtil {
      * Sets environment variables based on proxy configuration
      */
     private static async setProxyEnvironmentVariables(config: ProxyConfig): Promise<void> {
+        // Always enable experimental proxy support for better handling of both explicit and transparent proxies
+        process.env.EXPERIMENTAL_HTTP_PROXY_SUPPORT = 'true'
+
+        // Load built-in bundle and system OS trust store
+        process.env.NODE_OPTIONS = '--use-system-ca'
+
         const proxyUrl = config.proxyUrl
         // Set proxy environment variables
         if (proxyUrl) {
diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts
@@ -125,13 +125,56 @@ export function isRemoteWorkspace(): boolean {
 }
 
 /**
- * There is Amazon Linux 2.
+ * Checks if the current environment has SageMaker-specific environment variables
+ * @returns true if SageMaker environment variables are detected
+ */
+export function hasSageMakerEnvVars(): boolean {
+    // Check both old and new environment variable names
+    // SageMaker is renaming their environment variables in their Docker images
+    return (
+        // Original environment variables
+        process.env.SAGEMAKER_APP_TYPE !== undefined ||
+        process.env.SAGEMAKER_INTERNAL_IMAGE_URI !== undefined ||
+        process.env.STUDIO_LOGGING_DIR?.includes('/var/log/studio') === true ||
+        // New environment variables (update these with the actual new names)
+        process.env.SM_APP_TYPE !== undefined ||
+        process.env.SM_INTERNAL_IMAGE_URI !== undefined ||
+        process.env.SERVICE_NAME === 'SageMakerUnifiedStudio'
+    )
+}
+
+/**
+ * Checks if the current environment is running on Amazon Linux 2.
  *
- * Use {@link isCloudDesktop()} to know if we are specifically using internal Amazon Linux 2.
+ * This function attempts to detect if we're running in a container on an AL2 host
+ * by checking both the OS release and container-specific indicators.
  *
  * Example: `5.10.220-188.869.amzn2int.x86_64` or `5.10.236-227.928.amzn2.x86_64` (Cloud Dev Machine)
  */
 export function isAmazonLinux2() {
+    // First check if we're in a SageMaker environment, which should not be treated as AL2
+    // even if the underlying host is AL2
+    if (hasSageMakerEnvVars()) {
+        return false
+    }
+
+    // Check if we're in a container environment that's not AL2
+    if (process.env.container === 'docker' || process.env.DOCKER_HOST || process.env.DOCKER_BUILDKIT) {
+        // Additional check for container OS - if we can determine it's not AL2
+        try {
+            const fs = require('fs')
+            if (fs.existsSync('/etc/os-release')) {
+                const osRelease = fs.readFileSync('/etc/os-release', 'utf8')
+                if (!osRelease.includes('Amazon Linux 2') && !osRelease.includes('amzn2')) {
+                    return false
+                }
+            }
+        } catch (e) {
+            // If we can't read the file, fall back to the os.release() check
+        }
+    }
+
+    // Standard check for AL2 in the OS release string
     return (os.release().includes('.amzn2int.') || os.release().includes('.amzn2.')) && process.platform === 'linux'
 }
 
diff --git a/packages/toolkit/.changes/3.67.0.json b/packages/toolkit/.changes/3.67.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "3.67.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "State Machine deployments can now be initiated directly from Workflow Studio without closing the editor"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Step Function performance metrics now accurately reflect only Workflow Studio document activity"
+		},
+		{
+			"type": "Feature",
+			"description": "AccessAnalyzer: CheckNoPublicAccess custom policy check supports additional resource types."
+		}
+	]
+}
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-8beaac0b-fb5e-42bd-8ecf-a185266a9f04.json b/packages/toolkit/.changes/next-release/Bug Fix-8beaac0b-fb5e-42bd-8ecf-a185266a9f04.json
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-de3cdda1-252e-4d04-96cb-7fb935649c0e.json b/packages/toolkit/.changes/next-release/Bug Fix-de3cdda1-252e-4d04-96cb-7fb935649c0e.json
diff --git a/packages/toolkit/.changes/next-release/Feature-2fdc05d7-db85-4a4f-8af5-ec729fade8fd.json b/packages/toolkit/.changes/next-release/Feature-2fdc05d7-db85-4a4f-8af5-ec729fade8fd.json
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.67.0 2025-06-25
+
+- **Bug Fix** State Machine deployments can now be initiated directly from Workflow Studio without closing the editor
+- **Bug Fix** Step Function performance metrics now accurately reflect only Workflow Studio document activity
+- **Feature** AccessAnalyzer: CheckNoPublicAccess custom policy check supports additional resource types.
+
 ## 3.66.0 2025-06-18
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.67.0-SNAPSHOT",
+    "version": "3.68.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
