Skip to content

Commit 69f38fa

Browse files
author
awstools
committed
feat(client-ec2): This release adds GroupOwnerId as a response member to the DescribeSecurityGroupVpcAssociations API and also adds waiters for SecurityGroupVpcAssociations (SecurityGroupVpcAssociationAssociated and SecurityGroupVpcAssociationDisassociated).
1 parent 33f9fd4 commit 69f38fa

File tree

8 files changed

+300
-5
lines changed

8 files changed

+300
-5
lines changed

‎clients/client-ec2/src/commands/AssociateSecurityGroupVpcCommand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface AssociateSecurityGroupVpcCommandOutput extends AssociateSecurit
3838
* <p>You can associate the security group with another VPC if your account owns the VPC or if the VPC was shared with you.</p>
3939
* </li>
4040
* <li>
41-
* <p>You must own the security group and the VPC that it was created in.</p>
41+
* <p>You must own the security group.</p>
4242
* </li>
4343
* <li>
4444
* <p>You cannot use this feature with default security groups.</p>

‎clients/client-ec2/src/commands/DescribeSecurityGroupVpcAssociationsCommand.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export interface DescribeSecurityGroupVpcAssociationsCommandOutput
6666
* // VpcOwnerId: "STRING_VALUE",
6767
* // State: "associating" || "associated" || "association-failed" || "disassociating" || "disassociated" || "disassociation-failed",
6868
* // StateReason: "STRING_VALUE",
69+
* // GroupOwnerId: "STRING_VALUE",
6970
* // },
7071
* // ],
7172
* // NextToken: "STRING_VALUE",

‎clients/client-ec2/src/models/models_5.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5589,6 +5589,10 @@ export interface DescribeSecurityGroupVpcAssociationsRequest {
55895589
* </li>
55905590
* <li>
55915591
* <p>
5592+
* <code>group-owner-id</code>: The group owner ID.</p>
5593+
* </li>
5594+
* <li>
5595+
* <p>
55925596
* <code>vpc-id</code>: The ID of the associated VPC.</p>
55935597
* </li>
55945598
* <li>
@@ -5673,6 +5677,12 @@ export interface SecurityGroupVpcAssociation {
56735677
* @public
56745678
*/
56755679
StateReason?: string | undefined;
5680+
5681+
/**
5682+
* <p>The Amazon Web Services account ID of the owner of the security group.</p>
5683+
* @public
5684+
*/
5685+
GroupOwnerId?: string | undefined;
56765686
}
56775687

56785688
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84715,6 +84715,9 @@ const de_SecurityGroupVpcAssociation = (output: any, context: __SerdeContext): S
8471584715
if (output[_sRt] != null) {
8471684716
contents[_SRt] = __expectString(output[_sRt]);
8471784717
}
84718+
if (output[_gOI] != null) {
84719+
contents[_GOI] = __expectString(output[_gOI]);
84720+
}
8471884721
return contents;
8471984722
};
8472084723

‎clients/client-ec2/src/waiters/index.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ export * from "./waitForNatGatewayDeleted";
2020
export * from "./waitForNetworkInterfaceAvailable";
2121
export * from "./waitForSnapshotImported";
2222
export * from "./waitForSecurityGroupExists";
23+
export * from "./waitForSecurityGroupVpcAssociationAssociated";
24+
export * from "./waitForSecurityGroupVpcAssociationDisassociated";
2325
export * from "./waitForSnapshotCompleted";
2426
export * from "./waitForSpotInstanceRequestFulfilled";
25-
export * from "./waitForStoreImageTaskComplete";
26-
export * from "./waitForSubnetAvailable";
2727
export * from "./waitForSystemStatusOk";
28+
export * from "./waitForStoreImageTaskComplete";
2829
export * from "./waitForPasswordDataAvailable";
30+
export * from "./waitForSubnetAvailable";
2931
export * from "./waitForVolumeAvailable";
3032
export * from "./waitForVolumeDeleted";
3133
export * from "./waitForVolumeInUse";

‎clients/client-ec2/src/waiters/waitForSecurityGroupVpcAssociationAssociated.ts‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// smithy-typescript generated code
2+
import { checkExceptions, createWaiter, WaiterConfiguration, WaiterResult, WaiterState } from "@smithy/util-waiter";
3+
4+
import {
5+
DescribeSecurityGroupVpcAssociationsCommand,
6+
DescribeSecurityGroupVpcAssociationsCommandInput,
7+
} from "../commands/DescribeSecurityGroupVpcAssociationsCommand";
8+
import { EC2Client } from "../EC2Client";
9+
10+
const checkState = async (
11+
client: EC2Client,
12+
input: DescribeSecurityGroupVpcAssociationsCommandInput
13+
): Promise<WaiterResult> => {
14+
let reason;
15+
try {
16+
const result: any = await client.send(new DescribeSecurityGroupVpcAssociationsCommand(input));
17+
reason = result;
18+
try {
19+
const returnComparator = () => {
20+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
21+
const projection_3 = flat_1.map((element_2: any) => {
22+
return element_2.State;
23+
});
24+
return projection_3;
25+
};
26+
let allStringEq_5 = returnComparator().length > 0;
27+
for (const element_4 of returnComparator()) {
28+
allStringEq_5 = allStringEq_5 && element_4 == "associated";
29+
}
30+
if (allStringEq_5) {
31+
return { state: WaiterState.SUCCESS, reason };
32+
}
33+
} catch (e) {}
34+
try {
35+
const returnComparator = () => {
36+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
37+
const projection_3 = flat_1.map((element_2: any) => {
38+
return element_2.State;
39+
});
40+
return projection_3;
41+
};
42+
for (const anyStringEq_4 of returnComparator()) {
43+
if (anyStringEq_4 == "associating") {
44+
return { state: WaiterState.RETRY, reason };
45+
}
46+
}
47+
} catch (e) {}
48+
try {
49+
const returnComparator = () => {
50+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
51+
const projection_3 = flat_1.map((element_2: any) => {
52+
return element_2.State;
53+
});
54+
return projection_3;
55+
};
56+
for (const anyStringEq_4 of returnComparator()) {
57+
if (anyStringEq_4 == "association-failed") {
58+
return { state: WaiterState.FAILURE, reason };
59+
}
60+
}
61+
} catch (e) {}
62+
} catch (exception) {
63+
reason = exception;
64+
}
65+
return { state: WaiterState.RETRY, reason };
66+
};
67+
/**
68+
*
69+
* @deprecated Use waitUntilSecurityGroupVpcAssociationAssociated instead. waitForSecurityGroupVpcAssociationAssociated does not throw error in non-success cases.
70+
*/
71+
export const waitForSecurityGroupVpcAssociationAssociated = async (
72+
params: WaiterConfiguration<EC2Client>,
73+
input: DescribeSecurityGroupVpcAssociationsCommandInput
74+
): Promise<WaiterResult> => {
75+
const serviceDefaults = { minDelay: 10, maxDelay: 120 };
76+
return createWaiter({ ...serviceDefaults, ...params }, input, checkState);
77+
};
78+
/**
79+
*
80+
* @param params - Waiter configuration options.
81+
* @param input - The input to DescribeSecurityGroupVpcAssociationsCommand for polling.
82+
*/
83+
export const waitUntilSecurityGroupVpcAssociationAssociated = async (
84+
params: WaiterConfiguration<EC2Client>,
85+
input: DescribeSecurityGroupVpcAssociationsCommandInput
86+
): Promise<WaiterResult> => {
87+
const serviceDefaults = { minDelay: 10, maxDelay: 120 };
88+
const result = await createWaiter({ ...serviceDefaults, ...params }, input, checkState);
89+
return checkExceptions(result);
90+
};

‎clients/client-ec2/src/waiters/waitForSecurityGroupVpcAssociationDisassociated.ts‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// smithy-typescript generated code
2+
import { checkExceptions, createWaiter, WaiterConfiguration, WaiterResult, WaiterState } from "@smithy/util-waiter";
3+
4+
import {
5+
DescribeSecurityGroupVpcAssociationsCommand,
6+
DescribeSecurityGroupVpcAssociationsCommandInput,
7+
} from "../commands/DescribeSecurityGroupVpcAssociationsCommand";
8+
import { EC2Client } from "../EC2Client";
9+
10+
const checkState = async (
11+
client: EC2Client,
12+
input: DescribeSecurityGroupVpcAssociationsCommandInput
13+
): Promise<WaiterResult> => {
14+
let reason;
15+
try {
16+
const result: any = await client.send(new DescribeSecurityGroupVpcAssociationsCommand(input));
17+
reason = result;
18+
try {
19+
const returnComparator = () => {
20+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
21+
const projection_3 = flat_1.map((element_2: any) => {
22+
return element_2.State;
23+
});
24+
return projection_3;
25+
};
26+
let allStringEq_5 = returnComparator().length > 0;
27+
for (const element_4 of returnComparator()) {
28+
allStringEq_5 = allStringEq_5 && element_4 == "disassociated";
29+
}
30+
if (allStringEq_5) {
31+
return { state: WaiterState.SUCCESS, reason };
32+
}
33+
} catch (e) {}
34+
try {
35+
const returnComparator = () => {
36+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
37+
const projection_3 = flat_1.map((element_2: any) => {
38+
return element_2.State;
39+
});
40+
return projection_3;
41+
};
42+
for (const anyStringEq_4 of returnComparator()) {
43+
if (anyStringEq_4 == "disassociating") {
44+
return { state: WaiterState.RETRY, reason };
45+
}
46+
}
47+
} catch (e) {}
48+
try {
49+
const returnComparator = () => {
50+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
51+
const projection_3 = flat_1.map((element_2: any) => {
52+
return element_2.State;
53+
});
54+
return projection_3;
55+
};
56+
for (const anyStringEq_4 of returnComparator()) {
57+
if (anyStringEq_4 == "disassociation-failed") {
58+
return { state: WaiterState.FAILURE, reason };
59+
}
60+
}
61+
} catch (e) {}
62+
try {
63+
const returnComparator = () => {
64+
const flat_1: any[] = [].concat(...result.SecurityGroupVpcAssociations);
65+
return flat_1.length == 0.0;
66+
};
67+
if (returnComparator() == true) {
68+
return { state: WaiterState.SUCCESS, reason };
69+
}
70+
} catch (e) {}
71+
} catch (exception) {
72+
reason = exception;
73+
}
74+
return { state: WaiterState.RETRY, reason };
75+
};
76+
/**
77+
*
78+
* @deprecated Use waitUntilSecurityGroupVpcAssociationDisassociated instead. waitForSecurityGroupVpcAssociationDisassociated does not throw error in non-success cases.
79+
*/
80+
export const waitForSecurityGroupVpcAssociationDisassociated = async (
81+
params: WaiterConfiguration<EC2Client>,
82+
input: DescribeSecurityGroupVpcAssociationsCommandInput
83+
): Promise<WaiterResult> => {
84+
const serviceDefaults = { minDelay: 10, maxDelay: 120 };
85+
return createWaiter({ ...serviceDefaults, ...params }, input, checkState);
86+
};
87+
/**
88+
*
89+
* @param params - Waiter configuration options.
90+
* @param input - The input to DescribeSecurityGroupVpcAssociationsCommand for polling.
91+
*/
92+
export const waitUntilSecurityGroupVpcAssociationDisassociated = async (
93+
params: WaiterConfiguration<EC2Client>,
94+
input: DescribeSecurityGroupVpcAssociationsCommandInput
95+
): Promise<WaiterResult> => {
96+
const serviceDefaults = { minDelay: 10, maxDelay: 120 };
97+
const result = await createWaiter({ ...serviceDefaults, ...params }, input, checkState);
98+
return checkExceptions(result);
99+
};

‎codegen/sdk-codegen/aws-models/ec2.json‎

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7489,7 +7489,7 @@
74897489
"target": "com.amazonaws.ec2#AssociateSecurityGroupVpcResult"
74907490
},
74917491
"traits": {
7492-
"smithy.api#documentation": "<p>Associates a security group with another VPC in the same Region. This enables you to use the same security group with network interfaces and instances in the specified VPC.</p>\n <note>\n <ul>\n <li>\n <p>The VPC you want to associate the security group with must be in the same Region.</p>\n </li>\n <li>\n <p>You can associate the security group with another VPC if your account owns the VPC or if the VPC was shared with you.</p>\n </li>\n <li>\n <p>You must own the security group and the VPC that it was created in.</p>\n </li>\n <li>\n <p>You cannot use this feature with default security groups.</p>\n </li>\n <li>\n <p>You cannot use this feature with the default VPC.</p>\n </li>\n </ul>\n </note>"
7492+
"smithy.api#documentation": "<p>Associates a security group with another VPC in the same Region. This enables you to use the same security group with network interfaces and instances in the specified VPC.</p>\n <note>\n <ul>\n <li>\n <p>The VPC you want to associate the security group with must be in the same Region.</p>\n </li>\n <li>\n <p>You can associate the security group with another VPC if your account owns the VPC or if the VPC was shared with you.</p>\n </li>\n <li>\n <p>You must own the security group.</p>\n </li>\n <li>\n <p>You cannot use this feature with default security groups.</p>\n </li>\n <li>\n <p>You cannot use this feature with the default VPC.</p>\n </li>\n </ul>\n </note>"
74937493
}
74947494
},
74957495
"com.amazonaws.ec2#AssociateSecurityGroupVpcRequest": {
@@ -40990,6 +40990,88 @@
4099040990
"outputToken": "NextToken",
4099140991
"items": "SecurityGroupVpcAssociations",
4099240992
"pageSize": "MaxResults"
40993+
},
40994+
"smithy.waiters#waitable": {
40995+
"SecurityGroupVpcAssociationAssociated": {
40996+
"acceptors": [
40997+
{
40998+
"state": "success",
40999+
"matcher": {
41000+
"output": {
41001+
"path": "SecurityGroupVpcAssociations[].State",
41002+
"expected": "associated",
41003+
"comparator": "allStringEquals"
41004+
}
41005+
}
41006+
},
41007+
{
41008+
"state": "retry",
41009+
"matcher": {
41010+
"output": {
41011+
"path": "SecurityGroupVpcAssociations[].State",
41012+
"expected": "associating",
41013+
"comparator": "anyStringEquals"
41014+
}
41015+
}
41016+
},
41017+
{
41018+
"state": "failure",
41019+
"matcher": {
41020+
"output": {
41021+
"path": "SecurityGroupVpcAssociations[].State",
41022+
"expected": "association-failed",
41023+
"comparator": "anyStringEquals"
41024+
}
41025+
}
41026+
}
41027+
],
41028+
"minDelay": 10
41029+
},
41030+
"SecurityGroupVpcAssociationDisassociated": {
41031+
"acceptors": [
41032+
{
41033+
"state": "success",
41034+
"matcher": {
41035+
"output": {
41036+
"path": "SecurityGroupVpcAssociations[].State",
41037+
"expected": "disassociated",
41038+
"comparator": "allStringEquals"
41039+
}
41040+
}
41041+
},
41042+
{
41043+
"state": "retry",
41044+
"matcher": {
41045+
"output": {
41046+
"path": "SecurityGroupVpcAssociations[].State",
41047+
"expected": "disassociating",
41048+
"comparator": "anyStringEquals"
41049+
}
41050+
}
41051+
},
41052+
{
41053+
"state": "failure",
41054+
"matcher": {
41055+
"output": {
41056+
"path": "SecurityGroupVpcAssociations[].State",
41057+
"expected": "disassociation-failed",
41058+
"comparator": "anyStringEquals"
41059+
}
41060+
}
41061+
},
41062+
{
41063+
"state": "success",
41064+
"matcher": {
41065+
"output": {
41066+
"path": "length(SecurityGroupVpcAssociations[]) == `0`",
41067+
"expected": "true",
41068+
"comparator": "booleanEquals"
41069+
}
41070+
}
41071+
}
41072+
],
41073+
"minDelay": 10
41074+
}
4099341075
}
4099441076
}
4099541077
},
@@ -41008,7 +41090,7 @@
4100841090
"Filters": {
4100941091
"target": "com.amazonaws.ec2#FilterList",
4101041092
"traits": {
41011-
"smithy.api#documentation": "<p>Security group VPC association filters.</p>\n <ul>\n <li>\n <p>\n <code>group-id</code>: The security group ID.</p>\n </li>\n <li>\n <p>\n <code>vpc-id</code>: The ID of the associated VPC.</p>\n </li>\n <li>\n <p>\n <code>vpc-owner-id</code>: The account ID of the VPC owner.</p>\n </li>\n <li>\n <p>\n <code>state</code>: The state of the association.</p>\n </li>\n <li>\n <p>\n <code>tag:<key></code>: The key/value combination of a tag assigned to the resource. Use\n the tag key in the filter name and the tag value as the filter value. For\n example, to find all resources that have a tag with the key <code>Owner</code>\n and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter\n name and <code>TeamA</code> for the filter value.</p>\n </li>\n <li>\n <p>\n <code>tag-key</code>: The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p>\n </li>\n </ul>",
41093+
"smithy.api#documentation": "<p>Security group VPC association filters.</p>\n <ul>\n <li>\n <p>\n <code>group-id</code>: The security group ID.</p>\n </li>\n <li>\n <p>\n <code>group-owner-id</code>: The group owner ID.</p>\n </li>\n <li>\n <p>\n <code>vpc-id</code>: The ID of the associated VPC.</p>\n </li>\n <li>\n <p>\n <code>vpc-owner-id</code>: The account ID of the VPC owner.</p>\n </li>\n <li>\n <p>\n <code>state</code>: The state of the association.</p>\n </li>\n <li>\n <p>\n <code>tag:<key></code>: The key/value combination of a tag assigned to the resource. Use\n the tag key in the filter name and the tag value as the filter value. For\n example, to find all resources that have a tag with the key <code>Owner</code>\n and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter\n name and <code>TeamA</code> for the filter value.</p>\n </li>\n <li>\n <p>\n <code>tag-key</code>: The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p>\n </li>\n </ul>",
4101241094
"smithy.api#xmlName": "Filter"
4101341095
}
4101441096
},
@@ -104813,6 +104895,14 @@
104813104895
"smithy.api#documentation": "<p>The association's state reason.</p>",
104814104896
"smithy.api#xmlName": "stateReason"
104815104897
}
104898+
},
104899+
"GroupOwnerId": {
104900+
"target": "com.amazonaws.ec2#String",
104901+
"traits": {
104902+
"aws.protocols#ec2QueryName": "GroupOwnerId",
104903+
"smithy.api#documentation": "<p>The Amazon Web Services account ID of the owner of the security group.</p>",
104904+
"smithy.api#xmlName": "groupOwnerId"
104905+
}
104816104906
}
104817104907
},
104818104908
"traits": {

0 commit comments

Comments
 (0)