Updated API models and rebuilt service gems.

aws · Apr 13, 2022 · efcd8f2 · efcd8f2
1 parent b85d044
commit efcd8f2
Show file tree

Hide file tree

Showing 17 changed files with 480 additions and 100 deletions.
diff --git a/apis/fsx/2018-03-01/api-2.json b/apis/fsx/2018-03-01/api-2.json
@@ -2392,7 +2392,10 @@
     },
     "OntapDeploymentType":{
       "type":"string",
-      "enum":["MULTI_AZ_1"]
+      "enum":[
+        "MULTI_AZ_1",
+        "SINGLE_AZ_1"
+      ]
     },
     "OntapEndpointIpAddresses":{
       "type":"list",

diff --git a/apis/fsx/2018-03-01/docs-2.json b/apis/fsx/2018-03-01/docs-2.json
@@ -1342,8 +1342,8 @@
     "IpAddressRange": {
       "base": null,
       "refs": {
-        "CreateFileSystemOntapConfiguration$EndpointIpAddressRange": "<p>Specifies the IP address range in which the endpoints to access your file system will be created. By default, Amazon FSx selects an unused IP address range for you from the 198.19.* range.</p> <important> <p>The Endpoint IP address range you select for your file system must exist outside the VPC's CIDR range and must be at least /30 or larger.</p> </important>",
-        "OntapFileSystemConfiguration$EndpointIpAddressRange": "<p>The IP address range in which the endpoints to access your file system are created.</p> <important> <p>The Endpoint IP address range you select for your file system must exist outside the VPC's CIDR range and must be at least /30 or larger. If you do not specify this optional parameter, Amazon FSx will automatically select a CIDR block for you.</p> </important>"
+        "CreateFileSystemOntapConfiguration$EndpointIpAddressRange": "<p>(Multi-AZ only) Specifies the IP address range in which the endpoints to access your file system will be created. By default, Amazon FSx selects an unused IP address range for you from the 198.19.* range.</p> <important> <p>The Endpoint IP address range you select for your file system must exist outside the VPC's CIDR range and must be at least /30 or larger.</p> </important>",
+        "OntapFileSystemConfiguration$EndpointIpAddressRange": "<p>(Multi-AZ only) The IP address range in which the endpoints to access your file system are created.</p> <important> <p>The Endpoint IP address range you select for your file system must exist outside the VPC's CIDR range and must be at least /30 or larger. If you do not specify this optional parameter, Amazon FSx will automatically select a CIDR block for you.</p> </important>"
       }
     },
     "JunctionPath": {
@@ -1537,8 +1537,8 @@
     "OntapDeploymentType": {
       "base": null,
       "refs": {
-        "CreateFileSystemOntapConfiguration$DeploymentType": "<p>Specifies the FSx for ONTAP file system deployment type to use in creating the file system. <code>MULTI_AZ_1</code> is the supported ONTAP deployment type.</p>",
-        "OntapFileSystemConfiguration$DeploymentType": "<p>The ONTAP file system deployment type.</p>"
+        "CreateFileSystemOntapConfiguration$DeploymentType": "<p>Specifies the FSx for ONTAP file system deployment type to use in creating the file system. </p> <ul> <li> <p> <code>MULTI_AZ_1</code> - (Default) A high availability file system configured for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability. </p> </li> <li> <p> <code>SINGLE_AZ_1</code> - A file system configured for Single-AZ redundancy.</p> </li> </ul> <p>For information about the use cases for Multi-AZ and Single-AZ deployments, refer to <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/high-availability-multiAZ.html\">Choosing Multi-AZ or Single-AZ file system deployment</a>. </p>",
+        "OntapFileSystemConfiguration$DeploymentType": "<p>Specifies the FSx for ONTAP file system deployment type in use in the file system. </p> <ul> <li> <p> <code>MULTI_AZ_1</code> - (Default) A high availability file system configured for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability. </p> </li> <li> <p> <code>SINGLE_AZ_1</code> - A file system configured for Single-AZ redundancy.</p> </li> </ul> <p>For information about the use cases for Multi-AZ and Single-AZ deployments, refer to <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/high-availability-multiAZ.html\">Choosing Multi-AZ or Single-AZ file system deployment</a>. </p>"
       }
     },
     "OntapEndpointIpAddresses": {
@@ -1819,8 +1819,8 @@
     "RouteTableIds": {
       "base": null,
       "refs": {
-        "CreateFileSystemOntapConfiguration$RouteTableIds": "<p>Specifies the virtual private cloud (VPC) route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table.</p>",
-        "OntapFileSystemConfiguration$RouteTableIds": "<p>The VPC route tables in which your file system's endpoints are created.</p>"
+        "CreateFileSystemOntapConfiguration$RouteTableIds": "<p>(Multi-AZ only) Specifies the virtual private cloud (VPC) route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table.</p>",
+        "OntapFileSystemConfiguration$RouteTableIds": "<p>(Multi-AZ only) The VPC route tables in which your file system's endpoints are created.</p>"
       }
     },
     "S3DataRepositoryConfiguration": {

diff --git a/apis/fsx/2018-03-01/paginators-1.json b/apis/fsx/2018-03-01/paginators-1.json
@@ -33,12 +33,14 @@
     "DescribeStorageVirtualMachines": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "StorageVirtualMachines"
     },
     "DescribeVolumes": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Volumes"
     },
     "ListTagsForResource": {
       "input_token": "NextToken",

diff --git a/apis/monitoring/2010-08-01/api-2.json b/apis/monitoring/2010-08-01/api-2.json
@@ -1289,7 +1289,8 @@
         "State":{"shape":"MetricStreamState"},
         "CreationDate":{"shape":"Timestamp"},
         "LastUpdateDate":{"shape":"Timestamp"},
-        "OutputFormat":{"shape":"MetricStreamOutputFormat"}
+        "OutputFormat":{"shape":"MetricStreamOutputFormat"},
+        "StatisticsConfigurations":{"shape":"MetricStreamStatisticsConfigurations"}
       }
     },
     "GetMetricWidgetImageInput":{
@@ -1843,6 +1844,41 @@
       "min":1
     },
     "MetricStreamState":{"type":"string"},
+    "MetricStreamStatistic":{"type":"string"},
+    "MetricStreamStatisticsAdditionalStatistics":{
+      "type":"list",
+      "member":{"shape":"MetricStreamStatistic"}
+    },
+    "MetricStreamStatisticsConfiguration":{
+      "type":"structure",
+      "required":[
+        "IncludeMetrics",
+        "AdditionalStatistics"
+      ],
+      "members":{
+        "IncludeMetrics":{"shape":"MetricStreamStatisticsIncludeMetrics"},
+        "AdditionalStatistics":{"shape":"MetricStreamStatisticsAdditionalStatistics"}
+      }
+    },
+    "MetricStreamStatisticsConfigurations":{
+      "type":"list",
+      "member":{"shape":"MetricStreamStatisticsConfiguration"}
+    },
+    "MetricStreamStatisticsIncludeMetrics":{
+      "type":"list",
+      "member":{"shape":"MetricStreamStatisticsMetric"}
+    },
+    "MetricStreamStatisticsMetric":{
+      "type":"structure",
+      "required":[
+        "Namespace",
+        "MetricName"
+      ],
+      "members":{
+        "Namespace":{"shape":"Namespace"},
+        "MetricName":{"shape":"MetricName"}
+      }
+    },
     "MetricWidget":{"type":"string"},
     "MetricWidgetImage":{"type":"blob"},
     "Metrics":{
@@ -2026,7 +2062,8 @@
         "FirehoseArn":{"shape":"AmazonResourceName"},
         "RoleArn":{"shape":"AmazonResourceName"},
         "OutputFormat":{"shape":"MetricStreamOutputFormat"},
-        "Tags":{"shape":"TagList"}
+        "Tags":{"shape":"TagList"},
+        "StatisticsConfigurations":{"shape":"MetricStreamStatisticsConfigurations"}
       }
     },
     "PutMetricStreamOutput":{