refactor(schemas): migrate to aws-sdk v3

Author: ctlai95

package-lock.json

@@ -533,11 +533,11 @@
         "@types/sinon": "^10.0.5",
         "@types/sinonjs__fake-timers": "^8.1.2",
         "@types/stream-buffers": "^3.0.7",
+        "@types/svgdom": "^0.1.2",
         "@types/tcp-port-used": "^1.0.1",
         "@types/uuid": "^9.0.1",
         "@types/whatwg-url": "^11.0.4",
         "@types/xml2js": "^0.4.11",
-        "@types/svgdom": "^0.1.2",
         "@vue/compiler-sfc": "^3.3.2",
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
@@ -566,7 +566,6 @@
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
         "@amzn/sagemaker-client": "file:../../src.gen/@amzn/sagemaker-client/1.0.0.tgz",
-        "@aws-sdk/credential-providers": "<3.731.0",
         "@aws-sdk/client-api-gateway": "<3.731.0",
         "@aws-sdk/client-apprunner": "<3.731.0",
         "@aws-sdk/client-cloudcontrol": "<3.731.0",
@@ -584,13 +583,15 @@
         "@aws-sdk/client-s3": "<3.731.0",
         "@aws-sdk/client-s3-control": "^3.830.0",
         "@aws-sdk/client-sagemaker": "<3.696.0",
+        "@aws-sdk/client-schemas": "~3.693.0",
+        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/client-ssm": "<3.731.0",
         "@aws-sdk/client-sso": "<3.731.0",
         "@aws-sdk/client-sso-oidc": "<3.731.0",
-        "@aws-sdk/client-sfn": "<3.731.0",
         "@aws-sdk/credential-provider-env": "<3.731.0",
         "@aws-sdk/credential-provider-process": "<3.731.0",
         "@aws-sdk/credential-provider-sso": "<3.731.0",
+        "@aws-sdk/credential-providers": "<3.731.0",
         "@aws-sdk/lib-storage": "<3.731.0",
         "@aws-sdk/property-provider": "<3.731.0",
         "@aws-sdk/protocol-http": "<3.731.0",
@@ -607,6 +608,7 @@
         "@smithy/service-error-classification": "^4.0.1",
         "@smithy/shared-ini-file-loader": "^4.0.0",
         "@smithy/util-retry": "^4.0.1",
+        "@svgdotjs/svg.js": "^3.0.16",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
@@ -625,6 +627,7 @@
         "http2": "^3.3.6",
         "i18n-ts": "^1.0.5",
         "immutable": "^4.3.0",
+        "jaro-winkler": "^0.2.8",
         "jose": "5.4.1",
         "js-yaml": "^4.1.0",
         "jsonc-parser": "^3.2.0",
@@ -634,9 +637,11 @@
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",
         "portfinder": "^1.0.32",
+        "protobufjs": "^7.2.6",
         "semver": "^7.5.4",
         "stream-buffers": "^3.0.2",
         "strip-ansi": "^5.2.0",
+        "svgdom": "^0.1.0",
         "tcp-port-used": "^1.0.1",
         "vscode-languageclient": "^6.1.4",
         "vscode-languageserver": "^6.1.1",
@@ -649,11 +654,7 @@
         "winston-transport": "^4.6.0",
         "ws": "^8.16.0",
         "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2",
-        "protobufjs": "^7.2.6",
-        "@svgdotjs/svg.js": "^3.0.16",
-        "svgdom": "^0.1.0",
-        "jaro-winkler": "^0.2.8"
+        "yaml-cfn": "^0.3.2"
     },
     "overrides": {
         "webfont": {

packages/core/package.json

@@ -5,7 +5,7 @@
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
-import { Schemas } from 'aws-sdk'
+import { PutCodeBindingResponse } from '@aws-sdk/client-schemas'
 import fs = require('fs')
 import path = require('path')
 import * as vscode from 'vscode'
@@ -180,10 +180,8 @@ export class SchemaCodeDownloader {
 export class CodeGenerator {
     public constructor(public client: SchemaClient) {}
 
-    public async generate(
-        codeDownloadRequest: SchemaCodeDownloadRequestDetails
-    ): Promise<Schemas.PutCodeBindingResponse> {
-        let response: Schemas.PutCodeBindingResponse
+    public async generate(codeDownloadRequest: SchemaCodeDownloadRequestDetails): Promise<PutCodeBindingResponse> {
+        let response: PutCodeBindingResponse
         try {
             response = await this.client.putCodeBinding(
                 codeDownloadRequest.language,
@@ -268,12 +266,18 @@ export class CodeDownloader {
             codeDownloadRequest.schemaName,
             codeDownloadRequest.schemaVersion
         )
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.log({ response })
 
         if (Buffer.isBuffer(response.Body)) {
             const zipContents = response.Body!.buffer
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log({ zipContents })
 
             return zipContents
         } else {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('throw new TypeError')
             throw new TypeError('Response body should be Buffer type')
         }
     }

packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts

@@ -6,11 +6,11 @@
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { Schemas } from 'aws-sdk'
+import { RegistrySummary, SchemaSummary, SearchSchemaSummary } from '@aws-sdk/client-schemas'
 import * as vscode from 'vscode'
 import { SchemaClient } from '../shared/clients/schemaClient'
 
-export async function* listRegistryItems(client: SchemaClient): AsyncIterableIterator<Schemas.RegistrySummary> {
+export async function* listRegistryItems(client: SchemaClient): AsyncIterableIterator<RegistrySummary> {
     const status = vscode.window.setStatusBarMessage(
         localize('AWS.message.statusBar.loading.registries', 'Loading Registry Items...')
     )
@@ -25,7 +25,7 @@ export async function* listRegistryItems(client: SchemaClient): AsyncIterableIte
 export async function* listSchemaItems(
     client: SchemaClient,
     registryName: string
-): AsyncIterableIterator<Schemas.SchemaSummary> {
+): AsyncIterableIterator<SchemaSummary> {
     const status = vscode.window.setStatusBarMessage(
         localize('AWS.message.statusBar.loading.schemaItems', 'Loading Schema Items...')
     )
@@ -41,7 +41,7 @@ export async function* searchSchemas(
     client: SchemaClient,
     keyword: string,
     registryName: string
-): AsyncIterableIterator<Schemas.SearchSchemaSummary> {
+): AsyncIterableIterator<SearchSchemaSummary> {
     const status = vscode.window.setStatusBarMessage(
         localize('AWS.message.statusBar.searching.schemas', 'Searching Schemas...')
     )