Skip to content

Commit a52dd8e

Browse files
aws-sdk-kotlin-ciaws-sdk-kotlin-ci
committed
feat: update AWS API models
1 parent b8a1a1c commit a52dd8e

File tree

8 files changed

+1078
-122
lines changed

8 files changed

+1078
-122
lines changed

‎codegen/sdk/aws-models/cognito-identity-provider.json‎

Lines changed: 146 additions & 40 deletions
Large diffs are not rendered by default.

‎codegen/sdk/aws-models/elastic-load-balancing-v2.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,6 +2599,9 @@
25992599
"outputToken": "NextMarker",
26002600
"items": "LoadBalancers"
26012601
},
2602+
"smithy.api#suppress": [
2603+
"WaitableTraitInvalidErrorType"
2604+
],
26022605
"smithy.waiters#waitable": {
26032606
"LoadBalancerAvailable": {
26042607
"acceptors": [
@@ -2625,7 +2628,7 @@
26252628
{
26262629
"state": "retry",
26272630
"matcher": {
2628-
"errorType": "LoadBalancerNotFoundException"
2631+
"errorType": "LoadBalancerNotFound"
26292632
}
26302633
}
26312634
],
@@ -2642,7 +2645,7 @@
26422645
{
26432646
"state": "retry",
26442647
"matcher": {
2645-
"errorType": "LoadBalancerNotFoundException"
2648+
"errorType": "LoadBalancerNotFound"
26462649
}
26472650
}
26482651
],
@@ -2663,7 +2666,7 @@
26632666
{
26642667
"state": "success",
26652668
"matcher": {
2666-
"errorType": "LoadBalancerNotFoundException"
2669+
"errorType": "LoadBalancerNotFound"
26672670
}
26682671
}
26692672
],

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

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,6 +1950,21 @@
19501950
],
19511951
"traits": {
19521952
"smithy.api#documentation": "<p>Provides cluster-level details including status, hardware and software configuration,\n VPC settings, and so on.</p>",
1953+
"smithy.test#smokeTests": [
1954+
{
1955+
"id": "DescribeClusterFailure",
1956+
"params": {
1957+
"ClusterId": "fake_cluster"
1958+
},
1959+
"vendorParams": {
1960+
"region": "us-west-2"
1961+
},
1962+
"vendorParamsShape": "aws.test#AwsVendorParams",
1963+
"expect": {
1964+
"failure": {}
1965+
}
1966+
}
1967+
],
19531968
"smithy.waiters#waitable": {
19541969
"ClusterRunning": {
19551970
"acceptors": [
@@ -4654,6 +4669,12 @@
46544669
"traits": {
46554670
"smithy.api#documentation": "<p>The resize specification for the instance fleet.</p>"
46564671
}
4672+
},
4673+
"InstanceTypeConfigs": {
4674+
"target": "com.amazonaws.emr#InstanceTypeConfigList",
4675+
"traits": {
4676+
"smithy.api#documentation": "<p>An array of InstanceTypeConfig objects that specify how Amazon EMR provisions Amazon EC2 instances\n when it fulfills On-Demand and Spot capacities. For more information, see <a href=\"https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceTypeConfig.html\">InstanceTypeConfig</a>.</p>"
4677+
}
46574678
}
46584679
},
46594680
"traits": {
@@ -4666,18 +4687,18 @@
46664687
"SpotSpecification": {
46674688
"target": "com.amazonaws.emr#SpotProvisioningSpecification",
46684689
"traits": {
4669-
"smithy.api#documentation": "<p>The launch specification for Spot instances in the fleet, which determines the defined\n duration, provisioning timeout behavior, and allocation strategy.</p>"
4690+
"smithy.api#documentation": "<p>The launch specification for Spot instances in the fleet, which determines the allocation strategy, defined\n duration, and provisioning timeout behavior.</p>"
46704691
}
46714692
},
46724693
"OnDemandSpecification": {
46734694
"target": "com.amazonaws.emr#OnDemandProvisioningSpecification",
46744695
"traits": {
4675-
"smithy.api#documentation": "<p> The launch specification for On-Demand Instances in the instance fleet, which\n determines the allocation strategy. </p>\n <note>\n <p>The instance fleet configuration is available only in Amazon EMR releases\n 4.8.0 and later, excluding 5.0.x versions. On-Demand Instances allocation strategy is\n available in Amazon EMR releases 5.12.1 and later.</p>\n </note>"
4696+
"smithy.api#documentation": "<p> The launch specification for On-Demand Instances in the instance fleet, which\n determines the allocation strategy and capacity reservation options.</p>\n <note>\n <p>The instance fleet configuration is available only in Amazon EMR releases\n 4.8.0 and later, excluding 5.0.x versions. On-Demand Instances allocation strategy is\n available in Amazon EMR releases 5.12.1 and later.</p>\n </note>"
46764697
}
46774698
}
46784699
},
46794700
"traits": {
4680-
"smithy.api#documentation": "<p>The launch specification for Spot Instances in the fleet, which determines the defined\n duration, provisioning timeout behavior, and allocation strategy.</p>\n <note>\n <p>The instance fleet configuration is available only in Amazon EMR releases\n 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot instance allocation\n strategies are available in Amazon EMR releases 5.12.1 and later.</p>\n </note>"
4701+
"smithy.api#documentation": "<p>The launch specification for On-Demand and Spot Instances in the fleet.</p>\n <note>\n <p>The instance fleet configuration is available only in Amazon EMR releases\n 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot instance allocation\n strategies are available in Amazon EMR releases 5.12.1 and later.</p>\n </note>"
46814702
}
46824703
},
46834704
"com.amazonaws.emr#InstanceFleetResizingSpecifications": {
@@ -4686,13 +4707,13 @@
46864707
"SpotResizeSpecification": {
46874708
"target": "com.amazonaws.emr#SpotResizingSpecification",
46884709
"traits": {
4689-
"smithy.api#documentation": "<p>The resize specification for Spot Instances in the instance fleet, which contains the\n resize timeout period. </p>"
4710+
"smithy.api#documentation": "<p>The resize specification for Spot Instances in the instance fleet, which contains the\n allocation strategy and the resize timeout period. </p>"
46904711
}
46914712
},
46924713
"OnDemandResizeSpecification": {
46934714
"target": "com.amazonaws.emr#OnDemandResizingSpecification",
46944715
"traits": {
4695-
"smithy.api#documentation": "<p>The resize specification for On-Demand Instances in the instance fleet, which contains\n the resize timeout period. </p>"
4716+
"smithy.api#documentation": "<p>The resize specification for On-Demand Instances in the instance fleet, which contains\n the allocation strategy, capacity reservation options, and the resize timeout period. </p>"
46964717
}
46974718
}
46984719
},
@@ -6448,7 +6469,20 @@
64486469
"inputToken": "Marker",
64496470
"outputToken": "Marker",
64506471
"items": "Clusters"
6451-
}
6472+
},
6473+
"smithy.test#smokeTests": [
6474+
{
6475+
"id": "ListClustersSuccess",
6476+
"params": {},
6477+
"vendorParams": {
6478+
"region": "us-west-2"
6479+
},
6480+
"vendorParamsShape": "aws.test#AwsVendorParams",
6481+
"expect": {
6482+
"success": {}
6483+
}
6484+
}
6485+
]
64526486
}
64536487
},
64546488
"com.amazonaws.emr#ListClustersInput": {
@@ -7856,10 +7890,17 @@
78567890
"TimeoutDurationMinutes": {
78577891
"target": "com.amazonaws.emr#WholeNumber",
78587892
"traits": {
7859-
"smithy.api#clientOptional": {},
7860-
"smithy.api#documentation": "<p>On-Demand resize timeout in minutes. If On-Demand Instances are not provisioned within\n this time, the resize workflow stops. The minimum value is 5 minutes, and the maximum value\n is 10,080 minutes (7 days). The timeout applies to all resize workflows on the Instance\n Fleet. The resize could be triggered by Amazon EMR Managed Scaling or by the\n customer (via Amazon EMR Console, Amazon EMR CLI modify-instance-fleet or\n Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>",
7861-
"smithy.api#required": {}
7893+
"smithy.api#documentation": "<p>On-Demand resize timeout in minutes. If On-Demand Instances are not provisioned within\n this time, the resize workflow stops. The minimum value is 5 minutes, and the maximum value\n is 10,080 minutes (7 days). The timeout applies to all resize workflows on the Instance\n Fleet. The resize could be triggered by Amazon EMR Managed Scaling or by the\n customer (via Amazon EMR Console, Amazon EMR CLI modify-instance-fleet or\n Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>"
7894+
}
7895+
},
7896+
"AllocationStrategy": {
7897+
"target": "com.amazonaws.emr#OnDemandProvisioningAllocationStrategy",
7898+
"traits": {
7899+
"smithy.api#documentation": "<p>Specifies the allocation strategy to use to launch On-Demand instances during a resize. The default is <code>lowest-price</code>.</p>"
78627900
}
7901+
},
7902+
"CapacityReservationOptions": {
7903+
"target": "com.amazonaws.emr#OnDemandCapacityReservationOptions"
78637904
}
78647905
},
78657906
"traits": {
@@ -9311,9 +9352,13 @@
93119352
"TimeoutDurationMinutes": {
93129353
"target": "com.amazonaws.emr#WholeNumber",
93139354
"traits": {
9314-
"smithy.api#clientOptional": {},
9315-
"smithy.api#documentation": "<p>Spot resize timeout in minutes. If Spot Instances are not provisioned within this time,\n the resize workflow will stop provisioning of Spot instances. Minimum value is 5 minutes\n and maximum value is 10,080 minutes (7 days). The timeout applies to all resize workflows\n on the Instance Fleet. The resize could be triggered by Amazon EMR Managed Scaling\n or by the customer (via Amazon EMR Console, Amazon EMR CLI\n modify-instance-fleet or Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>",
9316-
"smithy.api#required": {}
9355+
"smithy.api#documentation": "<p>Spot resize timeout in minutes. If Spot Instances are not provisioned within this time,\n the resize workflow will stop provisioning of Spot instances. Minimum value is 5 minutes\n and maximum value is 10,080 minutes (7 days). The timeout applies to all resize workflows\n on the Instance Fleet. The resize could be triggered by Amazon EMR Managed Scaling\n or by the customer (via Amazon EMR Console, Amazon EMR CLI\n modify-instance-fleet or Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>"
9356+
}
9357+
},
9358+
"AllocationStrategy": {
9359+
"target": "com.amazonaws.emr#SpotProvisioningAllocationStrategy",
9360+
"traits": {
9361+
"smithy.api#documentation": "<p>Specifies the allocation strategy to use to launch Spot instances during a resize. If you run Amazon EMR releases 6.9.0 or higher,\n the default is <code>price-capacity-optimized</code>. If you run Amazon EMR releases 6.8.0 or lower, the default is\n <code>capacity-optimized</code>.</p>"
93179362
}
93189363
}
93199364
},

0 commit comments

Comments
 (0)