diff --git a/clients/client-rekognitionstreaming/package.json b/clients/client-rekognitionstreaming/package.json index 7ed095b3d0064..c0576f5add07c 100644 --- a/clients/client-rekognitionstreaming/package.json +++ b/clients/client-rekognitionstreaming/package.json @@ -38,7 +38,6 @@ "@aws-sdk/middleware-logger": "*", "@aws-sdk/middleware-recursion-detection": "*", "@aws-sdk/middleware-retry": "*", - "@aws-sdk/middleware-sdk-rekognitionstreaming": "*", "@aws-sdk/middleware-serde": "*", "@aws-sdk/middleware-signing": "*", "@aws-sdk/middleware-stack": "*", diff --git a/clients/client-rekognitionstreaming/src/RekognitionStreamingClient.ts b/clients/client-rekognitionstreaming/src/RekognitionStreamingClient.ts index 694e143773023..eb350ae517ac6 100644 --- a/clients/client-rekognitionstreaming/src/RekognitionStreamingClient.ts +++ b/clients/client-rekognitionstreaming/src/RekognitionStreamingClient.ts @@ -21,7 +21,6 @@ import { import { getLoggerPlugin } from "@aws-sdk/middleware-logger"; import { getRecursionDetectionPlugin } from "@aws-sdk/middleware-recursion-detection"; import { getRetryPlugin, resolveRetryConfig, RetryInputConfig, RetryResolvedConfig } from "@aws-sdk/middleware-retry"; -import { getRekognitionStreamingPlugin } from "@aws-sdk/middleware-sdk-rekognitionstreaming"; import { AwsAuthInputConfig, AwsAuthResolvedConfig, @@ -320,7 +319,6 @@ export class RekognitionStreamingClient extends __Client< this.middlewareStack.use(getLoggerPlugin(this.config)); this.middlewareStack.use(getRecursionDetectionPlugin(this.config)); this.middlewareStack.use(getAwsAuthPlugin(this.config)); - this.middlewareStack.use(getRekognitionStreamingPlugin(this.config)); this.middlewareStack.use(getUserAgentPlugin(this.config)); } diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddRekognitionStreamingDependency.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddRekognitionStreamingDependency.java deleted file mode 100644 index 462b85cbf4dab..0000000000000 --- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddRekognitionStreamingDependency.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -package software.amazon.smithy.aws.typescript.codegen; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import software.amazon.smithy.aws.traits.ServiceTrait; -import software.amazon.smithy.codegen.core.SymbolProvider; -import software.amazon.smithy.model.Model; -import software.amazon.smithy.model.shapes.ServiceShape; -import software.amazon.smithy.typescript.codegen.LanguageTarget; -import software.amazon.smithy.typescript.codegen.TypeScriptSettings; -import software.amazon.smithy.typescript.codegen.TypeScriptWriter; -import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin; -import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration; -import software.amazon.smithy.utils.ListUtils; -import software.amazon.smithy.utils.SmithyInternalApi; - -/** - * Add client plugins and configs to support WebSocket streaming for Rekognition - * Streaming service. - **/ -@SmithyInternalApi -public class AddRekognitionStreamingDependency implements TypeScriptIntegration { - @Override - public List getClientPlugins() { - return ListUtils.of( - RuntimeClientPlugin.builder() - .withConventions(AwsDependency.REKOGNITION_STREAMING_MIDDLEWARE.dependency, - "RekognitionStreaming", RuntimeClientPlugin.Convention.HAS_MIDDLEWARE) - .servicePredicate((m, s) -> isRekognitionStreaming(s)) - .build() - ); - } - - @Override - public Map> getRuntimeConfigWriters( - TypeScriptSettings settings, - Model model, - SymbolProvider symbolProvider, - LanguageTarget target - ) { - ServiceShape service = settings.getService(model); - if (!isRekognitionStreaming(service)) { - return Collections.emptyMap(); - } - - switch (target) { - case REACT_NATIVE: - case BROWSER: - default: - return Collections.emptyMap(); - } - } - - private static boolean isRekognitionStreaming(ServiceShape service) { - String serviceId = service.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse(""); - return serviceId.equals("RekognitionStreaming"); - } -} - - diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java index 5a8fcefbde4e9..d9bae758452fd 100644 --- a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java +++ b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsDependency.java @@ -63,7 +63,6 @@ public enum AwsDependency implements SymbolDependencyContainer { MIDDLEWARE_EVENTSTREAM(NORMAL_DEPENDENCY, "@aws-sdk/middleware-eventstream"), AWS_SDK_EVENTSTREAM_HANDLER_NODE(NORMAL_DEPENDENCY, "@aws-sdk/eventstream-handler-node"), TRANSCRIBE_STREAMING_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-transcribe-streaming"), - REKOGNITION_STREAMING_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-rekognitionstreaming"), STS_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-sts"), STS_CLIENT(NORMAL_DEPENDENCY, "@aws-sdk/client-sts"), MIDDLEWARE_LOGGER(NORMAL_DEPENDENCY, "@aws-sdk/middleware-logger"), diff --git a/codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration b/codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration index cec70e0796d13..2e5efdcb3bf0f 100644 --- a/codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration +++ b/codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration @@ -16,7 +16,6 @@ software.amazon.smithy.aws.typescript.codegen.AddEventStreamHandlingDependency software.amazon.smithy.aws.typescript.codegen.AddHttp2Dependency software.amazon.smithy.aws.typescript.codegen.AddWebsocketPlugin software.amazon.smithy.aws.typescript.codegen.AddTranscribeStreamingDependency -software.amazon.smithy.aws.typescript.codegen.AddRekognitionStreamingDependency software.amazon.smithy.aws.typescript.codegen.AddUserAgentDependency software.amazon.smithy.aws.typescript.codegen.AddOmitRetryHeadersDependency software.amazon.smithy.aws.typescript.codegen.StripNewEnumNames diff --git a/packages/middleware-sdk-rekognitionstreaming/.gitignore b/packages/middleware-sdk-rekognitionstreaming/.gitignore deleted file mode 100644 index f30a2ca2cef55..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/node_modules/ -/build/ -/dist/ -/coverage/ -/docs/ -*.tsbuildinfo -*.tgz -*.log -package-lock.json diff --git a/packages/middleware-sdk-rekognitionstreaming/CHANGELOG.md b/packages/middleware-sdk-rekognitionstreaming/CHANGELOG.md deleted file mode 100644 index edca91e500be9..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [3.308.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.307.0...v3.308.0) (2023-04-06) - - -### Features - -* **middleware-sdk-rekognitionstreaming:** create port middleware ([#4622](https://github.com/aws/aws-sdk-js-v3/issues/4622)) ([adf3353](https://github.com/aws/aws-sdk-js-v3/commit/adf33539eeafa78a7cb5eadbcae616f8c76a31c8)) diff --git a/packages/middleware-sdk-rekognitionstreaming/README.md b/packages/middleware-sdk-rekognitionstreaming/README.md deleted file mode 100644 index bdaf37e5e8e78..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# @aws-sdk/middleware-sdk-rekognitionstreaming - -[![NPM version](https://img.shields.io/npm/v/@aws-sdk/middleware-sdk-rekognitionstreaming/latest.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-sdk-rekognitionstreaming) -[![NPM downloads](https://img.shields.io/npm/dm/@aws-sdk/middleware-sdk-rekognitionstreaming.svg)](https://www.npmjs.com/package/@aws-sdk/middleware-sdk-rekognitionstreaming) diff --git a/packages/middleware-sdk-rekognitionstreaming/jest.config.js b/packages/middleware-sdk-rekognitionstreaming/jest.config.js deleted file mode 100644 index 64f3d932819c3..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const base = require("../../jest.config.base.js"); - -module.exports = { - ...base, - //only test cjs dist, avoid testing the package twice - testPathIgnorePatterns: ["/node_modules/", "/es/"], -}; diff --git a/packages/middleware-sdk-rekognitionstreaming/package.json b/packages/middleware-sdk-rekognitionstreaming/package.json deleted file mode 100644 index 90180fb283dbb..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "@aws-sdk/middleware-sdk-rekognitionstreaming", - "version": "3.308.0", - "main": "./dist-cjs/index.js", - "module": "./dist-es/index.js", - "types": "./dist-types/index.d.ts", - "scripts": { - "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'", - "build:cjs": "tsc -p tsconfig.cjs.json", - "build:es": "tsc -p tsconfig.es.json", - "build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build", - "build:types": "tsc -p tsconfig.types.json", - "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4", - "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo", - "test": "jest --passWithNoTests" - }, - "author": { - "name": "AWS SDK for JavaScript Team", - "url": "https://aws.amazon.com/javascript/" - }, - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/protocol-http": "*", - "@aws-sdk/types": "*", - "tslib": "^2.5.0" - }, - "devDependencies": { - "@tsconfig/recommended": "1.0.1", - "@types/uuid": "^8.3.0", - "concurrently": "7.0.0", - "downlevel-dts": "0.10.1", - "jest-websocket-mock": "^2.0.2", - "mock-socket": "9.1.5", - "rimraf": "3.0.2", - "typedoc": "0.23.23", - "typescript": "~4.9.5" - }, - "engines": { - "node": ">=14.0.0" - }, - "typesVersions": { - "<4.0": { - "dist-types/*": [ - "dist-types/ts3.4/*" - ] - } - }, - "files": [ - "dist-*" - ], - "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/middleware-sdk-rekognitionstreaming", - "repository": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-js-v3.git", - "directory": "packages/middleware-sdk-rekognitionstreaming" - }, - "typedoc": { - "entryPoint": "src/index.ts" - } -} diff --git a/packages/middleware-sdk-rekognitionstreaming/src/index.ts b/packages/middleware-sdk-rekognitionstreaming/src/index.ts deleted file mode 100644 index 0dc5de4ad8528..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./middleware-port"; -export * from "./plugin"; diff --git a/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.spec.ts b/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.spec.ts deleted file mode 100644 index ecca03a4c63d8..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.spec.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { HttpRequest } from "@aws-sdk/protocol-http"; -import { BuildHandlerArguments, RequestHandler } from "@aws-sdk/types"; - -import { websocketPortMiddleware } from "./middleware-port"; - -describe("websocketPortMiddleware", () => { - const mockHandler: RequestHandler = { - metadata: { handlerProtocol: "websocket" }, - handle: () => ({} as any), - }; - it("should skip non-http request", (done) => { - const nonHttpRequest = { - foo: "bar", - }; - const next = (args: BuildHandlerArguments) => { - expect(args.request).toEqual(nonHttpRequest); - done(); - }; - const mw = websocketPortMiddleware({ requestHandler: mockHandler }); - mw(next as any, {} as any)({ request: nonHttpRequest, input: {} }); - }); - - it("should skip non WebSocket requests", (done) => { - const mockHandler: RequestHandler = { - metadata: { handlerProtocol: "some_protocol" }, - handle: () => ({} as any), - }; - const request = new HttpRequest({}); - const next = (args: BuildHandlerArguments) => { - expect(args.request).toEqual(request); - done(); - }; - const mw = websocketPortMiddleware({ requestHandler: mockHandler }); - mw(next as any, {} as any)({ request, input: {} }); - }); - - it("should update endpoint to websocket url", (done) => { - const request = new HttpRequest({ - hostname: "streaming-rekognition.us-east-1.amazonaws.com", - }); - const next = (args: BuildHandlerArguments) => { - expect(HttpRequest.isInstance(args.request)).toBeTruthy(); - const processed = args.request as HttpRequest; - expect(processed.hostname).toEqual("streaming-rekognition.us-east-1.amazonaws.com:443"); - expect(processed.headers.host).toEqual("streaming-rekognition.us-east-1.amazonaws.com:443"); - done(); - }; - const mw = websocketPortMiddleware({ requestHandler: mockHandler }); - mw(next as any, {} as any)({ request, input: {} }); - }); -}); diff --git a/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.ts b/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.ts deleted file mode 100644 index bec22dfc53c36..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/src/middleware-port.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { HttpRequest } from "@aws-sdk/protocol-http"; -import { - BuildHandler, - BuildHandlerArguments, - BuildMiddleware, - RelativeMiddlewareOptions, - RequestHandler, -} from "@aws-sdk/types"; - -/** - * @internal - * - * Middleware that generates WebSocket URL to RekognitionStreaming service - * Reference: https://docs.aws.amazon.com/transcribe/latest/dg/websocket.html - */ -export const websocketPortMiddleware = - (options: { requestHandler: RequestHandler }): BuildMiddleware => - (next: BuildHandler) => - (args: BuildHandlerArguments) => { - const { request } = args; - if (HttpRequest.isInstance(request) && options.requestHandler.metadata?.handlerProtocol?.includes("websocket")) { - // Append port to hostname because it needs to be signed together - request.hostname = `${request.hostname}:443`; - request.headers.host = request.hostname; - } - return next(args); - }; - -/** - * @internal - */ -export const websocketPortMiddlewareOptions: RelativeMiddlewareOptions = { - name: "websocketPortMiddleware", - tags: ["WEBSOCKET", "EVENT_STREAM", "PORT"], - relation: "after", - toMiddleware: "eventStreamHeaderMiddleware", - override: true, -}; diff --git a/packages/middleware-sdk-rekognitionstreaming/src/plugin.ts b/packages/middleware-sdk-rekognitionstreaming/src/plugin.ts deleted file mode 100644 index a4e3e27b80d29..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/src/plugin.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Pluggable, RequestHandler } from "@aws-sdk/types"; - -import { websocketPortMiddleware, websocketPortMiddlewareOptions } from "./middleware-port"; - -interface PreviouslyResolved { - requestHandler: RequestHandler; -} - -/** - * @internal - */ -export const getRekognitionStreamingPlugin = (config: PreviouslyResolved): Pluggable => ({ - applyToStack: (clientStack) => { - clientStack.addRelativeTo(websocketPortMiddleware(config), websocketPortMiddlewareOptions); - }, -}); diff --git a/packages/middleware-sdk-rekognitionstreaming/tsconfig.cjs.json b/packages/middleware-sdk-rekognitionstreaming/tsconfig.cjs.json deleted file mode 100644 index 1a4dd131cc40b..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/tsconfig.cjs.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "outDir": "dist-cjs", - "rootDir": "src", - "stripInternal": true - }, - "extends": "../../tsconfig.cjs.json", - "include": ["src/"] -} diff --git a/packages/middleware-sdk-rekognitionstreaming/tsconfig.es.json b/packages/middleware-sdk-rekognitionstreaming/tsconfig.es.json deleted file mode 100644 index 9fe8a90b9906a..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/tsconfig.es.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "lib": ["DOM"], - "outDir": "dist-es", - "rootDir": "src", - "stripInternal": true - }, - "extends": "../../tsconfig.es.json", - "include": ["src/"] -} diff --git a/packages/middleware-sdk-rekognitionstreaming/tsconfig.types.json b/packages/middleware-sdk-rekognitionstreaming/tsconfig.types.json deleted file mode 100644 index 6cdf9f52ea065..0000000000000 --- a/packages/middleware-sdk-rekognitionstreaming/tsconfig.types.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "declarationDir": "dist-types", - "rootDir": "src" - }, - "extends": "../../tsconfig.types.json", - "include": ["src/"] -}