Merge branch 'version-3' into auth-trait

apis/autoscaling/2011-01-01/api-2.json

@@ -4,11 +4,13 @@
     "apiVersion":"2011-01-01",
     "endpointPrefix":"autoscaling",
     "protocol":"query",
+    "protocols":["query"],
     "serviceFullName":"Auto Scaling",
     "serviceId":"Auto Scaling",
     "signatureVersion":"v4",
     "uid":"autoscaling-2011-01-01",
-    "xmlNamespace":"http://autoscaling.amazonaws.com/doc/2011-01-01/"
+    "xmlNamespace":"http://autoscaling.amazonaws.com/doc/2011-01-01/",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AttachInstances":{
@@ -3451,7 +3453,7 @@
       "type":"structure",
       "required":["Id"],
       "members":{
-        "Id":{"shape":"XmlStringMaxLen255"},
+        "Id":{"shape":"XmlStringMaxLen64"},
         "Expression":{"shape":"XmlStringMaxLen2047"},
         "MetricStat":{"shape":"TargetTrackingMetricStat"},
         "Label":{"shape":"XmlStringMetricLabel"},

apis/ec2/2016-11-15/api-2.json

@@ -28760,7 +28760,22 @@
         "u7i-12tb.224xlarge",
         "u7in-16tb.224xlarge",
         "u7in-24tb.224xlarge",
-        "u7in-32tb.224xlarge"
+        "u7in-32tb.224xlarge",
+        "u7ib-12tb.224xlarge",
+        "c7gn.metal",
+        "r8g.medium",
+        "r8g.large",
+        "r8g.xlarge",
+        "r8g.2xlarge",
+        "r8g.4xlarge",
+        "r8g.8xlarge",
+        "r8g.12xlarge",
+        "r8g.16xlarge",
+        "r8g.24xlarge",
+        "r8g.48xlarge",
+        "r8g.metal-24xl",
+        "r8g.metal-48xl",
+        "mac2-m1ultra.metal"
       ]
     },
     "InstanceTypeHypervisor":{

apis/networkmanager/2019-07-05/api-2.json

@@ -1601,9 +1601,38 @@
         "ProposedSegmentChange":{"shape":"ProposedSegmentChange"},
         "ProposedNetworkFunctionGroupChange":{"shape":"ProposedNetworkFunctionGroupChange"},
         "CreatedAt":{"shape":"DateTime"},
-        "UpdatedAt":{"shape":"DateTime"}
+        "UpdatedAt":{"shape":"DateTime"},
+        "LastModificationErrors":{"shape":"AttachmentErrorList"}
       }
     },
+    "AttachmentError":{
+      "type":"structure",
+      "members":{
+        "Code":{"shape":"AttachmentErrorCode"},
+        "Message":{"shape":"ServerSideString"},
+        "ResourceArn":{"shape":"ResourceArn"},
+        "RequestId":{"shape":"ServerSideString"}
+      }
+    },
+    "AttachmentErrorCode":{
+      "type":"string",
+      "enum":[
+        "VPC_NOT_FOUND",
+        "SUBNET_NOT_FOUND",
+        "SUBNET_DUPLICATED_IN_AVAILABILITY_ZONE",
+        "SUBNET_NO_FREE_ADDRESSES",
+        "SUBNET_UNSUPPORTED_AVAILABILITY_ZONE",
+        "SUBNET_NO_IPV6_CIDRS",
+        "VPN_CONNECTION_NOT_FOUND",
+        "MAXIMUM_NO_ENCAP_LIMIT_EXCEEDED"
+      ]
+    },
+    "AttachmentErrorList":{
+      "type":"list",
+      "member":{"shape":"AttachmentError"},
+      "max":20,
+      "min":0
+    },
     "AttachmentId":{
       "type":"string",
       "max":50,
@@ -1740,7 +1769,8 @@
         "CreatedAt":{"shape":"DateTime"},
         "Configuration":{"shape":"ConnectPeerConfiguration"},
         "Tags":{"shape":"TagList"},
-        "SubnetArn":{"shape":"SubnetArn"}
+        "SubnetArn":{"shape":"SubnetArn"},
+        "LastModificationErrors":{"shape":"ConnectPeerErrorList"}
       }
     },
     "ConnectPeerAssociation":{
@@ -1789,6 +1819,32 @@
         "BgpConfigurations":{"shape":"ConnectPeerBgpConfigurationList"}
       }
     },
+    "ConnectPeerError":{
+      "type":"structure",
+      "members":{
+        "Code":{"shape":"ConnectPeerErrorCode"},
+        "Message":{"shape":"ServerSideString"},
+        "ResourceArn":{"shape":"ResourceArn"},
+        "RequestId":{"shape":"ServerSideString"}
+      }
+    },
+    "ConnectPeerErrorCode":{
+      "type":"string",
+      "enum":[
+        "EDGE_LOCATION_NO_FREE_IPS",
+        "EDGE_LOCATION_PEER_DUPLICATE",
+        "SUBNET_NOT_FOUND",
+        "IP_OUTSIDE_SUBNET_CIDR_RANGE",
+        "INVALID_INSIDE_CIDR_BLOCK",
+        "NO_ASSOCIATED_CIDR_BLOCK"
+      ]
+    },
+    "ConnectPeerErrorList":{
+      "type":"list",
+      "member":{"shape":"ConnectPeerError"},
+      "max":20,
+      "min":0
+    },
     "ConnectPeerId":{
       "type":"string",
       "max":50,
@@ -4285,9 +4341,37 @@
         "EdgeLocation":{"shape":"ExternalRegionCode"},
         "ResourceArn":{"shape":"ResourceArn"},
         "Tags":{"shape":"TagList"},
-        "CreatedAt":{"shape":"DateTime"}
+        "CreatedAt":{"shape":"DateTime"},
+        "LastModificationErrors":{"shape":"PeeringErrorList"}
+      }
+    },
+    "PeeringError":{
+      "type":"structure",
+      "members":{
+        "Code":{"shape":"PeeringErrorCode"},
+        "Message":{"shape":"ServerSideString"},
+        "ResourceArn":{"shape":"ResourceArn"},
+        "RequestId":{"shape":"ServerSideString"},
+        "MissingPermissionsContext":{"shape":"PermissionsErrorContext"}
       }
     },
+    "PeeringErrorCode":{
+      "type":"string",
+      "enum":[
+        "TRANSIT_GATEWAY_NOT_FOUND",
+        "TRANSIT_GATEWAY_PEERS_LIMIT_EXCEEDED",
+        "MISSING_PERMISSIONS",
+        "INTERNAL_ERROR",
+        "EDGE_LOCATION_PEER_DUPLICATE",
+        "INVALID_TRANSIT_GATEWAY_STATE"
+      ]
+    },
+    "PeeringErrorList":{
+      "type":"list",
+      "member":{"shape":"PeeringError"},
+      "max":20,
+      "min":0
+    },
     "PeeringId":{
       "type":"string",
       "max":50,
@@ -4311,6 +4395,12 @@
       "type":"string",
       "enum":["TRANSIT_GATEWAY"]
     },
+    "PermissionsErrorContext":{
+      "type":"structure",
+      "members":{
+        "MissingPermission":{"shape":"ServerSideString"}
+      }
+    },
     "ProposedNetworkFunctionGroupChange":{
       "type":"structure",
       "members":{

apis/networkmanager/2019-07-05/docs-2.json

@@ -203,6 +203,24 @@
         "VpcAttachment$Attachment": "<p>Provides details about the VPC attachment.</p>"
       }
     },
+    "AttachmentError": {
+      "base": "<p>Describes the error associated with an attachment request.</p>",
+      "refs": {
+        "AttachmentErrorList$member": null
+      }
+    },
+    "AttachmentErrorCode": {
+      "base": null,
+      "refs": {
+        "AttachmentError$Code": "<p>The error code for the attachment request. </p>"
+      }
+    },
+    "AttachmentErrorList": {
+      "base": null,
+      "refs": {
+        "Attachment$LastModificationErrors": "<p>Describes the error associated with the attachment request.</p>"
+      }
+    },
     "AttachmentId": {
       "base": null,
       "refs": {
@@ -376,6 +394,24 @@
         "ConnectPeer$Configuration": "<p>The configuration of the Connect peer.</p>"
       }
     },
+    "ConnectPeerError": {
+      "base": "<p>Describes an error associated with a Connect peer request</p>",
+      "refs": {
+        "ConnectPeerErrorList$member": null
+      }
+    },
+    "ConnectPeerErrorCode": {
+      "base": null,
+      "refs": {
+        "ConnectPeerError$Code": "<p>The error code for the Connect peer request.</p>"
+      }
+    },
+    "ConnectPeerErrorList": {
+      "base": null,
+      "refs": {
+        "ConnectPeer$LastModificationErrors": "<p>Describes the error associated with the attachment request.</p>"
+      }
+    },
     "ConnectPeerId": {
       "base": null,
       "refs": {
@@ -2084,6 +2120,24 @@
         "TransitGatewayPeering$Peering": "<p>Describes a transit gateway peer connection.</p>"
       }
     },
+    "PeeringError": {
+      "base": "<p>Describes an error associated with a peering request.</p>",
+      "refs": {
+        "PeeringErrorList$member": null
+      }
+    },
+    "PeeringErrorCode": {
+      "base": null,
+      "refs": {
+        "PeeringError$Code": "<p>The error code for the peering request.</p>"
+      }
+    },
+    "PeeringErrorList": {
+      "base": null,
+      "refs": {
+        "Peering$LastModificationErrors": "<p>Describes the error associated with the Connect peer request.</p>"
+      }
+    },
     "PeeringId": {
       "base": null,
       "refs": {
@@ -2114,6 +2168,12 @@
         "Peering$PeeringType": "<p>The type of peering. This will be <code>TRANSIT_GATEWAY</code>.</p>"
       }
     },
+    "PermissionsErrorContext": {
+      "base": "<p>Describes additional information about missing permissions. </p>",
+      "refs": {
+        "PeeringError$MissingPermissionsContext": "<p>Provides additional information about missing permissions for the peering error.</p>"
+      }
+    },
     "ProposedNetworkFunctionGroupChange": {
       "base": "<p>Describes proposed changes to a network function group. </p>",
       "refs": {
@@ -2200,6 +2260,8 @@
       "base": null,
       "refs": {
         "Attachment$ResourceArn": "<p>The attachment resource ARN.</p>",
+        "AttachmentError$ResourceArn": "<p>The ARN of the requested attachment resource.</p>",
+        "ConnectPeerError$ResourceArn": "<p>The ARN of the requested Connect peer resource.</p>",
         "DeleteResourcePolicyRequest$ResourceArn": "<p>The ARN of the policy to delete.</p>",
         "GetNetworkResourceRelationshipsRequest$RegisteredGatewayArn": "<p>The ARN of the registered gateway.</p>",
         "GetNetworkResourceRelationshipsRequest$ResourceArn": "<p>The ARN of the gateway.</p>",
@@ -2217,6 +2279,7 @@
         "NetworkTelemetry$RegisteredGatewayArn": "<p>The ARN of the gateway.</p>",
         "NetworkTelemetry$ResourceArn": "<p>The ARN of the resource.</p>",
         "Peering$ResourceArn": "<p>The resource ARN of the peer.</p>",
+        "PeeringError$ResourceArn": "<p>The ARN of the requested peering resource.</p>",
         "PutResourcePolicyRequest$ResourceArn": "<p>The ARN of the resource policy. </p>",
         "TagResourceRequest$ResourceArn": "<p>The Amazon Resource Name (ARN) of the resource.</p>",
         "UntagResourceRequest$ResourceArn": "<p>The Amazon Resource Name (ARN) of the resource.</p>",
@@ -2366,14 +2429,21 @@
       "base": null,
       "refs": {
         "AccessDeniedException$Message": null,
+        "AttachmentError$Message": "<p>The message associated with the error <code>code</code>.</p>",
+        "AttachmentError$RequestId": "<p>The ID of the attachment request.</p>",
         "ConflictException$Message": null,
         "ConflictException$ResourceId": "<p>The ID of the resource.</p>",
         "ConflictException$ResourceType": "<p>The resource type.</p>",
+        "ConnectPeerError$Message": "<p>The message associated with the error <code>code</code>.</p>",
+        "ConnectPeerError$RequestId": "<p>The ID of the Connect peer request.</p>",
         "CoreNetworkPolicyError$ErrorCode": "<p>The error code associated with a core network policy error.</p>",
         "CoreNetworkPolicyError$Message": "<p>The message associated with a core network policy error code.</p>",
         "CoreNetworkPolicyError$Path": "<p>The JSON path where the error was discovered in the policy document.</p>",
         "CoreNetworkPolicyException$Message": null,
         "InternalServerException$Message": null,
+        "PeeringError$Message": "<p>The message associated with the error <code>code</code>.</p>",
+        "PeeringError$RequestId": "<p>The ID of the Peering request.</p>",
+        "PermissionsErrorContext$MissingPermission": "<p>The missing permissions.</p>",
         "ResourceNotFoundException$Message": null,
         "ResourceNotFoundException$ResourceId": "<p>The ID of the resource.</p>",
         "ResourceNotFoundException$ResourceType": "<p>The resource type.</p>",

apis/workspaces-thin-client/2023-08-22/api-2.json

@@ -3,8 +3,8 @@
   "metadata":{
     "apiVersion":"2023-08-22",
     "endpointPrefix":"thinclient",
-    "jsonVersion":"1.1",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"Amazon WorkSpaces Thin Client",
     "serviceId":"WorkSpaces Thin Client",
     "signatureVersion":"v4",
@@ -375,7 +375,8 @@
           "shape":"ClientToken",
           "idempotencyToken":true
         },
-        "tags":{"shape":"TagsMap"}
+        "tags":{"shape":"TagsMap"},
+        "deviceCreationTags":{"shape":"DeviceCreationTagsMap"}
       }
     },
     "CreateEnvironmentResponse":{
@@ -508,6 +509,26 @@
         "tags":{"shape":"TagsMap"}
       }
     },
+    "DeviceCreationTagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"(?!aws:)[A-Za-z0-9 _=@:.+-/]+"
+    },
+    "DeviceCreationTagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"[A-Za-z0-9 _=@:.+-/]+"
+    },
+    "DeviceCreationTagsMap":{
+      "type":"map",
+      "key":{"shape":"DeviceCreationTagKey"},
+      "value":{"shape":"DeviceCreationTagValue"},
+      "max":50,
+      "min":0,
+      "sensitive":true
+    },
     "DeviceId":{
       "type":"string",
       "pattern":"[a-zA-Z0-9]{24}"
@@ -579,7 +600,8 @@
         "updatedAt":{"shape":"Timestamp"},
         "arn":{"shape":"Arn"},
         "kmsKeyArn":{"shape":"KmsKeyArn"},
-        "tags":{"shape":"TagsMap"}
+        "tags":{"shape":"TagsMap"},
+        "deviceCreationTags":{"shape":"DeviceCreationTagsMap"}
       }
     },
     "EnvironmentId":{
@@ -1054,7 +1076,8 @@
         "softwareSetUpdateSchedule":{"shape":"SoftwareSetUpdateSchedule"},
         "maintenanceWindow":{"shape":"MaintenanceWindow"},
         "softwareSetUpdateMode":{"shape":"SoftwareSetUpdateMode"},
-        "desiredSoftwareSetId":{"shape":"SoftwareSetIdOrEmptyString"}
+        "desiredSoftwareSetId":{"shape":"SoftwareSetIdOrEmptyString"},
+        "deviceCreationTags":{"shape":"DeviceCreationTagsMap"}
       }
     },
     "UpdateEnvironmentResponse":{