JavaScript (v3): Use @smithy namespace for internal packages. (#5222)

cpyle0819 · web-flow · commit aaec6eff4be5 · 2023-08-10T07:37:39.000-05:00
diff --git a/javascriptv3/example_code/eventbridge/src/package.json b/javascriptv3/example_code/eventbridge/src/package.json
@@ -5,8 +5,8 @@
   "repository": "git@github.com/awsdocs/aws-doc-sdk-examples/tree/master/javascriptv3/example_code/eventbridge.git",
   "author": "Brian Murray <brmur@amazon.com>",
   "license": "Apache 2.0",
+  "type": "module",
   "dependencies": {
-    "@aws-sdk/eventbridge": "^3.32.0"
-  },
-  "type": "module"
+    "@aws-sdk/client-eventbridge": "^3.387.0"
+  }
 }
diff --git a/javascriptv3/example_code/eventbridge/tests/package.json b/javascriptv3/example_code/eventbridge/tests/package.json
@@ -6,8 +6,7 @@
   "author": "Brian Murray <brmur@amazon.com>, Alex Forsyth <alex-git@amazon.com>",
   "license": "Apache 2.0",
   "dependencies": {
-    "@aws-sdk/eventbridge": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0"
+    "@aws-sdk/client-eventbridge": "^3.387.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.14.4",
diff --git a/javascriptv3/example_code/glacier/package.json b/javascriptv3/example_code/glacier/package.json
@@ -7,7 +7,6 @@
   "license": "Apache 2.0",
   "dependencies": {
     "@aws-sdk/client-glacier": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/types": "^3.32.0"
   },
   "devDependencies": {
diff --git a/javascriptv3/example_code/kinesis/package.json b/javascriptv3/example_code/kinesis/package.json
@@ -11,16 +11,15 @@
   "license": "Apache 2.0",
   "dependencies": {
     "@aws-sdk/client-cognito-identity": "^3.32.0",
-    "@aws-sdk/credential-provider-cognito-identity": "^3.32.0",
     "@aws-sdk/client-kinesis": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
+    "@aws-sdk/credential-provider-cognito-identity": "^3.32.0",
     "@aws-sdk/types": "^3.32.0"
   },
   "devDependencies": {
-    "webpack": "^4.42.0",
-    "webpack-cli": "^3.3.11",
     "@aws-sdk/types": "^3.32.0",
-    "@types/node": "^14.0.23"
+    "@types/node": "^14.0.23",
+    "webpack": "^4.42.0",
+    "webpack-cli": "^3.3.11"
   },
   "module": "type"
 }
diff --git a/javascriptv3/example_code/mediaconvert/package.json b/javascriptv3/example_code/mediaconvert/package.json
@@ -7,10 +7,9 @@
   "license": "Apache 2.0",
   "dependencies": {
     "@aws-sdk/client-mediaconvert": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/types": "^3.32.0",
-    "node-fetch": "^2.6",
-    "jest": "^26.6.3"
+    "jest": "^26.6.3",
+    "node-fetch": "^2.6"
   },
   "devDependencies": {
     "@types/node": "^14.0.23",
diff --git a/javascriptv3/example_code/nodegetstarted/package.json b/javascriptv3/example_code/nodegetstarted/package.json
@@ -4,7 +4,6 @@
   "main": "index.js",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/types": "^3.32.0"
   },
   "devDependencies": {
diff --git a/javascriptv3/example_code/personalize/tests/package.json b/javascriptv3/example_code/personalize/tests/package.json
@@ -11,8 +11,7 @@
     "@aws-sdk/client-personalize-events": "^3.51.0",
     "@aws-sdk/client-personalize-runtime": "^3.51.0",
     "dotenv": "^16.0.0",
-    "fs": "^0.0.1-security",
-    "@aws-sdk/node-http-handler": "^3.32.0"
+    "fs": "^0.0.1-security"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.14.4",
diff --git a/javascriptv3/example_code/polly/general-examples/src/package.json b/javascriptv3/example_code/polly/general-examples/src/package.json
@@ -6,7 +6,6 @@
   "license": "Apache 2.0",
   "dependencies": {
     "@aws-sdk/client-polly": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/types": "^3.32.0"
   },
   "devDependencies": {
diff --git a/javascriptv3/example_code/polly/package.json b/javascriptv3/example_code/polly/package.json
@@ -6,14 +6,13 @@
   "author": "Brian Murray <brmur@amazon.com>, Alex Forsyth <alex-git@amazon.com>",
   "license": "Apache 2.0",
   "scripts": {
-    "run":"webpack src/polly.js --mode development --libraryTarget commonjs2 --target web --devtool false -o src/dist/main.js"
+    "run": "webpack src/polly.js --mode development --libraryTarget commonjs2 --target web --devtool false -o src/dist/main.js"
   },
   "dependencies": {
     "@aws-sdk/client-cognito-identity": "^3.32.0",
-    "@aws-sdk/credential-provider-cognito-identity": "^3.32.0",
     "@aws-sdk/client-polly": "^3.32.0",
-    "@aws-sdk/polly-request-presigner": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0"
+    "@aws-sdk/credential-provider-cognito-identity": "^3.32.0",
+    "@aws-sdk/polly-request-presigner": "^3.32.0"
   },
   "devDependencies": {
     "webpack": "^4.42.0",
diff --git a/javascriptv3/example_code/redshift/package.json b/javascriptv3/example_code/redshift/package.json
@@ -7,7 +7,6 @@
   "license": "Apache 2.0",
   "dependencies": {
     "@aws-sdk/client-redshift": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/types": "^3.32.0"
   },
   "devDependencies": {
diff --git a/javascriptv3/example_code/rekognition/estimate-age-example/src/package.json b/javascriptv3/example_code/rekognition/estimate-age-example/src/package.json
@@ -10,10 +10,9 @@
   "author": "Brian Murray <brmur@amazon.com>",
   "license": "Apache 2.0",
   "dependencies": {
+    "@aws-sdk/client-cognito-identity": "^3.32.0",
     "@aws-sdk/client-rekognition": "^3.32.0",
-    "@aws-sdk/node-http-handler": "^3.32.0",
     "@aws-sdk/credential-provider-cognito-identity": "^3.32.0",
-    "@aws-sdk/client-cognito-identity": "^3.32.0",
     "uuid": "^8.3.2",
     "webpack": "^4.42.0",
     "webpack-cli": "^3.3.11"
diff --git a/javascriptv3/example_code/s3/package.json b/javascriptv3/example_code/s3/package.json
@@ -12,11 +12,11 @@
     "@aws-crypto/sha256-browser": "^4.0.0",
     "@aws-sdk/client-s3": "^3.272.0",
     "@aws-sdk/credential-providers": "^3.276.0",
-    "@aws-sdk/hash-node": "^3.272.0",
-    "@aws-sdk/protocol-http": "^3.272.0",
     "@aws-sdk/s3-request-presigner": "^3.276.0",
-    "@aws-sdk/url-parser": "^3.272.0",
     "@aws-sdk/util-format-url": "^3.272.0",
+    "@smithy/hash-node": "^2.0.2",
+    "@smithy/protocol-http": "^2.0.2",
+    "@smithy/url-parser": "^2.0.2",
     "libs": "*"
   },
   "devDependencies": {
diff --git a/javascriptv3/example_code/s3/scenarios/presigned-url-download.js b/javascriptv3/example_code/s3/scenarios/presigned-url-download.js
@@ -3,21 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fileURLToPath } from "url";
+import {fileURLToPath} from "url";
 
 // snippet-start:[s3.JavaScript.buckets.getpresignedurlv3]
-import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { fromIni } from "@aws-sdk/credential-providers";
-import { HttpRequest } from "@aws-sdk/protocol-http";
-import {
-  getSignedUrl,
-  S3RequestPresigner,
-} from "@aws-sdk/s3-request-presigner";
-import { parseUrl } from "@aws-sdk/url-parser";
-import { formatUrl } from "@aws-sdk/util-format-url";
-import { Hash } from "@aws-sdk/hash-node";
+import {GetObjectCommand, S3Client} from "@aws-sdk/client-s3";
+import {fromIni} from "@aws-sdk/credential-providers";
+import {HttpRequest} from "@smithy/protocol-http";
+import {getSignedUrl, S3RequestPresigner} from "@aws-sdk/s3-request-presigner";
+import {parseUrl} from "@smithy/url-parser";
+import {formatUrl} from "@aws-sdk/util-format-url";
+import {Hash} from "@smithy/hash-node";
 
-const createPresignedUrlWithoutClient = async ({ region, bucket, key }) => {
+const createPresignedUrlWithoutClient = async ({region, bucket, key}) => {
   const url = parseUrl(`https://${bucket}.s3.${region}.amazonaws.com/${key}`);
   const presigner = new S3RequestPresigner({
     credentials: fromIni(),
@@ -29,10 +26,10 @@ const createPresignedUrlWithoutClient = async ({ region, bucket, key }) => {
   return formatUrl(signedUrlObject);
 };
 
-const createPresignedUrlWithClient = ({ region, bucket, key }) => {
-  const client = new S3Client({ region });
-  const command = new GetObjectCommand({ Bucket: bucket, Key: key });
-  return getSignedUrl(client, command, { expiresIn: 3600 });
+const createPresignedUrlWithClient = ({region, bucket, key}) => {
+  const client = new S3Client({region});
+  const command = new GetObjectCommand({Bucket: bucket, Key: key});
+  return getSignedUrl(client, command, {expiresIn: 3600});
 };
 
 export const main = async () => {
diff --git a/javascriptv3/example_code/s3/scenarios/presigned-url-upload.js b/javascriptv3/example_code/s3/scenarios/presigned-url-upload.js
@@ -3,22 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fileURLToPath } from "url";
+import {fileURLToPath} from "url";
 
 // snippet-start:[s3.JavaScript.buckets.presignedurlv3]
 import https from "https";
-import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { fromIni } from "@aws-sdk/credential-providers";
-import { HttpRequest } from "@aws-sdk/protocol-http";
-import {
-  getSignedUrl,
-  S3RequestPresigner,
-} from "@aws-sdk/s3-request-presigner";
-import { parseUrl } from "@aws-sdk/url-parser";
-import { formatUrl } from "@aws-sdk/util-format-url";
-import { Hash } from "@aws-sdk/hash-node";
+import {PutObjectCommand, S3Client} from "@aws-sdk/client-s3";
+import {fromIni} from "@aws-sdk/credential-providers";
+import {HttpRequest} from "@smithy/protocol-http";
+import {getSignedUrl, S3RequestPresigner} from "@aws-sdk/s3-request-presigner";
+import {parseUrl} from "@smithy/url-parser";
+import {formatUrl} from "@aws-sdk/util-format-url";
+import {Hash} from "@smithy/hash-node";
 
-const createPresignedUrlWithoutClient = async ({ region, bucket, key }) => {
+const createPresignedUrlWithoutClient = async ({region, bucket, key}) => {
   const url = parseUrl(`https://${bucket}.s3.${region}.amazonaws.com/${key}`);
   const presigner = new S3RequestPresigner({
     credentials: fromIni(),
@@ -27,22 +24,22 @@ const createPresignedUrlWithoutClient = async ({ region, bucket, key }) => {
   });
 
   const signedUrlObject = await presigner.presign(
-    new HttpRequest({ ...url, method: "PUT" })
+    new HttpRequest({...url, method: "PUT"})
   );
   return formatUrl(signedUrlObject);
 };
 
-const createPresignedUrlWithClient = ({ region, bucket, key }) => {
-  const client = new S3Client({ region });
-  const command = new PutObjectCommand({ Bucket: bucket, Key: key });
-  return getSignedUrl(client, command, { expiresIn: 3600 });
+const createPresignedUrlWithClient = ({region, bucket, key}) => {
+  const client = new S3Client({region});
+  const command = new PutObjectCommand({Bucket: bucket, Key: key});
+  return getSignedUrl(client, command, {expiresIn: 3600});
 };
 
 function put(url, data) {
   return new Promise((resolve, reject) => {
     const req = https.request(
       url,
-      { method: "PUT", headers: { "Content-Length": new Blob([data]).size } },
+      {method: "PUT", headers: {"Content-Length": new Blob([data]).size}},
       (res) => {
         let responseBody = "";
         res.on("data", (chunk) => {
diff --git a/javascriptv3/package-lock.json b/javascriptv3/package-lock.json
