aws-sdk-appmesh 1.22.0 → 1.27.0

data/lib/aws-sdk-appmesh/client_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -77,6 +79,7 @@ module Aws::AppMesh
     GrpcRouteMetadata = Shapes::StructureShape.new(name: 'GrpcRouteMetadata')
     GrpcRouteMetadataList = Shapes::ListShape.new(name: 'GrpcRouteMetadataList')
     GrpcRouteMetadataMatchMethod = Shapes::StructureShape.new(name: 'GrpcRouteMetadataMatchMethod')
+    GrpcTimeout = Shapes::StructureShape.new(name: 'GrpcTimeout')
     HeaderMatch = Shapes::StringShape.new(name: 'HeaderMatch')
     HeaderMatchMethod = Shapes::StructureShape.new(name: 'HeaderMatchMethod')
     HeaderName = Shapes::StringShape.new(name: 'HeaderName')
@@ -95,6 +98,7 @@ module Aws::AppMesh
     HttpRouteHeaders = Shapes::ListShape.new(name: 'HttpRouteHeaders')
     HttpRouteMatch = Shapes::StructureShape.new(name: 'HttpRouteMatch')
     HttpScheme = Shapes::StringShape.new(name: 'HttpScheme')
+    HttpTimeout = Shapes::StructureShape.new(name: 'HttpTimeout')
     InternalServerErrorException = Shapes::StructureShape.new(name: 'InternalServerErrorException')
     LimitExceededException = Shapes::StructureShape.new(name: 'LimitExceededException')
     ListMeshesInput = Shapes::StructureShape.new(name: 'ListMeshesInput')
@@ -115,6 +119,7 @@ module Aws::AppMesh
     ListVirtualServicesLimit = Shapes::IntegerShape.new(name: 'ListVirtualServicesLimit')
     ListVirtualServicesOutput = Shapes::StructureShape.new(name: 'ListVirtualServicesOutput')
     Listener = Shapes::StructureShape.new(name: 'Listener')
+    ListenerTimeout = Shapes::StructureShape.new(name: 'ListenerTimeout')
     ListenerTls = Shapes::StructureShape.new(name: 'ListenerTls')
     ListenerTlsAcmCertificate = Shapes::StructureShape.new(name: 'ListenerTlsAcmCertificate')
     ListenerTlsCertificate = Shapes::StructureShape.new(name: 'ListenerTlsCertificate')
@@ -164,6 +169,7 @@ module Aws::AppMesh
     TcpRetryPolicyEvents = Shapes::ListShape.new(name: 'TcpRetryPolicyEvents')
     TcpRoute = Shapes::StructureShape.new(name: 'TcpRoute')
     TcpRouteAction = Shapes::StructureShape.new(name: 'TcpRouteAction')
+    TcpTimeout = Shapes::StructureShape.new(name: 'TcpTimeout')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
     TlsValidationContext = Shapes::StructureShape.new(name: 'TlsValidationContext')
     TlsValidationContextAcmTrust = Shapes::StructureShape.new(name: 'TlsValidationContextAcmTrust')
@@ -439,6 +445,7 @@ module Aws::AppMesh
     GrpcRoute.add_member(:action, Shapes::ShapeRef.new(shape: GrpcRouteAction, required: true, location_name: "action"))
     GrpcRoute.add_member(:match, Shapes::ShapeRef.new(shape: GrpcRouteMatch, required: true, location_name: "match"))
     GrpcRoute.add_member(:retry_policy, Shapes::ShapeRef.new(shape: GrpcRetryPolicy, location_name: "retryPolicy"))
+    GrpcRoute.add_member(:timeout, Shapes::ShapeRef.new(shape: GrpcTimeout, location_name: "timeout"))
     GrpcRoute.struct_class = Types::GrpcRoute
 
     GrpcRouteAction.add_member(:weighted_targets, Shapes::ShapeRef.new(shape: WeightedTargets, required: true, location_name: "weightedTargets"))
@@ -463,6 +470,10 @@ module Aws::AppMesh
     GrpcRouteMetadataMatchMethod.add_member(:suffix, Shapes::ShapeRef.new(shape: HeaderMatch, location_name: "suffix"))
     GrpcRouteMetadataMatchMethod.struct_class = Types::GrpcRouteMetadataMatchMethod
 
+    GrpcTimeout.add_member(:idle, Shapes::ShapeRef.new(shape: Duration, location_name: "idle"))
+    GrpcTimeout.add_member(:per_request, Shapes::ShapeRef.new(shape: Duration, location_name: "perRequest"))
+    GrpcTimeout.struct_class = Types::GrpcTimeout
+
     HeaderMatchMethod.add_member(:exact, Shapes::ShapeRef.new(shape: HeaderMatch, location_name: "exact"))
     HeaderMatchMethod.add_member(:prefix, Shapes::ShapeRef.new(shape: HeaderMatch, location_name: "prefix"))
     HeaderMatchMethod.add_member(:range, Shapes::ShapeRef.new(shape: MatchRange, location_name: "range"))
@@ -490,6 +501,7 @@ module Aws::AppMesh
     HttpRoute.add_member(:action, Shapes::ShapeRef.new(shape: HttpRouteAction, required: true, location_name: "action"))
     HttpRoute.add_member(:match, Shapes::ShapeRef.new(shape: HttpRouteMatch, required: true, location_name: "match"))
     HttpRoute.add_member(:retry_policy, Shapes::ShapeRef.new(shape: HttpRetryPolicy, location_name: "retryPolicy"))
+    HttpRoute.add_member(:timeout, Shapes::ShapeRef.new(shape: HttpTimeout, location_name: "timeout"))
     HttpRoute.struct_class = Types::HttpRoute
 
     HttpRouteAction.add_member(:weighted_targets, Shapes::ShapeRef.new(shape: WeightedTargets, required: true, location_name: "weightedTargets"))
@@ -508,6 +520,10 @@ module Aws::AppMesh
     HttpRouteMatch.add_member(:scheme, Shapes::ShapeRef.new(shape: HttpScheme, location_name: "scheme"))
     HttpRouteMatch.struct_class = Types::HttpRouteMatch
 
+    HttpTimeout.add_member(:idle, Shapes::ShapeRef.new(shape: Duration, location_name: "idle"))
+    HttpTimeout.add_member(:per_request, Shapes::ShapeRef.new(shape: Duration, location_name: "perRequest"))
+    HttpTimeout.struct_class = Types::HttpTimeout
+
     InternalServerErrorException.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     InternalServerErrorException.struct_class = Types::InternalServerErrorException
 
@@ -574,9 +590,16 @@ module Aws::AppMesh
 
     Listener.add_member(:health_check, Shapes::ShapeRef.new(shape: HealthCheckPolicy, location_name: "healthCheck"))
     Listener.add_member(:port_mapping, Shapes::ShapeRef.new(shape: PortMapping, required: true, location_name: "portMapping"))
+    Listener.add_member(:timeout, Shapes::ShapeRef.new(shape: ListenerTimeout, location_name: "timeout"))
     Listener.add_member(:tls, Shapes::ShapeRef.new(shape: ListenerTls, location_name: "tls"))
     Listener.struct_class = Types::Listener
 
+    ListenerTimeout.add_member(:grpc, Shapes::ShapeRef.new(shape: GrpcTimeout, location_name: "grpc"))
+    ListenerTimeout.add_member(:http, Shapes::ShapeRef.new(shape: HttpTimeout, location_name: "http"))
+    ListenerTimeout.add_member(:http2, Shapes::ShapeRef.new(shape: HttpTimeout, location_name: "http2"))
+    ListenerTimeout.add_member(:tcp, Shapes::ShapeRef.new(shape: TcpTimeout, location_name: "tcp"))
+    ListenerTimeout.struct_class = Types::ListenerTimeout
+
     ListenerTls.add_member(:certificate, Shapes::ShapeRef.new(shape: ListenerTlsCertificate, required: true, location_name: "certificate"))
     ListenerTls.add_member(:mode, Shapes::ShapeRef.new(shape: ListenerTlsMode, required: true, location_name: "mode"))
     ListenerTls.struct_class = Types::ListenerTls
@@ -610,9 +633,12 @@ module Aws::AppMesh
     MeshList.member = Shapes::ShapeRef.new(shape: MeshRef)
 
     MeshRef.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, required: true, location_name: "arn"))
+    MeshRef.add_member(:created_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "createdAt"))
+    MeshRef.add_member(:last_updated_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "lastUpdatedAt"))
     MeshRef.add_member(:mesh_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "meshName"))
     MeshRef.add_member(:mesh_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "meshOwner"))
     MeshRef.add_member(:resource_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "resourceOwner"))
+    MeshRef.add_member(:version, Shapes::ShapeRef.new(shape: Long, required: true, location_name: "version"))
     MeshRef.struct_class = Types::MeshRef
 
     MeshSpec.add_member(:egress_filter, Shapes::ShapeRef.new(shape: EgressFilter, location_name: "egressFilter"))
@@ -653,10 +679,13 @@ module Aws::AppMesh
     RouteList.member = Shapes::ShapeRef.new(shape: RouteRef)
 
     RouteRef.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, required: true, location_name: "arn"))
+    RouteRef.add_member(:created_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "createdAt"))
+    RouteRef.add_member(:last_updated_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "lastUpdatedAt"))
     RouteRef.add_member(:mesh_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "meshName"))
     RouteRef.add_member(:mesh_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "meshOwner"))
     RouteRef.add_member(:resource_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "resourceOwner"))
     RouteRef.add_member(:route_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "routeName"))
+    RouteRef.add_member(:version, Shapes::ShapeRef.new(shape: Long, required: true, location_name: "version"))
     RouteRef.add_member(:virtual_router_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "virtualRouterName"))
     RouteRef.struct_class = Types::RouteRef
 
@@ -694,11 +723,15 @@ module Aws::AppMesh
     TcpRetryPolicyEvents.member = Shapes::ShapeRef.new(shape: TcpRetryPolicyEvent)
 
     TcpRoute.add_member(:action, Shapes::ShapeRef.new(shape: TcpRouteAction, required: true, location_name: "action"))
+    TcpRoute.add_member(:timeout, Shapes::ShapeRef.new(shape: TcpTimeout, location_name: "timeout"))
     TcpRoute.struct_class = Types::TcpRoute
 
     TcpRouteAction.add_member(:weighted_targets, Shapes::ShapeRef.new(shape: WeightedTargets, required: true, location_name: "weightedTargets"))
     TcpRouteAction.struct_class = Types::TcpRouteAction
 
+    TcpTimeout.add_member(:idle, Shapes::ShapeRef.new(shape: Duration, location_name: "idle"))
+    TcpTimeout.struct_class = Types::TcpTimeout
+
     TlsValidationContext.add_member(:trust, Shapes::ShapeRef.new(shape: TlsValidationContextTrust, required: true, location_name: "trust"))
     TlsValidationContext.struct_class = Types::TlsValidationContext
 
@@ -793,9 +826,12 @@ module Aws::AppMesh
     VirtualNodeList.member = Shapes::ShapeRef.new(shape: VirtualNodeRef)
 
     VirtualNodeRef.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, required: true, location_name: "arn"))
+    VirtualNodeRef.add_member(:created_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "createdAt"))
+    VirtualNodeRef.add_member(:last_updated_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "lastUpdatedAt"))
     VirtualNodeRef.add_member(:mesh_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "meshName"))
     VirtualNodeRef.add_member(:mesh_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "meshOwner"))
     VirtualNodeRef.add_member(:resource_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "resourceOwner"))
+    VirtualNodeRef.add_member(:version, Shapes::ShapeRef.new(shape: Long, required: true, location_name: "version"))
     VirtualNodeRef.add_member(:virtual_node_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "virtualNodeName"))
     VirtualNodeRef.struct_class = Types::VirtualNodeRef
 
@@ -827,9 +863,12 @@ module Aws::AppMesh
     VirtualRouterListeners.member = Shapes::ShapeRef.new(shape: VirtualRouterListener)
 
     VirtualRouterRef.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, required: true, location_name: "arn"))
+    VirtualRouterRef.add_member(:created_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "createdAt"))
+    VirtualRouterRef.add_member(:last_updated_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "lastUpdatedAt"))
     VirtualRouterRef.add_member(:mesh_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "meshName"))
     VirtualRouterRef.add_member(:mesh_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "meshOwner"))
     VirtualRouterRef.add_member(:resource_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "resourceOwner"))
+    VirtualRouterRef.add_member(:version, Shapes::ShapeRef.new(shape: Long, required: true, location_name: "version"))
     VirtualRouterRef.add_member(:virtual_router_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "virtualRouterName"))
     VirtualRouterRef.struct_class = Types::VirtualRouterRef
 
@@ -860,9 +899,12 @@ module Aws::AppMesh
     VirtualServiceProvider.struct_class = Types::VirtualServiceProvider
 
     VirtualServiceRef.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, required: true, location_name: "arn"))
+    VirtualServiceRef.add_member(:created_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "createdAt"))
+    VirtualServiceRef.add_member(:last_updated_at, Shapes::ShapeRef.new(shape: Timestamp, required: true, location_name: "lastUpdatedAt"))
     VirtualServiceRef.add_member(:mesh_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "meshName"))
     VirtualServiceRef.add_member(:mesh_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "meshOwner"))
     VirtualServiceRef.add_member(:resource_owner, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "resourceOwner"))
+    VirtualServiceRef.add_member(:version, Shapes::ShapeRef.new(shape: Long, required: true, location_name: "version"))
     VirtualServiceRef.add_member(:virtual_service_name, Shapes::ShapeRef.new(shape: ServiceName, required: true, location_name: "virtualServiceName"))
     VirtualServiceRef.struct_class = Types::VirtualServiceRef
 
@@ -1046,6 +1088,7 @@ module Aws::AppMesh
         o.errors << Shapes::ShapeRef.new(shape: ForbiddenException)
         o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
         o.errors << Shapes::ShapeRef.new(shape: NotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceInUseException)
         o.errors << Shapes::ShapeRef.new(shape: ServiceUnavailableException)
         o.errors << Shapes::ShapeRef.new(shape: TooManyRequestsException)
       end)

data/lib/aws-sdk-appmesh/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

data/lib/aws-sdk-appmesh/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

data/lib/aws-sdk-appmesh/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -28,6 +30,7 @@ module Aws::AppMesh
     #
     class VirtualRouterListener < Struct.new(
       :port_mapping)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -86,6 +89,7 @@ module Aws::AppMesh
       :max_retries,
       :per_retry_timeout,
       :tcp_retry_events)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -97,6 +101,7 @@ module Aws::AppMesh
     #
     class CreateVirtualNodeOutput < Struct.new(
       :virtual_node)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -121,6 +126,7 @@ module Aws::AppMesh
     #
     class Logging < Struct.new(
       :access_log)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -132,6 +138,7 @@ module Aws::AppMesh
     #
     class UpdateVirtualRouterOutput < Struct.new(
       :virtual_router)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -152,6 +159,7 @@ module Aws::AppMesh
     class ListVirtualRoutersOutput < Struct.new(
       :next_token,
       :virtual_routers)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -175,7 +183,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -184,9 +192,9 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
@@ -212,6 +220,7 @@ module Aws::AppMesh
       :resource_owner,
       :uid,
       :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -225,6 +234,7 @@ module Aws::AppMesh
     #
     class ResourceInUseException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -236,6 +246,7 @@ module Aws::AppMesh
     #
     class UpdateVirtualNodeOutput < Struct.new(
       :virtual_node)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -256,6 +267,7 @@ module Aws::AppMesh
     class ListRoutesOutput < Struct.new(
       :next_token,
       :routes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -300,6 +312,7 @@ module Aws::AppMesh
     class VirtualServiceBackend < Struct.new(
       :client_policy,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -313,6 +326,7 @@ module Aws::AppMesh
     #
     class BadRequestException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -382,6 +396,7 @@ module Aws::AppMesh
       :protocol,
       :timeout_millis,
       :unhealthy_threshold)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -406,6 +421,7 @@ module Aws::AppMesh
     #
     class EgressFilter < Struct.new(
       :type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -440,6 +456,7 @@ module Aws::AppMesh
     #
     class ClientPolicy < Struct.new(
       :tls)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -451,6 +468,7 @@ module Aws::AppMesh
     #
     class DescribeVirtualServiceOutput < Struct.new(
       :virtual_service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -462,6 +480,7 @@ module Aws::AppMesh
     #
     class DescribeVirtualNodeOutput < Struct.new(
       :virtual_node)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -473,6 +492,7 @@ module Aws::AppMesh
     #
     class CreateRouteOutput < Struct.new(
       :route)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -494,6 +514,7 @@ module Aws::AppMesh
     #
     class DnsServiceDiscovery < Struct.new(
       :hostname)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -515,7 +536,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -537,6 +558,7 @@ module Aws::AppMesh
       :mesh_owner,
       :route_name,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -571,6 +593,7 @@ module Aws::AppMesh
       :spec,
       :status,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -614,6 +637,7 @@ module Aws::AppMesh
     #
     class Backend < Struct.new(
       :virtual_service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -654,6 +678,7 @@ module Aws::AppMesh
     class ListMeshesInput < Struct.new(
       :limit,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -688,6 +713,7 @@ module Aws::AppMesh
       :spec,
       :status,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -727,6 +753,7 @@ module Aws::AppMesh
       :client_token,
       :mesh_name,
       :spec)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -774,7 +801,7 @@ module Aws::AppMesh
     #   is not your own, then the account that you specify must share the
     #   mesh with your account before you can create the resource in the
     #   service mesh. For more information about mesh sharing, see [Working
-    #   with Shared Meshes][1].
+    #   with shared meshes][1].
     #
     #
     #
@@ -806,6 +833,7 @@ module Aws::AppMesh
       :spec,
       :tags,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -817,6 +845,7 @@ module Aws::AppMesh
     #
     class DescribeVirtualRouterOutput < Struct.new(
       :virtual_router)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -828,6 +857,7 @@ module Aws::AppMesh
     #
     class CreateMeshOutput < Struct.new(
       :mesh)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -840,6 +870,7 @@ module Aws::AppMesh
     #
     class CreateVirtualRouterOutput < Struct.new(
       :virtual_router)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -853,6 +884,7 @@ module Aws::AppMesh
     #
     class VirtualServiceStatus < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -886,6 +918,7 @@ module Aws::AppMesh
     class ListenerTlsCertificate < Struct.new(
       :acm,
       :file)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -914,6 +947,7 @@ module Aws::AppMesh
     #
     class VirtualRouterSpec < Struct.new(
       :listeners)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -979,6 +1013,44 @@ module Aws::AppMesh
     #               port: 1, # required
     #               protocol: "grpc", # required, accepts grpc, http, http2, tcp
     #             },
+    #             timeout: {
+    #               grpc: {
+    #                 idle: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #                 per_request: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #               },
+    #               http: {
+    #                 idle: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #                 per_request: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #               },
+    #               http2: {
+    #                 idle: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #                 per_request: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #               },
+    #               tcp: {
+    #                 idle: {
+    #                   unit: "ms", # accepts ms, s
+    #                   value: 1,
+    #                 },
+    #               },
+    #             },
     #             tls: {
     #               certificate: { # required
     #                 acm: {
@@ -1051,6 +1123,7 @@ module Aws::AppMesh
       :listeners,
       :logging,
       :service_discovery)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1070,6 +1143,7 @@ module Aws::AppMesh
     class ListMeshesOutput < Struct.new(
       :meshes,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1084,6 +1158,72 @@ module Aws::AppMesh
     #
     class ConflictException < Struct.new(
       :message)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass ListenerTimeout
+    #   data as a hash:
+    #
+    #       {
+    #         grpc: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #           per_request: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
+    #         http: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #           per_request: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
+    #         http2: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #           per_request: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
+    #         tcp: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] grpc
+    #   @return [Types::GrpcTimeout]
+    #
+    # @!attribute [rw] http
+    #   @return [Types::HttpTimeout]
+    #
+    # @!attribute [rw] http2
+    #   @return [Types::HttpTimeout]
+    #
+    # @!attribute [rw] tcp
+    #   @return [Types::TcpTimeout]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/ListenerTimeout AWS API Documentation
+    #
+    class ListenerTimeout < Struct.new(
+      :grpc,
+      :http,
+      :http2,
+      :tcp)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1117,6 +1257,7 @@ module Aws::AppMesh
     class TlsValidationContextTrust < Struct.new(
       :acm,
       :file)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1143,6 +1284,7 @@ module Aws::AppMesh
     class PortMapping < Struct.new(
       :port,
       :protocol)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1164,6 +1306,7 @@ module Aws::AppMesh
     class ListVirtualServicesOutput < Struct.new(
       :next_token,
       :virtual_services)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1194,6 +1337,7 @@ module Aws::AppMesh
     class WeightedTarget < Struct.new(
       :virtual_node,
       :weight)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1203,6 +1347,16 @@ module Aws::AppMesh
     #   The full Amazon Resource Name (ARN) for the route.
     #   @return [String]
     #
+    # @!attribute [rw] created_at
+    #   The Unix epoch timestamp in seconds for when the resource was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_updated_at
+    #   The Unix epoch timestamp in seconds for when the resource was last
+    #   updated.
+    #   @return [Time]
+    #
     # @!attribute [rw] mesh_name
     #   The name of the service mesh that the route resides in.
     #   @return [String]
@@ -1211,7 +1365,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -1220,9 +1374,9 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
@@ -1233,6 +1387,11 @@ module Aws::AppMesh
     #   The name of the route.
     #   @return [String]
     #
+    # @!attribute [rw] version
+    #   The version of the resource. Resources are created at version 1, and
+    #   this version is incremented each time that they're updated.
+    #   @return [Integer]
+    #
     # @!attribute [rw] virtual_router_name
     #   The virtual router that the route is associated with.
     #   @return [String]
@@ -1241,11 +1400,15 @@ module Aws::AppMesh
     #
     class RouteRef < Struct.new(
       :arn,
+      :created_at,
+      :last_updated_at,
       :mesh_name,
       :mesh_owner,
       :resource_owner,
       :route_name,
+      :version,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1266,7 +1429,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -1283,6 +1446,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1321,6 +1485,7 @@ module Aws::AppMesh
       :spec,
       :status,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1334,6 +1499,7 @@ module Aws::AppMesh
     #
     class InternalServerErrorException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1355,6 +1521,7 @@ module Aws::AppMesh
     #
     class TlsValidationContextAcmTrust < Struct.new(
       :certificate_authority_arns)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1367,6 +1534,7 @@ module Aws::AppMesh
     #
     class ForbiddenException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1416,6 +1584,7 @@ module Aws::AppMesh
       :range,
       :regex,
       :suffix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1427,6 +1596,7 @@ module Aws::AppMesh
     #
     class DeleteMeshOutput < Struct.new(
       :mesh)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1459,6 +1629,7 @@ module Aws::AppMesh
     class TagResourceInput < Struct.new(
       :resource_arn,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1489,6 +1660,7 @@ module Aws::AppMesh
     class VirtualServiceProvider < Struct.new(
       :virtual_node,
       :virtual_router)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1539,6 +1711,7 @@ module Aws::AppMesh
       :metadata,
       :method_name,
       :service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1580,6 +1753,7 @@ module Aws::AppMesh
       :attributes,
       :namespace_name,
       :service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1591,6 +1765,7 @@ module Aws::AppMesh
     #
     class UpdateVirtualServiceOutput < Struct.new(
       :virtual_service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1604,6 +1779,7 @@ module Aws::AppMesh
     #
     class MeshStatus < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1671,6 +1847,44 @@ module Aws::AppMesh
     #                 port: 1, # required
     #                 protocol: "grpc", # required, accepts grpc, http, http2, tcp
     #               },
+    #               timeout: {
+    #                 grpc: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 http: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 http2: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 tcp: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #               },
     #               tls: {
     #                 certificate: { # required
     #                   acm: {
@@ -1735,7 +1949,7 @@ module Aws::AppMesh
     #   is not your own, then the account that you specify must share the
     #   mesh with your account before you can create the resource in the
     #   service mesh. For more information about mesh sharing, see [Working
-    #   with Shared Meshes][1].
+    #   with shared meshes][1].
     #
     #
     #
@@ -1767,6 +1981,7 @@ module Aws::AppMesh
       :spec,
       :tags,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1780,6 +1995,7 @@ module Aws::AppMesh
     #
     class NotFoundException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1829,6 +2045,16 @@ module Aws::AppMesh
     #             },
     #             tcp_retry_events: ["connection-error"], # accepts connection-error
     #           },
+    #           timeout: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
     #         },
     #         http2_route: {
     #           action: { # required
@@ -1869,6 +2095,16 @@ module Aws::AppMesh
     #             },
     #             tcp_retry_events: ["connection-error"], # accepts connection-error
     #           },
+    #           timeout: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
     #         },
     #         http_route: {
     #           action: { # required
@@ -1909,6 +2145,16 @@ module Aws::AppMesh
     #             },
     #             tcp_retry_events: ["connection-error"], # accepts connection-error
     #           },
+    #           timeout: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
     #         },
     #         priority: 1,
     #         tcp_route: {
@@ -1920,6 +2166,12 @@ module Aws::AppMesh
     #               },
     #             ],
     #           },
+    #           timeout: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
     #         },
     #       }
     #
@@ -1952,6 +2204,7 @@ module Aws::AppMesh
       :http_route,
       :priority,
       :tcp_route)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1964,6 +2217,7 @@ module Aws::AppMesh
     #
     class CreateVirtualServiceOutput < Struct.new(
       :virtual_service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1994,6 +2248,7 @@ module Aws::AppMesh
     #
     class FileAccessLog < Struct.new(
       :path)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2014,6 +2269,38 @@ module Aws::AppMesh
     #
     class VirtualRouterServiceProvider < Struct.new(
       :virtual_router_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass HttpTimeout
+    #   data as a hash:
+    #
+    #       {
+    #         idle: {
+    #           unit: "ms", # accepts ms, s
+    #           value: 1,
+    #         },
+    #         per_request: {
+    #           unit: "ms", # accepts ms, s
+    #           value: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] idle
+    #   An object that represents a duration of time.
+    #   @return [Types::Duration]
+    #
+    # @!attribute [rw] per_request
+    #   An object that represents a duration of time.
+    #   @return [Types::Duration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/HttpTimeout AWS API Documentation
+    #
+    class HttpTimeout < Struct.new(
+      :idle,
+      :per_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2034,7 +2321,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2051,6 +2338,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2080,6 +2368,7 @@ module Aws::AppMesh
     #
     class TlsValidationContext < Struct.new(
       :trust)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2091,6 +2380,7 @@ module Aws::AppMesh
     #
     class DeleteVirtualRouterOutput < Struct.new(
       :virtual_router)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2102,6 +2392,7 @@ module Aws::AppMesh
     #
     class DeleteVirtualNodeOutput < Struct.new(
       :virtual_node)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2169,6 +2460,44 @@ module Aws::AppMesh
     #                 port: 1, # required
     #                 protocol: "grpc", # required, accepts grpc, http, http2, tcp
     #               },
+    #               timeout: {
+    #                 grpc: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 http: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 http2: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                   per_request: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #                 tcp: {
+    #                   idle: {
+    #                     unit: "ms", # accepts ms, s
+    #                     value: 1,
+    #                   },
+    #                 },
+    #               },
     #               tls: {
     #                 certificate: { # required
     #                   acm: {
@@ -2226,7 +2555,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2250,6 +2579,7 @@ module Aws::AppMesh
       :mesh_owner,
       :spec,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2293,6 +2623,7 @@ module Aws::AppMesh
     class ListenerTls < Struct.new(
       :certificate,
       :mode)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2311,6 +2642,7 @@ module Aws::AppMesh
     #
     class DeleteMeshInput < Struct.new(
       :mesh_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2358,7 +2690,7 @@ module Aws::AppMesh
     #   is not your own, then the account that you specify must share the
     #   mesh with your account before you can create the resource in the
     #   service mesh. For more information about mesh sharing, see [Working
-    #   with Shared Meshes][1].
+    #   with shared meshes][1].
     #
     #
     #
@@ -2390,6 +2722,7 @@ module Aws::AppMesh
       :spec,
       :tags,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2430,7 +2763,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2454,6 +2787,7 @@ module Aws::AppMesh
       :mesh_owner,
       :spec,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2496,6 +2830,7 @@ module Aws::AppMesh
       :limit,
       :next_token,
       :resource_arn)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2508,6 +2843,7 @@ module Aws::AppMesh
     #
     class ServiceUnavailableException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2519,6 +2855,7 @@ module Aws::AppMesh
     #
     class DescribeMeshOutput < Struct.new(
       :mesh)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2539,7 +2876,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2556,6 +2893,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2577,7 +2915,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2599,6 +2937,7 @@ module Aws::AppMesh
       :mesh_owner,
       :route_name,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2610,6 +2949,7 @@ module Aws::AppMesh
     #
     class DeleteRouteOutput < Struct.new(
       :route)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2650,7 +2990,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2674,6 +3014,7 @@ module Aws::AppMesh
       :mesh_owner,
       :spec,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2685,6 +3026,7 @@ module Aws::AppMesh
     #
     class UpdateRouteOutput < Struct.new(
       :route)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2711,6 +3053,7 @@ module Aws::AppMesh
     #
     class HttpRouteAction < Struct.new(
       :weighted_targets)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2744,7 +3087,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2770,6 +3113,7 @@ module Aws::AppMesh
       :mesh_owner,
       :next_token,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2780,6 +3124,16 @@ module Aws::AppMesh
     #   The full Amazon Resource Name (ARN) for the virtual service.
     #   @return [String]
     #
+    # @!attribute [rw] created_at
+    #   The Unix epoch timestamp in seconds for when the resource was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_updated_at
+    #   The Unix epoch timestamp in seconds for when the resource was last
+    #   updated.
+    #   @return [Time]
+    #
     # @!attribute [rw] mesh_name
     #   The name of the service mesh that the virtual service resides in.
     #   @return [String]
@@ -2788,7 +3142,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2797,15 +3151,20 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html
     #   @return [String]
     #
+    # @!attribute [rw] version
+    #   The version of the resource. Resources are created at version 1, and
+    #   this version is incremented each time that they're updated.
+    #   @return [Integer]
+    #
     # @!attribute [rw] virtual_service_name
     #   The name of the virtual service.
     #   @return [String]
@@ -2814,10 +3173,45 @@ module Aws::AppMesh
     #
     class VirtualServiceRef < Struct.new(
       :arn,
+      :created_at,
+      :last_updated_at,
       :mesh_name,
       :mesh_owner,
       :resource_owner,
+      :version,
       :virtual_service_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass GrpcTimeout
+    #   data as a hash:
+    #
+    #       {
+    #         idle: {
+    #           unit: "ms", # accepts ms, s
+    #           value: 1,
+    #         },
+    #         per_request: {
+    #           unit: "ms", # accepts ms, s
+    #           value: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] idle
+    #   An object that represents a duration of time.
+    #   @return [Types::Duration]
+    #
+    # @!attribute [rw] per_request
+    #   An object that represents a duration of time.
+    #   @return [Types::Duration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/GrpcTimeout AWS API Documentation
+    #
+    class GrpcTimeout < Struct.new(
+      :idle,
+      :per_request)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2831,6 +3225,7 @@ module Aws::AppMesh
     #
     class VirtualNodeStatus < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2841,6 +3236,16 @@ module Aws::AppMesh
     #   The full Amazon Resource Name (ARN) for the virtual router.
     #   @return [String]
     #
+    # @!attribute [rw] created_at
+    #   The Unix epoch timestamp in seconds for when the resource was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_updated_at
+    #   The Unix epoch timestamp in seconds for when the resource was last
+    #   updated.
+    #   @return [Time]
+    #
     # @!attribute [rw] mesh_name
     #   The name of the service mesh that the virtual router resides in.
     #   @return [String]
@@ -2849,7 +3254,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2858,15 +3263,20 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html
     #   @return [String]
     #
+    # @!attribute [rw] version
+    #   The version of the resource. Resources are created at version 1, and
+    #   this version is incremented each time that they're updated.
+    #   @return [Integer]
+    #
     # @!attribute [rw] virtual_router_name
     #   The name of the virtual router.
     #   @return [String]
@@ -2875,10 +3285,14 @@ module Aws::AppMesh
     #
     class VirtualRouterRef < Struct.new(
       :arn,
+      :created_at,
+      :last_updated_at,
       :mesh_name,
       :mesh_owner,
       :resource_owner,
+      :version,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2913,6 +3327,7 @@ module Aws::AppMesh
       :spec,
       :status,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2956,6 +3371,7 @@ module Aws::AppMesh
       :invert,
       :match,
       :name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2965,6 +3381,16 @@ module Aws::AppMesh
     #   The full Amazon Resource Name (ARN) for the virtual node.
     #   @return [String]
     #
+    # @!attribute [rw] created_at
+    #   The Unix epoch timestamp in seconds for when the resource was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_updated_at
+    #   The Unix epoch timestamp in seconds for when the resource was last
+    #   updated.
+    #   @return [Time]
+    #
     # @!attribute [rw] mesh_name
     #   The name of the service mesh that the virtual node resides in.
     #   @return [String]
@@ -2973,7 +3399,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -2982,15 +3408,20 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html
     #   @return [String]
     #
+    # @!attribute [rw] version
+    #   The version of the resource. Resources are created at version 1, and
+    #   this version is incremented each time that they're updated.
+    #   @return [Integer]
+    #
     # @!attribute [rw] virtual_node_name
     #   The name of the virtual node.
     #   @return [String]
@@ -2999,10 +3430,14 @@ module Aws::AppMesh
     #
     class VirtualNodeRef < Struct.new(
       :arn,
+      :created_at,
+      :last_updated_at,
       :mesh_name,
       :mesh_owner,
       :resource_owner,
+      :version,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3057,6 +3492,7 @@ module Aws::AppMesh
       :mesh_name,
       :spec,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3083,6 +3519,7 @@ module Aws::AppMesh
     #
     class GrpcRouteAction < Struct.new(
       :weighted_targets)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3091,7 +3528,7 @@ module Aws::AppMesh
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/service_limits.html
+    # [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/service-quotas.html
     #
     # @!attribute [rw] message
     #   @return [String]
@@ -3100,6 +3537,7 @@ module Aws::AppMesh
     #
     class LimitExceededException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3112,6 +3550,7 @@ module Aws::AppMesh
     #
     class UpdateMeshOutput < Struct.new(
       :mesh)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3161,6 +3600,7 @@ module Aws::AppMesh
       :range,
       :regex,
       :suffix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3181,7 +3621,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3198,6 +3638,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_service_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3229,6 +3670,7 @@ module Aws::AppMesh
     class AwsCloudMapInstanceAttribute < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3257,6 +3699,7 @@ module Aws::AppMesh
     #
     class VirtualServiceSpec < Struct.new(
       :provider)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3286,6 +3729,7 @@ module Aws::AppMesh
     class MatchRange < Struct.new(
       :end,
       :start)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3303,16 +3747,27 @@ module Aws::AppMesh
     #             },
     #           ],
     #         },
+    #         timeout: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] action
     #   The action to take if a match is determined.
     #   @return [Types::TcpRouteAction]
     #
+    # @!attribute [rw] timeout
+    #   @return [Types::TcpTimeout]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/TcpRoute AWS API Documentation
     #
     class TcpRoute < Struct.new(
-      :action)
+      :action,
+      :timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3345,7 +3800,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3366,6 +3821,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3398,7 +3854,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3419,6 +3875,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3442,6 +3899,7 @@ module Aws::AppMesh
     #
     class AccessLog < Struct.new(
       :file)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3474,7 +3932,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3495,6 +3953,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3509,6 +3968,7 @@ module Aws::AppMesh
     #
     class TooManyRequestsException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3535,6 +3995,7 @@ module Aws::AppMesh
     class Duration < Struct.new(
       :unit,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3546,6 +4007,7 @@ module Aws::AppMesh
     #
     class DescribeRouteOutput < Struct.new(
       :route)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3605,6 +4067,7 @@ module Aws::AppMesh
       :method,
       :prefix,
       :scheme)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3638,6 +4101,7 @@ module Aws::AppMesh
     class TagRef < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3647,6 +4111,16 @@ module Aws::AppMesh
     #   The full Amazon Resource Name (ARN) of the service mesh.
     #   @return [String]
     #
+    # @!attribute [rw] created_at
+    #   The Unix epoch timestamp in seconds for when the resource was
+    #   created.
+    #   @return [Time]
+    #
+    # @!attribute [rw] last_updated_at
+    #   The Unix epoch timestamp in seconds for when the resource was last
+    #   updated.
+    #   @return [Time]
+    #
     # @!attribute [rw] mesh_name
     #   The name of the service mesh.
     #   @return [String]
@@ -3655,7 +4129,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3664,22 +4138,31 @@ module Aws::AppMesh
     #
     # @!attribute [rw] resource_owner
     #   The AWS IAM account ID of the resource owner. If the account ID is
-    #   not your own, then it's the ID of the mesh owner, or another
+    #   not your own, then it's the ID of the mesh owner or of another
     #   account that the mesh is shared with. For more information about
-    #   mesh sharing, see [Working with Shared Meshes][1].
+    #   mesh sharing, see [Working with shared meshes][1].
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html
     #   @return [String]
     #
+    # @!attribute [rw] version
+    #   The version of the resource. Resources are created at version 1, and
+    #   this version is incremented each time that they're updated.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/MeshRef AWS API Documentation
     #
     class MeshRef < Struct.new(
       :arn,
+      :created_at,
+      :last_updated_at,
       :mesh_name,
       :mesh_owner,
-      :resource_owner)
+      :resource_owner,
+      :version)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3709,6 +4192,7 @@ module Aws::AppMesh
       :metadata,
       :spec,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3722,6 +4206,7 @@ module Aws::AppMesh
     #
     class VirtualRouterStatus < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3748,6 +4233,7 @@ module Aws::AppMesh
     #
     class TcpRouteAction < Struct.new(
       :weighted_targets)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3768,7 +4254,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -3785,6 +4271,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3798,6 +4285,7 @@ module Aws::AppMesh
     #
     class RouteStatus < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3820,6 +4308,44 @@ module Aws::AppMesh
     #           port: 1, # required
     #           protocol: "grpc", # required, accepts grpc, http, http2, tcp
     #         },
+    #         timeout: {
+    #           grpc: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
+    #           http: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
+    #           http2: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #             per_request: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
+    #           tcp: {
+    #             idle: {
+    #               unit: "ms", # accepts ms, s
+    #               value: 1,
+    #             },
+    #           },
+    #         },
     #         tls: {
     #           certificate: { # required
     #             acm: {
@@ -3842,6 +4368,9 @@ module Aws::AppMesh
     #   The port mapping information for the listener.
     #   @return [Types::PortMapping]
     #
+    # @!attribute [rw] timeout
+    #   @return [Types::ListenerTimeout]
+    #
     # @!attribute [rw] tls
     #   A reference to an object that represents the Transport Layer
     #   Security (TLS) properties for a listener.
@@ -3852,7 +4381,9 @@ module Aws::AppMesh
     class Listener < Struct.new(
       :health_check,
       :port_mapping,
+      :timeout,
       :tls)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3900,6 +4431,16 @@ module Aws::AppMesh
     #           },
     #           tcp_retry_events: ["connection-error"], # accepts connection-error
     #         },
+    #         timeout: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #           per_request: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] action
@@ -3916,12 +4457,17 @@ module Aws::AppMesh
     #   An object that represents a retry policy.
     #   @return [Types::GrpcRetryPolicy]
     #
+    # @!attribute [rw] timeout
+    #   @return [Types::GrpcTimeout]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/GrpcRoute AWS API Documentation
     #
     class GrpcRoute < Struct.new(
       :action,
       :match,
-      :retry_policy)
+      :retry_policy,
+      :timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3952,7 +4498,7 @@ module Aws::AppMesh
     #   @return [Boolean]
     #
     # @!attribute [rw] ports
-    #   The range of ports that the policy is enforced for.
+    #   One or more ports that the policy is enforced for.
     #   @return [Array<Integer>]
     #
     # @!attribute [rw] validation
@@ -3965,6 +4511,7 @@ module Aws::AppMesh
       :enforce,
       :ports,
       :validation)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3976,6 +4523,7 @@ module Aws::AppMesh
     #
     class DeleteVirtualServiceOutput < Struct.new(
       :virtual_service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3996,6 +4544,7 @@ module Aws::AppMesh
     #
     class VirtualNodeServiceProvider < Struct.new(
       :virtual_node_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4031,6 +4580,7 @@ module Aws::AppMesh
     #
     class BackendDefaults < Struct.new(
       :client_policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4041,7 +4591,7 @@ module Aws::AppMesh
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html#virtual-node-tls-prerequisites
+    # [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/tls.html#virtual-node-tls-prerequisites
     #
     # @note When making an API call, you may pass ListenerTlsFileCertificate
     #   data as a hash:
@@ -4065,6 +4615,7 @@ module Aws::AppMesh
     class ListenerTlsFileCertificate < Struct.new(
       :certificate_chain,
       :private_key)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4117,6 +4668,7 @@ module Aws::AppMesh
       :max_retries,
       :per_retry_timeout,
       :tcp_retry_events)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4137,7 +4689,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -4154,6 +4706,7 @@ module Aws::AppMesh
       :mesh_name,
       :mesh_owner,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4173,6 +4726,7 @@ module Aws::AppMesh
     #
     class TooManyTagsException < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4195,6 +4749,7 @@ module Aws::AppMesh
     #
     class TlsValidationContextFileTrust < Struct.new(
       :certificate_chain)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4237,6 +4792,7 @@ module Aws::AppMesh
       :invert,
       :match,
       :name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4288,6 +4844,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           http2_route: {
     #             action: { # required
@@ -4328,6 +4894,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           http_route: {
     #             action: { # required
@@ -4368,6 +4944,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           priority: 1,
     #           tcp_route: {
@@ -4379,6 +4965,12 @@ module Aws::AppMesh
     #                 },
     #               ],
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #         },
     #         tags: [
@@ -4408,7 +5000,7 @@ module Aws::AppMesh
     #   is not your own, then the account that you specify must share the
     #   mesh with your account before you can create the resource in the
     #   service mesh. For more information about mesh sharing, see [Working
-    #   with Shared Meshes][1].
+    #   with shared meshes][1].
     #
     #
     #
@@ -4447,6 +5039,29 @@ module Aws::AppMesh
       :spec,
       :tags,
       :virtual_router_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass TcpTimeout
+    #   data as a hash:
+    #
+    #       {
+    #         idle: {
+    #           unit: "ms", # accepts ms, s
+    #           value: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] idle
+    #   An object that represents a duration of time.
+    #   @return [Types::Duration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/TcpTimeout AWS API Documentation
+    #
+    class TcpTimeout < Struct.new(
+      :idle)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4498,6 +5113,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           http2_route: {
     #             action: { # required
@@ -4538,6 +5163,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           http_route: {
     #             action: { # required
@@ -4578,6 +5213,16 @@ module Aws::AppMesh
     #               },
     #               tcp_retry_events: ["connection-error"], # accepts connection-error
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #               per_request: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #           priority: 1,
     #           tcp_route: {
@@ -4589,6 +5234,12 @@ module Aws::AppMesh
     #                 },
     #               ],
     #             },
+    #             timeout: {
+    #               idle: {
+    #                 unit: "ms", # accepts ms, s
+    #                 value: 1,
+    #               },
+    #             },
     #           },
     #         },
     #         virtual_router_name: "ResourceName", # required
@@ -4611,7 +5262,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -4640,6 +5291,7 @@ module Aws::AppMesh
       :route_name,
       :spec,
       :virtual_router_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4687,6 +5339,16 @@ module Aws::AppMesh
     #           },
     #           tcp_retry_events: ["connection-error"], # accepts connection-error
     #         },
+    #         timeout: {
+    #           idle: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #           per_request: {
+    #             unit: "ms", # accepts ms, s
+    #             value: 1,
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] action
@@ -4703,12 +5365,17 @@ module Aws::AppMesh
     #   An object that represents a retry policy.
     #   @return [Types::HttpRetryPolicy]
     #
+    # @!attribute [rw] timeout
+    #   @return [Types::HttpTimeout]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/HttpRoute AWS API Documentation
     #
     class HttpRoute < Struct.new(
       :action,
       :match,
-      :retry_policy)
+      :retry_policy,
+      :timeout)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4728,7 +5395,7 @@ module Aws::AppMesh
     #   The AWS IAM account ID of the service mesh owner. If the account ID
     #   is not your own, then it's the ID of the account that shared the
     #   mesh with your account. For more information about mesh sharing, see
-    #   [Working with Shared Meshes][1].
+    #   [Working with shared meshes][1].
     #
     #
     #
@@ -4740,6 +5407,7 @@ module Aws::AppMesh
     class DescribeMeshInput < Struct.new(
       :mesh_name,
       :mesh_owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4762,6 +5430,7 @@ module Aws::AppMesh
     #
     class MeshSpec < Struct.new(
       :egress_filter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4782,6 +5451,7 @@ module Aws::AppMesh
     class ListTagsForResourceOutput < Struct.new(
       :next_token,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4820,6 +5490,7 @@ module Aws::AppMesh
     class ServiceDiscovery < Struct.new(
       :aws_cloud_map,
       :dns)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4840,6 +5511,7 @@ module Aws::AppMesh
     class ListVirtualNodesOutput < Struct.new(
       :next_token,
       :virtual_nodes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4864,6 +5536,7 @@ module Aws::AppMesh
     class UntagResourceInput < Struct.new(
       :resource_arn,
       :tag_keys)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4884,13 +5557,14 @@ module Aws::AppMesh
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html#virtual-node-tls-prerequisites
+    #   [1]: https://docs.aws.amazon.com/app-mesh/latest/userguide/tls.html#virtual-node-tls-prerequisites
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/appmesh-2019-01-25/ListenerTlsAcmCertificate AWS API Documentation
     #
     class ListenerTlsAcmCertificate < Struct.new(
       :certificate_arn)
+      SENSITIVE = []
       include Aws::Structure
     end