test: normalize import of integ test mock

kuhe · kuhe · commit b8cbf916cb32 · 2025-09-17T11:35:56.000-04:00
diff --git a/clients/client-s3/test/integ/s3-selectObjectContent.integ.spec.ts b/clients/client-s3/test/integ/s3-selectObjectContent.integ.spec.ts
@@ -3,7 +3,7 @@ import { HttpResponse } from "@smithy/protocol-http";
 import { Readable } from "stream";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../../private/aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("selectObjectContent", () => {
   const credentials = {
diff --git a/lib/lib-dynamodb/src/test/mutability.integ.spec.ts b/lib/lib-dynamodb/src/test/mutability.integ.spec.ts
@@ -1,10 +1,9 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { DynamoDB, ScanCommand } from "@aws-sdk/client-dynamodb";
 import { HeadBucketCommand, HeadBucketCommandInput, S3Client } from "@aws-sdk/client-s3";
 import { DynamoDBDocument, ScanCommand as DocumentScanCommand, ScanCommandInput } from "@aws-sdk/lib-dynamodb";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../../private/aws-util-test/src";
-
 describe("DynamoDBDocument command mutability", () => {
   it("should allow sending the same command more than once without mutating the Command instance", async () => {
     const ddb = new DynamoDB({
diff --git a/packages/middleware-endpoint-discovery/src/middleware-endpoint-discovery.integ.spec.ts b/packages/middleware-endpoint-discovery/src/middleware-endpoint-discovery.integ.spec.ts
@@ -1,9 +1,9 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { TimestreamQuery } from "@aws-sdk/client-timestream-query";
 import { TimestreamWrite } from "@aws-sdk/client-timestream-write";
 import { EndpointCache } from "@aws-sdk/endpoint-cache";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
 import { getCacheKey } from "./getCacheKey";
 
 describe("middleware-endpoint-discovery", () => {
diff --git a/packages/middleware-eventstream/src/middleware-eventstream.integ.spec.ts b/packages/middleware-eventstream/src/middleware-eventstream.integ.spec.ts
@@ -1,10 +1,10 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { LexRuntimeV2 } from "@aws-sdk/client-lex-runtime-v2";
 import { RekognitionStreaming } from "@aws-sdk/client-rekognitionstreaming";
 import { TranscribeStreaming } from "@aws-sdk/client-transcribe-streaming";
 import { Decoder, Encoder, EventStreamPayloadHandlerProvider } from "@smithy/types";
 import { describe, expect, test as it, vi } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
 import { resolveEventStreamConfig } from "./eventStreamConfiguration";
 
 describe("middleware-eventstream", () => {
diff --git a/packages/middleware-expect-continue/src/middleware-expect-continue.integ.spec.ts b/packages/middleware-expect-continue/src/middleware-expect-continue.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-expect-continue", () => {
   describe(S3.name, () => {
     it("should not set expect header if there is no body", async () => {
diff --git a/packages/middleware-flexible-checksums/src/middleware-flexible-checksums.integ.spec.ts b/packages/middleware-flexible-checksums/src/middleware-flexible-checksums.integ.spec.ts
@@ -1,12 +1,12 @@
 // Required for testing CRC64NVME
 import "@aws-sdk/crc64-nvme-crt";
 
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { ChecksumAlgorithm, S3 } from "@aws-sdk/client-s3";
 import { HttpHandler, HttpRequest, HttpResponse } from "@smithy/protocol-http";
 import { Readable, Transform } from "stream";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
 import { DEFAULT_CHECKSUM_ALGORITHM, RequestChecksumCalculation, ResponseChecksumValidation } from "./constants";
 
 describe("middleware-flexible-checksums", () => {
diff --git a/packages/middleware-flexible-checksums/src/middleware-flexible-checksums.retry.integ.spec.ts b/packages/middleware-flexible-checksums/src/middleware-flexible-checksums.retry.integ.spec.ts
@@ -1,9 +1,9 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import { retryMiddleware } from "@smithy/middleware-retry";
 import { HttpResponse } from "@smithy/protocol-http";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
 import { flexibleChecksumsMiddleware } from "./flexibleChecksumsMiddleware";
 
 describe("middleware-flexible-checksums.retry", () => {
diff --git a/packages/middleware-host-header/src/middleware-host-header.integ.spec.ts b/packages/middleware-host-header/src/middleware-host-header.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { SageMaker } from "@aws-sdk/client-sagemaker";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-host-header", () => {
   describe(SageMaker.name, () => {
     it("should set the host header", async () => {
diff --git a/packages/middleware-location-constraint/src/middleware-location-constraint.integ.spec.ts b/packages/middleware-location-constraint/src/middleware-location-constraint.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-location-constraint", () => {
   describe(S3.name, () => {
     it("should set on input CreateBucketConfiguration and LocationConstraint", async () => {
diff --git a/packages/middleware-logger/src/middleware-logger.integ.spec.ts b/packages/middleware-logger/src/middleware-logger.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { CloudFront } from "@aws-sdk/client-cloudfront";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-location-constraint", () => {
   describe(CloudFront.name, () => {
     it("should have no effect on request creation", async () => {
diff --git a/packages/middleware-recursion-detection/src/middleware-recursion-detection.integ.spec.ts b/packages/middleware-recursion-detection/src/middleware-recursion-detection.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { Lambda } from "@aws-sdk/client-lambda";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 const ENV_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME";
 const ENV_TRACE_ID = "_X_AMZN_TRACE_ID";
 
diff --git a/packages/middleware-sdk-api-gateway/src/middleware-sdk-api-gateway.integ.spec.ts b/packages/middleware-sdk-api-gateway/src/middleware-sdk-api-gateway.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { APIGateway } from "@aws-sdk/client-api-gateway";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-api-gateway", () => {
   describe(APIGateway.name, () => {
     it("should add default accept header", async () => {
diff --git a/packages/middleware-sdk-glacier/src/middleware-sdk-glacier.integ.spec.ts b/packages/middleware-sdk-glacier/src/middleware-sdk-glacier.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { Glacier } from "@aws-sdk/client-glacier";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-glacier", () => {
   describe(Glacier.name, () => {
     it("should set a default account id", async () => {
diff --git a/packages/middleware-sdk-machinelearning/src/middleware-sdk-machinelearning.integ.spec.ts b/packages/middleware-sdk-machinelearning/src/middleware-sdk-machinelearning.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { MachineLearning } from "@aws-sdk/client-machine-learning";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-machine-learning", () => {
   describe(MachineLearning.name, () => {
     it("should use the input predict endpoint", async () => {
diff --git a/packages/middleware-sdk-route53/src/middleware-sdk-route53.integ.spec.ts b/packages/middleware-sdk-route53/src/middleware-sdk-route53.integ.spec.ts
@@ -1,9 +1,8 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { Route53 } from "@aws-sdk/client-route-53";
 import { XMLParser } from "fast-xml-parser";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-route53", () => {
   describe(Route53.name, () => {
     it("should normalize param names HostedZoneId", async () => {
diff --git a/packages/middleware-sdk-s3-control/src/middleware-sdk-s3-control.integ.spec.ts b/packages/middleware-sdk-s3-control/src/middleware-sdk-s3-control.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3Control } from "@aws-sdk/client-s3-control";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-s3-control", () => {
   describe(S3Control.name, () => {
     it("dedupes host prefixes", async () => {
diff --git a/packages/middleware-sdk-s3/src/middleware-sdk-s3.integ.spec.ts b/packages/middleware-sdk-s3/src/middleware-sdk-s3.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import { describe, expect, test as it, vi } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-s3", () => {
   describe(S3.name, () => {
     it("validates bucket names", async () => {
diff --git a/packages/middleware-sdk-s3/src/s3-express/middleware-s3-express.integ.spec.ts b/packages/middleware-sdk-s3/src/s3-express/middleware-s3-express.integ.spec.ts
@@ -1,8 +1,8 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import { AwsCredentialIdentity, AwsSdkFeatures } from "@aws-sdk/types";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../../private/aws-util-test/src";
 import { S3ExpressIdentity, S3ExpressIdentityProvider } from "./index";
 
 describe("middleware-s3-express", () => {
diff --git a/packages/middleware-sdk-sqs/src/middleware-sdk-sqs.integ.spec.ts b/packages/middleware-sdk-sqs/src/middleware-sdk-sqs.integ.spec.ts
@@ -1,12 +1,11 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { SQS } from "@aws-sdk/client-sqs";
 import { HttpHandler, HttpResponse } from "@smithy/protocol-http";
 import type { AwsCredentialIdentity } from "@smithy/types";
 import crypto from "crypto";
 import { Readable } from "stream";
 import { beforeEach, describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 const sqsModel: any = require("../../../codegen/sdk-codegen/aws-models/sqs.json");
 const useAwsQuery = !!sqsModel.shapes["com.amazonaws.sqs#AmazonSQS"].traits["aws.protocols#awsQuery"];
 const isAwsQueryCompatible =
diff --git a/packages/middleware-sdk-transcribe-streaming/src/middleware-sdk-transcribe-streaming.integ.spec.ts b/packages/middleware-sdk-transcribe-streaming/src/middleware-sdk-transcribe-streaming.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { TranscribeStreaming } from "@aws-sdk/client-transcribe-streaming";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-sdk-transcribe-streaming", () => {
   // TODO: http2 in CI
   describe.skip(TranscribeStreaming.name, () => {
diff --git a/packages/middleware-signing/src/middleware-signing.integ.spec.ts b/packages/middleware-signing/src/middleware-signing.integ.spec.ts
@@ -1,9 +1,8 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { EC2 } from "@aws-sdk/client-ec2";
 import { SageMaker } from "@aws-sdk/client-sagemaker";
 import { describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-signing", () => {
   describe(EC2.name, () => {
     it("sign requests in the header", async () => {
diff --git a/packages/middleware-ssec/src/middleware-ssec.integ.spec.ts b/packages/middleware-ssec/src/middleware-ssec.integ.spec.ts
@@ -1,9 +1,8 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { S3 } from "@aws-sdk/client-s3";
 import * as crypto from "crypto";
 import { describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 // "server-side-encryption"
 describe("middleware-ssec", () => {
   describe(S3.name, () => {
diff --git a/packages/middleware-token/src/middleware-token.integ.spec.ts b/packages/middleware-token/src/middleware-token.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { CodeCatalyst } from "@aws-sdk/client-codecatalyst";
 import { describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-token", () => {
   describe(CodeCatalyst.name, () => {
     it("sets bearer token authorization header", async () => {
diff --git a/packages/middleware-user-agent/src/middleware-user-agent.integ.spec.ts b/packages/middleware-user-agent/src/middleware-user-agent.integ.spec.ts
@@ -1,11 +1,10 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { CodeCatalyst } from "@aws-sdk/client-codecatalyst";
 import { DynamoDB } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb";
 import { AwsSdkFeatures } from "@aws-sdk/types";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-user-agent", () => {
   describe(CodeCatalyst.name, () => {
     it("sets the SDK user agent", async () => {
diff --git a/packages/middleware-websocket/src/middleware-websocket.integ.spec.ts b/packages/middleware-websocket/src/middleware-websocket.integ.spec.ts
@@ -1,8 +1,7 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { RekognitionStreaming } from "@aws-sdk/client-rekognitionstreaming";
 import { describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 describe("middleware-websocket", () => {
   const logger = {
     trace() {},
diff --git a/packages/util-endpoints/src/env-endpoint.integ.spec.ts b/packages/util-endpoints/src/env-endpoint.integ.spec.ts
@@ -1,9 +1,8 @@
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 import { DynamoDB } from "@aws-sdk/client-dynamodb";
 import { S3 } from "@aws-sdk/client-s3";
 import { afterAll, beforeEach, describe, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
-
 /**
  * This is an AWS-specific integration test for a piece of functionality that is contained
  * within `@smithy/middleware-endpoint` (another repository).
diff --git a/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts b/private/aws-middleware-test/src/middleware-apply-body-checksum.spec.ts
@@ -1,7 +1,7 @@
 import { S3Control } from "@aws-sdk/client-s3-control";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("middleware-apply-body-checksum", () => {
   describe(S3Control.name, () => {
diff --git a/private/aws-middleware-test/src/middleware-content-length.spec.ts b/private/aws-middleware-test/src/middleware-content-length.spec.ts
@@ -3,7 +3,7 @@ import { S3 } from "@aws-sdk/client-s3";
 import { XRay } from "@aws-sdk/client-xray";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../../private/aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("middleware-content-length", () => {
   describe(AccessAnalyzer.name, () => {
diff --git a/private/aws-middleware-test/src/middleware-endpoint.spec.ts b/private/aws-middleware-test/src/middleware-endpoint.spec.ts
@@ -2,7 +2,7 @@ import { S3 } from "@aws-sdk/client-s3";
 import { S3Control } from "@aws-sdk/client-s3-control";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("middleware-endpoint", () => {
   // these are token examples because most endpoint
diff --git a/private/aws-middleware-test/src/middleware-retry.spec.ts b/private/aws-middleware-test/src/middleware-retry.spec.ts
@@ -1,7 +1,7 @@
 import { Lambda } from "@aws-sdk/client-lambda";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("middleware-retry", () => {
   describe(Lambda.name, () => {
diff --git a/private/aws-middleware-test/src/util-stream.spec.ts b/private/aws-middleware-test/src/util-stream.spec.ts
@@ -6,7 +6,7 @@ import { fromUtf8 } from "@smithy/util-utf8";
 import { Readable } from "stream";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../../aws-util-test/src";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe("util-stream", () => {
   describe(Lambda.name, () => {
diff --git a/private/aws-util-test/src/clients/Weather.integ.spec.ts b/private/aws-util-test/src/clients/Weather.integ.spec.ts
@@ -1,7 +1,7 @@
 import { Weather } from "@aws-sdk/weather";
 import { describe, expect, test as it } from "vitest";
 
-import { requireRequestsFrom } from "../requests/test-http-handler";
+import { requireRequestsFrom } from "@aws-sdk/aws-util-test/src";
 
 describe(Weather.name, () => {
   it("should be able to make a request without errors", async () => {
