Skip to content

Commit 880a917

Browse files
author
awstools
committed
feat(client-ec2): API changes to AWS Verified Access to include data from trust providers in logs
1 parent 947c8ba commit 880a917

File tree

7 files changed

+103229
-101162
lines changed

7 files changed

+103229
-101162
lines changed

clients/client-ec2/src/commands/DescribeAccountAttributesCommand.ts

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,7 @@ export interface DescribeAccountAttributesCommandOutput extends DescribeAccountA
4040
* <ul>
4141
* <li>
4242
* <p>
43-
* <code>supported-platforms</code>: Indicates whether your account can launch instances
44-
* into EC2-Classic and EC2-VPC, or only into EC2-VPC.</p>
45-
* </li>
46-
* <li>
47-
* <p>
48-
* <code>default-vpc</code>: The ID of the default VPC for your account, or
49-
* <code>none</code>.</p>
43+
* <code>default-vpc</code>: The ID of the default VPC for your account, or <code>none</code>.</p>
5044
* </li>
5145
* <li>
5246
* <p>
@@ -57,23 +51,22 @@ export interface DescribeAccountAttributesCommandOutput extends DescribeAccountA
5751
* </li>
5852
* <li>
5953
* <p>
60-
* <code>vpc-max-security-groups-per-interface</code>: The maximum number of security groups
61-
* that you can assign to a network interface.</p>
54+
* <code>max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate.</p>
6255
* </li>
6356
* <li>
6457
* <p>
65-
* <code>max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can
66-
* allocate for use with EC2-Classic. </p>
58+
* <code>supported-platforms</code>: This attribute is deprecated.</p>
6759
* </li>
6860
* <li>
6961
* <p>
70-
* <code>vpc-max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can
71-
* allocate for use with EC2-VPC.</p>
62+
* <code>vpc-max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate.</p>
63+
* </li>
64+
* <li>
65+
* <p>
66+
* <code>vpc-max-security-groups-per-interface</code>: The maximum number of security groups
67+
* that you can assign to a network interface.</p>
7268
* </li>
7369
* </ul>
74-
* <note>
75-
* <p>We are retiring EC2-Classic on August 15, 2022. We recommend that you migrate from EC2-Classic to a VPC. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-migrate.html">Migrate from EC2-Classic to a VPC</a> in the <i>Amazon EC2 User Guide</i>.</p>
76-
* </note>
7770
* @example
7871
* Use a bare-bones client and the command you need to make an API call.
7972
* ```javascript

clients/client-ec2/src/commands/DescribeVerifiedAccessInstanceLoggingConfigurationsCommand.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ export interface DescribeVerifiedAccessInstanceLoggingConfigurationsCommandOutpu
9999
* // },
100100
* // DeliveryStream: "STRING_VALUE",
101101
* // },
102+
* // LogVersion: "STRING_VALUE",
103+
* // IncludeTrustContext: true || false,
102104
* // },
103105
* // },
104106
* // ],

clients/client-ec2/src/commands/ModifyVerifiedAccessInstanceLoggingConfigurationCommand.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ export interface ModifyVerifiedAccessInstanceLoggingConfigurationCommandOutput
6969
* Enabled: true || false, // required
7070
* DeliveryStream: "STRING_VALUE",
7171
* },
72+
* LogVersion: "STRING_VALUE",
73+
* IncludeTrustContext: true || false,
7274
* },
7375
* DryRun: true || false,
7476
* ClientToken: "STRING_VALUE",
@@ -105,6 +107,8 @@ export interface ModifyVerifiedAccessInstanceLoggingConfigurationCommandOutput
105107
* // },
106108
* // DeliveryStream: "STRING_VALUE",
107109
* // },
110+
* // LogVersion: "STRING_VALUE",
111+
* // IncludeTrustContext: true || false,
108112
* // },
109113
* // },
110114
* // };

clients/client-ec2/src/models/models_4.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11125,7 +11125,7 @@ export interface VerifiedAccessLogS3Destination {
1112511125

1112611126
/**
1112711127
* @public
11128-
* <p>Describes the destinations for Verified Access logs.</p>
11128+
* <p>Describes the options for Verified Access logs.</p>
1112911129
*/
1113011130
export interface VerifiedAccessLogs {
1113111131
/**
@@ -11142,6 +11142,20 @@ export interface VerifiedAccessLogs {
1114211142
* <p>Kinesis logging destination.</p>
1114311143
*/
1114411144
KinesisDataFirehose?: VerifiedAccessLogKinesisDataFirehoseDestination;
11145+
11146+
/**
11147+
* <p>
11148+
* Describes current setting for the logging version.
11149+
* </p>
11150+
*/
11151+
LogVersion?: string;
11152+
11153+
/**
11154+
* <p>
11155+
* Describes current setting for including trust data into the logs.
11156+
* </p>
11157+
*/
11158+
IncludeTrustContext?: boolean;
1114511159
}
1114611160

1114711161
/**

clients/client-ec2/src/models/models_6.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3998,7 +3998,7 @@ export interface VerifiedAccessLogS3DestinationOptions {
39983998

39993999
/**
40004000
* @public
4001-
* <p>Describes the destinations for Verified Access logs.</p>
4001+
* <p>Options for Verified Access logs.</p>
40024002
*/
40034003
export interface VerifiedAccessLogOptions {
40044004
/**
@@ -4015,6 +4015,22 @@ export interface VerifiedAccessLogOptions {
40154015
* <p>Sends Verified Access logs to Kinesis.</p>
40164016
*/
40174017
KinesisDataFirehose?: VerifiedAccessLogKinesisDataFirehoseDestinationOptions;
4018+
4019+
/**
4020+
* <p>
4021+
* The logging version to use.
4022+
* </p>
4023+
* <p>Valid values: <code>ocsf-0.1</code> | <code>ocsf-1.0.0-rc.2</code>
4024+
* </p>
4025+
*/
4026+
LogVersion?: string;
4027+
4028+
/**
4029+
* <p>
4030+
* Include trust data sent by trust providers into the logs.
4031+
* </p>
4032+
*/
4033+
IncludeTrustContext?: boolean;
40184034
}
40194035

40204036
/**

clients/client-ec2/src/protocols/Aws_ec2.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64853,6 +64853,12 @@ const se_VerifiedAccessLogOptions = (input: VerifiedAccessLogOptions, context: _
6485364853
entries[loc] = value;
6485464854
});
6485564855
}
64856+
if (input.LogVersion != null) {
64857+
entries["LogVersion"] = input.LogVersion;
64858+
}
64859+
if (input.IncludeTrustContext != null) {
64860+
entries["IncludeTrustContext"] = input.IncludeTrustContext;
64861+
}
6485664862
return entries;
6485764863
};
6485864864

@@ -92229,6 +92235,12 @@ const de_VerifiedAccessLogs = (output: any, context: __SerdeContext): VerifiedAc
9222992235
context
9223092236
);
9223192237
}
92238+
if (output["logVersion"] !== undefined) {
92239+
contents.LogVersion = __expectString(output["logVersion"]);
92240+
}
92241+
if (output["includeTrustContext"] !== undefined) {
92242+
contents.IncludeTrustContext = __parseBoolean(output["includeTrustContext"]);
92243+
}
9223292244
return contents;
9223392245
};
9223492246

@@ -93523,7 +93535,7 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
9352393535
ignoreDeclaration: true,
9352493536
parseTagValue: false,
9352593537
trimValues: false,
93526-
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
93538+
tagValueProcessor: (_: any, val: any) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
9352793539
});
9352893540
parser.addEntity("#xD", "\r");
9352993541
parser.addEntity("#10", "\n");

0 commit comments

Comments
 (0)