Merge branch 'feature/v2-to-v3-migration' into migrate-lambda

ctlai95 · ctlai95 · commit f19d6d597b4a · 2025-09-16T15:51:17.000-07:00
diff --git a/packages/core/src/awsService/apigateway/commands/copyUrl.ts b/packages/core/src/awsService/apigateway/commands/copyUrl.ts
@@ -11,7 +11,7 @@ import * as picker from '../../../shared/ui/picker'
 import * as vscode from 'vscode'
 import { ProgressLocation } from 'vscode'
 
-import { Stage } from 'aws-sdk/clients/apigateway'
+import { Stage } from '@aws-sdk/client-api-gateway'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
 import { defaultDnsSuffix, RegionProvider } from '../../../shared/regions/regionProvider'
 import { getLogger } from '../../../shared/logger/logger'
diff --git a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
@@ -12,7 +12,7 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { RestApiNode } from './apiNodes'
 
diff --git a/packages/core/src/awsService/apigateway/explorer/apiNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
@@ -5,7 +5,7 @@
 
 import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 
 export class RestApiNode extends AWSTreeNodeBase implements AWSResourceNode {
     public override id!: string
diff --git a/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
@@ -8,7 +8,7 @@ import { RestApiNode } from '../explorer/apiNodes'
 import { getLogger, Logger } from '../../../shared/logger/logger'
 
 import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
-import { Resource } from 'aws-sdk/clients/apigateway'
+import { Resource } from '@aws-sdk/client-api-gateway'
 import { localize } from '../../../shared/utilities/vsCodeUtils'
 import { Result } from '../../../shared/telemetry/telemetry'
 import { VueWebview } from '../../../webviews/main'
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
@@ -13,8 +13,8 @@ import { getLogger } from '../../../../shared/logger/logger'
 import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
 import globals from '../../../../shared/extensionGlobals'
 import { defaultPartition } from '../../../../shared/regions/regionProvider'
-import { APIGateway } from 'aws-sdk'
 import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 import { LambdaNode } from '../../../../lambda/explorer/lambdaNodes'
 import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
 import { S3Client, toBucket } from '../../../../shared/clients/s3'
@@ -119,12 +119,7 @@ export async function generateDeployedNode(
                 const apiParentNode = new ApiGatewayNode(partitionId, regionCode)
                 const apiNodes = await apiParentNode.getChildren()
                 const apiNode = apiNodes.find((node) => node.id === deployedResource.PhysicalResourceId)
-                newDeployedResource = new RestApiNode(
-                    apiParentNode,
-                    partitionId,
-                    regionCode,
-                    apiNode as APIGateway.RestApi
-                )
+                newDeployedResource = new RestApiNode(apiParentNode, partitionId, regionCode, apiNode as RestApi)
                 break
             }
             default:
diff --git a/packages/core/src/codecatalyst/utils.ts b/packages/core/src/codecatalyst/utils.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Ides } from 'aws-sdk/clients/codecatalyst'
+import { Ide } from '@aws-sdk/client-codecatalyst'
 import * as vscode from 'vscode'
 import { CodeCatalystResource, getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
 import { pushIf } from '../shared/utilities/collectionUtils'
@@ -55,6 +55,6 @@ export function openCodeCatalystUrl(o: CodeCatalystResource) {
 }
 
 /** Returns true if the dev env has a "vscode" IDE runtime. */
-export function isDevenvVscode(ides: Ides | undefined): boolean {
+export function isDevenvVscode(ides: Ide[] | undefined): boolean {
     return ides !== undefined && ides.some((ide) => ide.name === 'VSCode')
 }
diff --git a/packages/core/src/codecatalyst/vue/create/backend.ts b/packages/core/src/codecatalyst/vue/create/backend.ts
@@ -32,7 +32,7 @@ import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { isNonNullable } from '../../../shared/utilities/tsUtils'
 import { createOrgPrompter, createProjectPrompter } from '../../wizards/selectResource'
-import { GetSourceRepositoryCloneUrlsRequest } from 'aws-sdk/clients/codecatalyst'
+import { GetSourceRepositoryCloneUrlsRequest } from '@aws-sdk/client-codecatalyst'
 import { QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
 
 interface LinkedResponse {
diff --git a/packages/core/src/codewhispererChat/view/connector/connector.ts b/packages/core/src/codewhispererChat/view/connector/connector.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Timestamp } from 'aws-sdk/clients/apigateway'
 import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
 import { EditorContextCommandType } from '../../commands/registerCommands'
 import { AuthFollowUpType } from '../../../amazonq/auth/model'
@@ -97,7 +96,7 @@ interface StackOverflowMetadata {
     readonly answerCount: number
     readonly isAccepted: boolean
     readonly score: number
-    readonly lastActivityDate: Timestamp
+    readonly lastActivityDate: Date
 }
 
 export class SearchView extends UiMessage {
diff --git a/packages/core/src/shared/clients/codecatalystClient.ts b/packages/core/src/shared/clients/codecatalystClient.ts
@@ -24,10 +24,8 @@ import {
 } from '../utilities/tsUtils'
 import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
 import { joinAll, pageableToCollection } from '../utilities/collectionUtils'
-import { CodeCatalyst } from 'aws-sdk'
 import { ToolkitError } from '../errors'
 import { Uri } from 'vscode'
-import { GetSourceRepositoryCloneUrlsRequest } from 'aws-sdk/clients/codecatalyst'
 import {
     CodeCatalystClient as CodeCatalystSDKClient,
     CreateAccessTokenCommand,
@@ -53,15 +51,18 @@ import {
     GetProjectCommandOutput,
     GetProjectRequest,
     GetSourceRepositoryCloneUrlsCommand,
+    GetSourceRepositoryCloneUrlsRequest,
     GetSourceRepositoryCloneUrlsResponse,
     GetSpaceCommand,
     GetSpaceCommandOutput,
     GetSpaceRequest,
     GetSubscriptionCommand,
     GetSubscriptionRequest,
+    GetSubscriptionResponse,
     GetUserDetailsCommand,
     GetUserDetailsCommandOutput,
     GetUserDetailsRequest,
+    GetUserDetailsResponse,
     ListDevEnvironmentsCommand,
     ListDevEnvironmentsRequest,
     ListDevEnvironmentsResponse,
@@ -73,6 +74,7 @@ import {
     ListSourceRepositoriesRequest,
     ListSourceRepositoriesResponse,
     ListSourceRepositoryBranchesCommand,
+    ListSourceRepositoryBranchesItem,
     ListSourceRepositoryBranchesRequest,
     ListSpacesCommand,
     ListSpacesRequest,
@@ -152,14 +154,14 @@ export interface DevEnvironment extends CodeCatalystDevEnvironmentSummary {
 
 /** CodeCatalyst developer environment session. */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CodeCatalystDevEnvSession extends CodeCatalyst.StartDevEnvironmentResponse {}
+export interface CodeCatalystDevEnvSession extends StartDevEnvironmentResponse {}
 
 export interface CodeCatalystOrg extends SpaceSummary {
     readonly type: 'org'
     readonly name: string
 }
 
-export interface CodeCatalystProject extends CodeCatalyst.ProjectSummary {
+export interface CodeCatalystProject extends ProjectSummary {
     readonly type: 'project'
     readonly name: string
     readonly org: Pick<CodeCatalystOrg, 'name'>
@@ -172,7 +174,7 @@ export interface CodeCatalystRepo extends ListSourceRepositoriesItem {
     readonly project: Pick<CodeCatalystProject, 'name'>
 }
 
-export interface CodeCatalystBranch extends CodeCatalyst.ListSourceRepositoryBranchesItem {
+export interface CodeCatalystBranch extends ListSourceRepositoryBranchesItem {
     readonly type: 'branch'
     readonly name: string
     readonly repo: Pick<CodeCatalystRepo, 'name'>
@@ -200,7 +202,7 @@ function toBranch(
     org: string,
     project: string,
     repo: string,
-    branch: CodeCatalyst.ListSourceRepositoryBranchesItem
+    branch: ListSourceRepositoryBranchesItem
 ): CodeCatalystBranch {
     assertHasProps(branch, 'name')
 
@@ -229,10 +231,7 @@ function createCodeCatalystClient(
     })
 }
 
-export type UserDetails = RequiredProps<
-    CodeCatalyst.GetUserDetailsResponse,
-    'userId' | 'userName' | 'displayName' | 'primaryEmail'
->
+export type UserDetails = RequiredProps<GetUserDetailsResponse, 'userId' | 'userName' | 'displayName' | 'primaryEmail'>
 
 // CodeCatalyst client has two variants: 'logged-in' and 'not logged-in'
 // The 'not logged-in' variant is a subtype and has restricted functionality
@@ -421,7 +420,7 @@ class CodeCatalystClientInternal extends ClientWrapper<CodeCatalystSDKClient> {
         }
     }
 
-    public async getSubscription(request: GetSubscriptionRequest): Promise<CodeCatalyst.GetSubscriptionResponse> {
+    public async getSubscription(request: GetSubscriptionRequest): Promise<GetSubscriptionResponse> {
         return this.call(GetSubscriptionCommand, request, false)
     }
 
diff --git a/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts b/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert'
 import { listValidMethods } from '../../../../awsService/apigateway/vue/invokeRemoteRestApi'
-import { Resource } from 'aws-sdk/clients/apigateway'
+import { Resource } from '@aws-sdk/client-api-gateway'
 
 describe('listValidMethods', function () {
     const allMethods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT']
diff --git a/packages/core/src/test/shared/sshConfig.test.ts b/packages/core/src/test/shared/sshConfig.test.ts
@@ -17,7 +17,7 @@ import {
     connectScriptPrefix,
     getCodeCatalystSsmEnv,
 } from '../../codecatalyst/model'
-import { StartDevEnvironmentSessionRequest } from 'aws-sdk/clients/codecatalyst'
+import { StartDevEnvironmentSessionRequest } from '@aws-sdk/client-codecatalyst'
 import { mkdir, readFile } from 'fs/promises'
 import fs from '../../shared/fs/fs'
 import { globals } from '../../shared'
diff --git a/packages/core/src/testE2E/codecatalyst/client.test.ts b/packages/core/src/testE2E/codecatalyst/client.test.ts
@@ -20,7 +20,7 @@ import globals from '../../shared/extensionGlobals'
 import { CodeCatalystCreateWebview, SourceResponse } from '../../codecatalyst/vue/create/backend'
 import { waitUntil } from '../../shared/utilities/timeoutUtils'
 import { AccessDeniedException } from '@aws-sdk/client-sso-oidc'
-import { GetDevEnvironmentRequest } from 'aws-sdk/clients/codecatalyst'
+import { GetDevEnvironmentRequest, _InstanceType } from '@aws-sdk/client-codecatalyst'
 import { getTestWindow } from '../../test/shared/vscode/window'
 import { patchObject, registerAuthHook, skipTest, using } from '../../test/setupUtil'
 import { isExtensionInstalled } from '../../shared/utilities/vsCodeUtils'
@@ -37,7 +37,6 @@ import {
     SsoConnection,
 } from '../../auth/connection'
 import { hasKey } from '../../shared/utilities/tsUtils'
-import { _InstanceType } from '@aws-sdk/client-codecatalyst'
 
 let spaceName: CodeCatalystOrg['name']
 let projectName: CodeCatalystProject['name']
@@ -615,6 +614,9 @@ describe('Test how this codebase uses the CodeCatalyst API', function () {
     ): Promise<void> {
         const result = await waitUntil(
             async function () {
+                if (!devEnv.spaceName || !devEnv.projectName) {
+                    return false
+                }
                 const devEnvData = await client.getDevEnvironment({
                     spaceName: devEnv.spaceName,
                     projectName: devEnv.projectName,

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`*/`
`5`	`5`
`6`		`-import { Ides } from 'aws-sdk/clients/codecatalyst'`
	`6`	`+import { Ide } from '@aws-sdk/client-codecatalyst'`
`7`	`7`	`import * as vscode from 'vscode'`
`8`	`8`	`import { CodeCatalystResource, getCodeCatalystConfig } from '../shared/clients/codecatalystClient'`
`9`	`9`	`import { pushIf } from '../shared/utilities/collectionUtils'`
`@@ -55,6 +55,6 @@ export function openCodeCatalystUrl(o: CodeCatalystResource) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/** Returns true if the dev env has a "vscode" IDE runtime. */`
`58`		`-export function isDevenvVscode(ides: Ides \| undefined): boolean {`
	`58`	`+export function isDevenvVscode(ides: Ide[] \| undefined): boolean {`
`59`	`59`	`return ides !== undefined && ides.some((ide) => ide.name === 'VSCode')`
`60`	`60`	`}`