From 31c97854bf96506192d2d7a13a2d4b3b0d5e173a Mon Sep 17 00:00:00 2001 From: awstools Date: Wed, 23 Aug 2023 19:51:53 +0000 Subject: [PATCH] feat(client-ec2): Marking fields as sensitive on BundleTask and GetPasswordData --- .../src/commands/BundleInstanceCommand.ts | 11 +++-- .../src/commands/CancelBundleTaskCommand.ts | 8 +++- .../commands/DescribeBundleTasksCommand.ts | 8 +++- .../src/commands/GetPasswordDataCommand.ts | 8 +++- clients/client-ec2/src/models/models_0.ts | 48 +++++++++++++++++++ clients/client-ec2/src/models/models_3.ts | 9 ++++ clients/client-ec2/src/models/models_5.ts | 8 ++++ codegen/sdk-codegen/aws-models/ec2.json | 16 ++++++- 8 files changed, 105 insertions(+), 11 deletions(-) diff --git a/clients/client-ec2/src/commands/BundleInstanceCommand.ts b/clients/client-ec2/src/commands/BundleInstanceCommand.ts index 68205eedeeac..a7e928ce7a9b 100644 --- a/clients/client-ec2/src/commands/BundleInstanceCommand.ts +++ b/clients/client-ec2/src/commands/BundleInstanceCommand.ts @@ -14,7 +14,12 @@ import { } from "@smithy/types"; import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client"; -import { BundleInstanceRequest, BundleInstanceResult } from "../models/models_0"; +import { + BundleInstanceRequest, + BundleInstanceRequestFilterSensitiveLog, + BundleInstanceResult, + BundleInstanceResultFilterSensitiveLog, +} from "../models/models_0"; import { de_BundleInstanceCommand, se_BundleInstanceCommand } from "../protocols/Aws_ec2"; /** @@ -146,8 +151,8 @@ export class BundleInstanceCommand extends $Command< logger, clientName, commandName, - inputFilterSensitiveLog: (_: any) => _, - outputFilterSensitiveLog: (_: any) => _, + inputFilterSensitiveLog: BundleInstanceRequestFilterSensitiveLog, + outputFilterSensitiveLog: BundleInstanceResultFilterSensitiveLog, }; const { requestHandler } = configuration; return stack.resolve( diff --git a/clients/client-ec2/src/commands/CancelBundleTaskCommand.ts b/clients/client-ec2/src/commands/CancelBundleTaskCommand.ts index 1134d04f4d29..67a7ffdfd38e 100644 --- a/clients/client-ec2/src/commands/CancelBundleTaskCommand.ts +++ b/clients/client-ec2/src/commands/CancelBundleTaskCommand.ts @@ -14,7 +14,11 @@ import { } from "@smithy/types"; import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client"; -import { CancelBundleTaskRequest, CancelBundleTaskResult } from "../models/models_0"; +import { + CancelBundleTaskRequest, + CancelBundleTaskResult, + CancelBundleTaskResultFilterSensitiveLog, +} from "../models/models_0"; import { de_CancelBundleTaskCommand, se_CancelBundleTaskCommand } from "../protocols/Aws_ec2"; /** @@ -134,7 +138,7 @@ export class CancelBundleTaskCommand extends $Command< clientName, commandName, inputFilterSensitiveLog: (_: any) => _, - outputFilterSensitiveLog: (_: any) => _, + outputFilterSensitiveLog: CancelBundleTaskResultFilterSensitiveLog, }; const { requestHandler } = configuration; return stack.resolve( diff --git a/clients/client-ec2/src/commands/DescribeBundleTasksCommand.ts b/clients/client-ec2/src/commands/DescribeBundleTasksCommand.ts index 6e598c31040e..f389dc96521e 100644 --- a/clients/client-ec2/src/commands/DescribeBundleTasksCommand.ts +++ b/clients/client-ec2/src/commands/DescribeBundleTasksCommand.ts @@ -14,7 +14,11 @@ import { } from "@smithy/types"; import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client"; -import { DescribeBundleTasksRequest, DescribeBundleTasksResult } from "../models/models_3"; +import { + DescribeBundleTasksRequest, + DescribeBundleTasksResult, + DescribeBundleTasksResultFilterSensitiveLog, +} from "../models/models_3"; import { de_DescribeBundleTasksCommand, se_DescribeBundleTasksCommand } from "../protocols/Aws_ec2"; /** @@ -149,7 +153,7 @@ export class DescribeBundleTasksCommand extends $Command< clientName, commandName, inputFilterSensitiveLog: (_: any) => _, - outputFilterSensitiveLog: (_: any) => _, + outputFilterSensitiveLog: DescribeBundleTasksResultFilterSensitiveLog, }; const { requestHandler } = configuration; return stack.resolve( diff --git a/clients/client-ec2/src/commands/GetPasswordDataCommand.ts b/clients/client-ec2/src/commands/GetPasswordDataCommand.ts index 9aca2e95b0fb..d4172ff0b405 100644 --- a/clients/client-ec2/src/commands/GetPasswordDataCommand.ts +++ b/clients/client-ec2/src/commands/GetPasswordDataCommand.ts @@ -14,7 +14,11 @@ import { } from "@smithy/types"; import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client"; -import { GetPasswordDataRequest, GetPasswordDataResult } from "../models/models_5"; +import { + GetPasswordDataRequest, + GetPasswordDataResult, + GetPasswordDataResultFilterSensitiveLog, +} from "../models/models_5"; import { de_GetPasswordDataCommand, se_GetPasswordDataCommand } from "../protocols/Aws_ec2"; /** @@ -128,7 +132,7 @@ export class GetPasswordDataCommand extends $Command< clientName, commandName, inputFilterSensitiveLog: (_: any) => _, - outputFilterSensitiveLog: (_: any) => _, + outputFilterSensitiveLog: GetPasswordDataResultFilterSensitiveLog, }; const { requestHandler } = configuration; return stack.resolve( diff --git a/clients/client-ec2/src/models/models_0.ts b/clients/client-ec2/src/models/models_0.ts index fb293bca0fac..2839e1202d5d 100644 --- a/clients/client-ec2/src/models/models_0.ts +++ b/clients/client-ec2/src/models/models_0.ts @@ -9542,6 +9542,54 @@ export const AttachVerifiedAccessTrustProviderResultFilterSensitiveLog = ( }), }); +/** + * @internal + */ +export const S3StorageFilterSensitiveLog = (obj: S3Storage): any => ({ + ...obj, + ...(obj.UploadPolicySignature && { UploadPolicySignature: SENSITIVE_STRING }), +}); + +/** + * @internal + */ +export const StorageFilterSensitiveLog = (obj: Storage): any => ({ + ...obj, + ...(obj.S3 && { S3: S3StorageFilterSensitiveLog(obj.S3) }), +}); + +/** + * @internal + */ +export const BundleInstanceRequestFilterSensitiveLog = (obj: BundleInstanceRequest): any => ({ + ...obj, + ...(obj.Storage && { Storage: StorageFilterSensitiveLog(obj.Storage) }), +}); + +/** + * @internal + */ +export const BundleTaskFilterSensitiveLog = (obj: BundleTask): any => ({ + ...obj, + ...(obj.Storage && { Storage: StorageFilterSensitiveLog(obj.Storage) }), +}); + +/** + * @internal + */ +export const BundleInstanceResultFilterSensitiveLog = (obj: BundleInstanceResult): any => ({ + ...obj, + ...(obj.BundleTask && { BundleTask: BundleTaskFilterSensitiveLog(obj.BundleTask) }), +}); + +/** + * @internal + */ +export const CancelBundleTaskResultFilterSensitiveLog = (obj: CancelBundleTaskResult): any => ({ + ...obj, + ...(obj.BundleTask && { BundleTask: BundleTaskFilterSensitiveLog(obj.BundleTask) }), +}); + /** * @internal */ diff --git a/clients/client-ec2/src/models/models_3.ts b/clients/client-ec2/src/models/models_3.ts index 7285e09fce24..959a93f174e5 100644 --- a/clients/client-ec2/src/models/models_3.ts +++ b/clients/client-ec2/src/models/models_3.ts @@ -16,6 +16,7 @@ import { AttachmentStatus, AutoPlacement, BundleTask, + BundleTaskFilterSensitiveLog, ByoipCidr, CapacityReservation, CapacityReservationFleetState, @@ -10278,6 +10279,14 @@ export const DeleteVerifiedAccessTrustProviderResultFilterSensitiveLog = ( }), }); +/** + * @internal + */ +export const DescribeBundleTasksResultFilterSensitiveLog = (obj: DescribeBundleTasksResult): any => ({ + ...obj, + ...(obj.BundleTasks && { BundleTasks: obj.BundleTasks.map((item) => BundleTaskFilterSensitiveLog(item)) }), +}); + /** * @internal */ diff --git a/clients/client-ec2/src/models/models_5.ts b/clients/client-ec2/src/models/models_5.ts index db9da2f0ec22..95497920a8de 100644 --- a/clients/client-ec2/src/models/models_5.ts +++ b/clients/client-ec2/src/models/models_5.ts @@ -8616,6 +8616,14 @@ export const GetLaunchTemplateDataResultFilterSensitiveLog = (obj: GetLaunchTemp }), }); +/** + * @internal + */ +export const GetPasswordDataResultFilterSensitiveLog = (obj: GetPasswordDataResult): any => ({ + ...obj, + ...(obj.PasswordData && { PasswordData: SENSITIVE_STRING }), +}); + /** * @internal */ diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json index 4dd0193c77b1..3502617ce8c5 100644 --- a/codegen/sdk-codegen/aws-models/ec2.json +++ b/codegen/sdk-codegen/aws-models/ec2.json @@ -51641,7 +51641,7 @@ } }, "PasswordData": { - "target": "com.amazonaws.ec2#String", + "target": "com.amazonaws.ec2#PasswordData", "traits": { "aws.protocols#ec2QueryName": "PasswordData", "smithy.api#documentation": "

The password of the instance. Returns an empty string if the password is not\n available.

", @@ -79119,6 +79119,12 @@ } } }, + "com.amazonaws.ec2#PasswordData": { + "type": "string", + "traits": { + "smithy.api#sensitive": {} + } + }, "com.amazonaws.ec2#PathComponent": { "type": "structure", "members": { @@ -88883,7 +88889,7 @@ } }, "UploadPolicySignature": { - "target": "com.amazonaws.ec2#String", + "target": "com.amazonaws.ec2#S3StorageUploadPolicySignature", "traits": { "aws.protocols#ec2QueryName": "UploadPolicySignature", "smithy.api#documentation": "

The signature of the JSON document.

", @@ -88895,6 +88901,12 @@ "smithy.api#documentation": "

Describes the storage parameters for Amazon S3 and Amazon S3 buckets for an instance store-backed AMI.

" } }, + "com.amazonaws.ec2#S3StorageUploadPolicySignature": { + "type": "string", + "traits": { + "smithy.api#sensitive": {} + } + }, "com.amazonaws.ec2#SSEType": { "type": "enum", "members": {