aws-sdk-servicediscovery 1.23.0 → 1.28.0

data/lib/aws-sdk-servicediscovery/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:
@@ -11,6 +13,7 @@ module Aws::ServiceDiscovery
 
     include Seahorse::Model
 
+    AmazonResourceName = Shapes::StringShape.new(name: 'AmazonResourceName')
     Arn = Shapes::StringShape.new(name: 'Arn')
     AttrKey = Shapes::StringShape.new(name: 'AttrKey')
     AttrValue = Shapes::StringShape.new(name: 'AttrValue')
@@ -34,6 +37,7 @@ module Aws::ServiceDiscovery
     DeregisterInstanceResponse = Shapes::StructureShape.new(name: 'DeregisterInstanceResponse')
     DiscoverInstancesRequest = Shapes::StructureShape.new(name: 'DiscoverInstancesRequest')
     DiscoverInstancesResponse = Shapes::StructureShape.new(name: 'DiscoverInstancesResponse')
+    DiscoverMaxResults = Shapes::IntegerShape.new(name: 'DiscoverMaxResults')
     DnsConfig = Shapes::StructureShape.new(name: 'DnsConfig')
     DnsConfigChange = Shapes::StructureShape.new(name: 'DnsConfigChange')
     DnsProperties = Shapes::StructureShape.new(name: 'DnsProperties')
@@ -78,6 +82,8 @@ module Aws::ServiceDiscovery
     ListOperationsResponse = Shapes::StructureShape.new(name: 'ListOperationsResponse')
     ListServicesRequest = Shapes::StructureShape.new(name: 'ListServicesRequest')
     ListServicesResponse = Shapes::StructureShape.new(name: 'ListServicesResponse')
+    ListTagsForResourceRequest = Shapes::StructureShape.new(name: 'ListTagsForResourceRequest')
+    ListTagsForResourceResponse = Shapes::StructureShape.new(name: 'ListTagsForResourceResponse')
     MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
     Message = Shapes::StringShape.new(name: 'Message')
     Namespace = Shapes::StructureShape.new(name: 'Namespace')
@@ -108,11 +114,13 @@ module Aws::ServiceDiscovery
     RecordType = Shapes::StringShape.new(name: 'RecordType')
     RegisterInstanceRequest = Shapes::StructureShape.new(name: 'RegisterInstanceRequest')
     RegisterInstanceResponse = Shapes::StructureShape.new(name: 'RegisterInstanceResponse')
+    RequestLimitExceeded = Shapes::StructureShape.new(name: 'RequestLimitExceeded')
     ResourceCount = Shapes::IntegerShape.new(name: 'ResourceCount')
     ResourceDescription = Shapes::StringShape.new(name: 'ResourceDescription')
     ResourceId = Shapes::StringShape.new(name: 'ResourceId')
     ResourceInUse = Shapes::StructureShape.new(name: 'ResourceInUse')
     ResourceLimitExceeded = Shapes::StructureShape.new(name: 'ResourceLimitExceeded')
+    ResourceNotFoundException = Shapes::StructureShape.new(name: 'ResourceNotFoundException')
     ResourcePath = Shapes::StringShape.new(name: 'ResourcePath')
     RoutingPolicy = Shapes::StringShape.new(name: 'RoutingPolicy')
     Service = Shapes::StructureShape.new(name: 'Service')
@@ -125,7 +133,17 @@ module Aws::ServiceDiscovery
     ServiceNotFound = Shapes::StructureShape.new(name: 'ServiceNotFound')
     ServiceSummariesList = Shapes::ListShape.new(name: 'ServiceSummariesList')
     ServiceSummary = Shapes::StructureShape.new(name: 'ServiceSummary')
+    Tag = Shapes::StructureShape.new(name: 'Tag')
+    TagKey = Shapes::StringShape.new(name: 'TagKey')
+    TagKeyList = Shapes::ListShape.new(name: 'TagKeyList')
+    TagList = Shapes::ListShape.new(name: 'TagList')
+    TagResourceRequest = Shapes::StructureShape.new(name: 'TagResourceRequest')
+    TagResourceResponse = Shapes::StructureShape.new(name: 'TagResourceResponse')
+    TagValue = Shapes::StringShape.new(name: 'TagValue')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
+    TooManyTagsException = Shapes::StructureShape.new(name: 'TooManyTagsException')
+    UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
+    UntagResourceResponse = Shapes::StructureShape.new(name: 'UntagResourceResponse')
     UpdateInstanceCustomHealthStatusRequest = Shapes::StructureShape.new(name: 'UpdateInstanceCustomHealthStatusRequest')
     UpdateServiceRequest = Shapes::StructureShape.new(name: 'UpdateServiceRequest')
     UpdateServiceResponse = Shapes::StructureShape.new(name: 'UpdateServiceResponse')
@@ -136,6 +154,7 @@ module Aws::ServiceDiscovery
     CreateHttpNamespaceRequest.add_member(:name, Shapes::ShapeRef.new(shape: NamespaceName, required: true, location_name: "Name"))
     CreateHttpNamespaceRequest.add_member(:creator_request_id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "CreatorRequestId", metadata: {"idempotencyToken"=>true}))
     CreateHttpNamespaceRequest.add_member(:description, Shapes::ShapeRef.new(shape: ResourceDescription, location_name: "Description"))
+    CreateHttpNamespaceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateHttpNamespaceRequest.struct_class = Types::CreateHttpNamespaceRequest
 
     CreateHttpNamespaceResponse.add_member(:operation_id, Shapes::ShapeRef.new(shape: OperationId, location_name: "OperationId"))
@@ -145,6 +164,7 @@ module Aws::ServiceDiscovery
     CreatePrivateDnsNamespaceRequest.add_member(:creator_request_id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "CreatorRequestId", metadata: {"idempotencyToken"=>true}))
     CreatePrivateDnsNamespaceRequest.add_member(:description, Shapes::ShapeRef.new(shape: ResourceDescription, location_name: "Description"))
     CreatePrivateDnsNamespaceRequest.add_member(:vpc, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "Vpc"))
+    CreatePrivateDnsNamespaceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreatePrivateDnsNamespaceRequest.struct_class = Types::CreatePrivateDnsNamespaceRequest
 
     CreatePrivateDnsNamespaceResponse.add_member(:operation_id, Shapes::ShapeRef.new(shape: OperationId, location_name: "OperationId"))
@@ -153,6 +173,7 @@ module Aws::ServiceDiscovery
     CreatePublicDnsNamespaceRequest.add_member(:name, Shapes::ShapeRef.new(shape: NamespaceName, required: true, location_name: "Name"))
     CreatePublicDnsNamespaceRequest.add_member(:creator_request_id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "CreatorRequestId", metadata: {"idempotencyToken"=>true}))
     CreatePublicDnsNamespaceRequest.add_member(:description, Shapes::ShapeRef.new(shape: ResourceDescription, location_name: "Description"))
+    CreatePublicDnsNamespaceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreatePublicDnsNamespaceRequest.struct_class = Types::CreatePublicDnsNamespaceRequest
 
     CreatePublicDnsNamespaceResponse.add_member(:operation_id, Shapes::ShapeRef.new(shape: OperationId, location_name: "OperationId"))
@@ -165,6 +186,7 @@ module Aws::ServiceDiscovery
     CreateServiceRequest.add_member(:dns_config, Shapes::ShapeRef.new(shape: DnsConfig, location_name: "DnsConfig"))
     CreateServiceRequest.add_member(:health_check_config, Shapes::ShapeRef.new(shape: HealthCheckConfig, location_name: "HealthCheckConfig"))
     CreateServiceRequest.add_member(:health_check_custom_config, Shapes::ShapeRef.new(shape: HealthCheckCustomConfig, location_name: "HealthCheckCustomConfig"))
+    CreateServiceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CreateServiceRequest.struct_class = Types::CreateServiceRequest
 
     CreateServiceResponse.add_member(:service, Shapes::ShapeRef.new(shape: Service, location_name: "Service"))
@@ -193,7 +215,7 @@ module Aws::ServiceDiscovery
 
     DiscoverInstancesRequest.add_member(:namespace_name, Shapes::ShapeRef.new(shape: NamespaceName, required: true, location_name: "NamespaceName"))
     DiscoverInstancesRequest.add_member(:service_name, Shapes::ShapeRef.new(shape: ServiceName, required: true, location_name: "ServiceName"))
-    DiscoverInstancesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location_name: "MaxResults"))
+    DiscoverInstancesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DiscoverMaxResults, location_name: "MaxResults"))
     DiscoverInstancesRequest.add_member(:query_parameters, Shapes::ShapeRef.new(shape: Attributes, location_name: "QueryParameters"))
     DiscoverInstancesRequest.add_member(:health_status, Shapes::ShapeRef.new(shape: HealthStatusFilter, location_name: "HealthStatus"))
     DiscoverInstancesRequest.struct_class = Types::DiscoverInstancesRequest
@@ -337,6 +359,12 @@ module Aws::ServiceDiscovery
     ListServicesResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
     ListServicesResponse.struct_class = Types::ListServicesResponse
 
+    ListTagsForResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: AmazonResourceName, required: true, location_name: "ResourceARN"))
+    ListTagsForResourceRequest.struct_class = Types::ListTagsForResourceRequest
+
+    ListTagsForResourceResponse.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
+    ListTagsForResourceResponse.struct_class = Types::ListTagsForResourceResponse
+
     Namespace.add_member(:id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "Id"))
     Namespace.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, location_name: "Arn"))
     Namespace.add_member(:name, Shapes::ShapeRef.new(shape: NamespaceName, location_name: "Name"))
@@ -417,12 +445,18 @@ module Aws::ServiceDiscovery
     RegisterInstanceResponse.add_member(:operation_id, Shapes::ShapeRef.new(shape: OperationId, location_name: "OperationId"))
     RegisterInstanceResponse.struct_class = Types::RegisterInstanceResponse
 
+    RequestLimitExceeded.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
+    RequestLimitExceeded.struct_class = Types::RequestLimitExceeded
+
     ResourceInUse.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
     ResourceInUse.struct_class = Types::ResourceInUse
 
     ResourceLimitExceeded.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
     ResourceLimitExceeded.struct_class = Types::ResourceLimitExceeded
 
+    ResourceNotFoundException.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
+    ResourceNotFoundException.struct_class = Types::ResourceNotFoundException
+
     Service.add_member(:id, Shapes::ShapeRef.new(shape: ResourceId, location_name: "Id"))
     Service.add_member(:arn, Shapes::ShapeRef.new(shape: Arn, location_name: "Arn"))
     Service.add_member(:name, Shapes::ShapeRef.new(shape: ServiceName, location_name: "Name"))
@@ -442,7 +476,7 @@ module Aws::ServiceDiscovery
     ServiceAlreadyExists.struct_class = Types::ServiceAlreadyExists
 
     ServiceChange.add_member(:description, Shapes::ShapeRef.new(shape: ResourceDescription, location_name: "Description"))
-    ServiceChange.add_member(:dns_config, Shapes::ShapeRef.new(shape: DnsConfigChange, required: true, location_name: "DnsConfig"))
+    ServiceChange.add_member(:dns_config, Shapes::ShapeRef.new(shape: DnsConfigChange, location_name: "DnsConfig"))
     ServiceChange.add_member(:health_check_config, Shapes::ShapeRef.new(shape: HealthCheckConfig, location_name: "HealthCheckConfig"))
     ServiceChange.struct_class = Types::ServiceChange
 
@@ -469,6 +503,30 @@ module Aws::ServiceDiscovery
     ServiceSummary.add_member(:create_date, Shapes::ShapeRef.new(shape: Timestamp, location_name: "CreateDate"))
     ServiceSummary.struct_class = Types::ServiceSummary
 
+    Tag.add_member(:key, Shapes::ShapeRef.new(shape: TagKey, required: true, location_name: "Key"))
+    Tag.add_member(:value, Shapes::ShapeRef.new(shape: TagValue, required: true, location_name: "Value"))
+    Tag.struct_class = Types::Tag
+
+    TagKeyList.member = Shapes::ShapeRef.new(shape: TagKey)
+
+    TagList.member = Shapes::ShapeRef.new(shape: Tag)
+
+    TagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: AmazonResourceName, required: true, location_name: "ResourceARN"))
+    TagResourceRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, required: true, location_name: "Tags"))
+    TagResourceRequest.struct_class = Types::TagResourceRequest
+
+    TagResourceResponse.struct_class = Types::TagResourceResponse
+
+    TooManyTagsException.add_member(:message, Shapes::ShapeRef.new(shape: ErrorMessage, location_name: "Message"))
+    TooManyTagsException.add_member(:resource_name, Shapes::ShapeRef.new(shape: AmazonResourceName, location_name: "ResourceName"))
+    TooManyTagsException.struct_class = Types::TooManyTagsException
+
+    UntagResourceRequest.add_member(:resource_arn, Shapes::ShapeRef.new(shape: AmazonResourceName, required: true, location_name: "ResourceARN"))
+    UntagResourceRequest.add_member(:tag_keys, Shapes::ShapeRef.new(shape: TagKeyList, required: true, location_name: "TagKeys"))
+    UntagResourceRequest.struct_class = Types::UntagResourceRequest
+
+    UntagResourceResponse.struct_class = Types::UntagResourceResponse
+
     UpdateInstanceCustomHealthStatusRequest.add_member(:service_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "ServiceId"))
     UpdateInstanceCustomHealthStatusRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: ResourceId, required: true, location_name: "InstanceId"))
     UpdateInstanceCustomHealthStatusRequest.add_member(:status, Shapes::ShapeRef.new(shape: CustomHealthStatus, required: true, location_name: "Status"))
@@ -510,6 +568,7 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: NamespaceAlreadyExists)
         o.errors << Shapes::ShapeRef.new(shape: ResourceLimitExceeded)
         o.errors << Shapes::ShapeRef.new(shape: DuplicateRequest)
+        o.errors << Shapes::ShapeRef.new(shape: TooManyTagsException)
       end)
 
       api.add_operation(:create_private_dns_namespace, Seahorse::Model::Operation.new.tap do |o|
@@ -522,6 +581,7 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: NamespaceAlreadyExists)
         o.errors << Shapes::ShapeRef.new(shape: ResourceLimitExceeded)
         o.errors << Shapes::ShapeRef.new(shape: DuplicateRequest)
+        o.errors << Shapes::ShapeRef.new(shape: TooManyTagsException)
       end)
 
       api.add_operation(:create_public_dns_namespace, Seahorse::Model::Operation.new.tap do |o|
@@ -534,6 +594,7 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: NamespaceAlreadyExists)
         o.errors << Shapes::ShapeRef.new(shape: ResourceLimitExceeded)
         o.errors << Shapes::ShapeRef.new(shape: DuplicateRequest)
+        o.errors << Shapes::ShapeRef.new(shape: TooManyTagsException)
       end)
 
       api.add_operation(:create_service, Seahorse::Model::Operation.new.tap do |o|
@@ -546,6 +607,7 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: ResourceLimitExceeded)
         o.errors << Shapes::ShapeRef.new(shape: NamespaceNotFound)
         o.errors << Shapes::ShapeRef.new(shape: ServiceAlreadyExists)
+        o.errors << Shapes::ShapeRef.new(shape: TooManyTagsException)
       end)
 
       api.add_operation(:delete_namespace, Seahorse::Model::Operation.new.tap do |o|
@@ -596,6 +658,7 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: ServiceNotFound)
         o.errors << Shapes::ShapeRef.new(shape: NamespaceNotFound)
         o.errors << Shapes::ShapeRef.new(shape: InvalidInput)
+        o.errors << Shapes::ShapeRef.new(shape: RequestLimitExceeded)
       end)
 
       api.add_operation(:get_instance, Seahorse::Model::Operation.new.tap do |o|
@@ -717,6 +780,16 @@ module Aws::ServiceDiscovery
         )
       end)
 
+      api.add_operation(:list_tags_for_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListTagsForResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListTagsForResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListTagsForResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidInput)
+      end)
+
       api.add_operation(:register_instance, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RegisterInstance"
         o.http_method = "POST"
@@ -730,6 +803,27 @@ module Aws::ServiceDiscovery
         o.errors << Shapes::ShapeRef.new(shape: ServiceNotFound)
       end)
 
+      api.add_operation(:tag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "TagResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: TagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: TagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: TooManyTagsException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidInput)
+      end)
+
+      api.add_operation(:untag_resource, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UntagResource"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: UntagResourceRequest)
+        o.output = Shapes::ShapeRef.new(shape: UntagResourceResponse)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidInput)
+      end)
+
       api.add_operation(:update_instance_custom_health_status, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateInstanceCustomHealthStatus"
         o.http_method = "POST"

data/lib/aws-sdk-servicediscovery/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:
@@ -32,10 +34,13 @@ module Aws::ServiceDiscovery
   # * {NamespaceAlreadyExists}
   # * {NamespaceNotFound}
   # * {OperationNotFound}
+  # * {RequestLimitExceeded}
   # * {ResourceInUse}
   # * {ResourceLimitExceeded}
+  # * {ResourceNotFoundException}
   # * {ServiceAlreadyExists}
   # * {ServiceNotFound}
+  # * {TooManyTagsException}
   #
   # Additionally, error classes are dynamically generated for service errors based on the error code
   # if they are not defined above.
@@ -163,6 +168,21 @@ module Aws::ServiceDiscovery
       end
     end
 
+    class RequestLimitExceeded < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::ServiceDiscovery::Types::RequestLimitExceeded] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+    end
+
     class ResourceInUse < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -193,6 +213,21 @@ module Aws::ServiceDiscovery
       end
     end
 
+    class ResourceNotFoundException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::ServiceDiscovery::Types::ResourceNotFoundException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+    end
+
     class ServiceAlreadyExists < ServiceError
 
       # @param [Seahorse::Client::RequestContext] context
@@ -233,5 +268,25 @@ module Aws::ServiceDiscovery
       end
     end
 
+    class TooManyTagsException < ServiceError
+
+      # @param [Seahorse::Client::RequestContext] context
+      # @param [String] message
+      # @param [Aws::ServiceDiscovery::Types::TooManyTagsException] data
+      def initialize(context, message, data = Aws::EmptyStructure.new)
+        super(context, message, data)
+      end
+
+      # @return [String]
+      def message
+        @message || @data[:message]
+      end
+
+      # @return [String]
+      def resource_name
+        @data[:resource_name]
+      end
+    end
+
   end
 end

data/lib/aws-sdk-servicediscovery/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-servicediscovery/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:
@@ -15,6 +17,12 @@ module Aws::ServiceDiscovery
     #         name: "NamespaceName", # required
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -35,12 +43,21 @@ module Aws::ServiceDiscovery
     #   A description for the namespace.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags to add to the namespace. Each tag consists of a key and an
+    #   optional value, both of which you define. Tag keys can have a
+    #   maximum character length of 128 characters, and tag values can have
+    #   a maximum length of 256 characters.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreateHttpNamespaceRequest AWS API Documentation
     #
     class CreateHttpNamespaceRequest < Struct.new(
       :name,
       :creator_request_id,
-      :description)
+      :description,
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -58,6 +75,7 @@ module Aws::ServiceDiscovery
     #
     class CreateHttpNamespaceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -69,12 +87,18 @@ module Aws::ServiceDiscovery
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
     #         vpc: "ResourceId", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
     #   The name that you want to assign to this namespace. When you create
     #   a private DNS namespace, AWS Cloud Map automatically creates an
-    #   Amazon Route 53 private hosted zone that has the same name as the
+    #   Amazon Route 53 private hosted zone that has the same name as the
     #   namespace.
     #   @return [String]
     #
@@ -97,13 +121,22 @@ module Aws::ServiceDiscovery
     #   with.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags to add to the namespace. Each tag consists of a key and an
+    #   optional value, both of which you define. Tag keys can have a
+    #   maximum character length of 128 characters, and tag values can have
+    #   a maximum length of 256 characters.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreatePrivateDnsNamespaceRequest AWS API Documentation
     #
     class CreatePrivateDnsNamespaceRequest < Struct.new(
       :name,
       :creator_request_id,
       :description,
-      :vpc)
+      :vpc,
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -121,6 +154,7 @@ module Aws::ServiceDiscovery
     #
     class CreatePrivateDnsNamespaceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -131,6 +165,12 @@ module Aws::ServiceDiscovery
     #         name: "NamespaceName", # required
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -151,12 +191,21 @@ module Aws::ServiceDiscovery
     #   A description for the namespace.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags to add to the namespace. Each tag consists of a key and an
+    #   optional value, both of which you define. Tag keys can have a
+    #   maximum character length of 128 characters, and tag values can have
+    #   a maximum length of 256 characters.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreatePublicDnsNamespaceRequest AWS API Documentation
     #
     class CreatePublicDnsNamespaceRequest < Struct.new(
       :name,
       :creator_request_id,
-      :description)
+      :description,
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -174,6 +223,7 @@ module Aws::ServiceDiscovery
     #
     class CreatePublicDnsNamespaceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -203,20 +253,27 @@ module Aws::ServiceDiscovery
     #         health_check_custom_config: {
     #           failure_threshold: 1,
     #         },
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
     #   The name that you want to assign to the service.
     #
-    #   If you want AWS Cloud Map to create an SRV record when you register
-    #   an instance, and if you're using a system that requires a specific
-    #   SRV format, such as [HAProxy][1], specify the following for `Name`\:
+    #   If you want AWS Cloud Map to create an `SRV` record when you
+    #   register an instance, and if you're using a system that requires a
+    #   specific `SRV` format, such as [HAProxy][1], specify the following
+    #   for `Name`\:
     #
     #   * Start the name with an underscore (\_), such as `_exampleservice`
     #
     #   * End the name with *.\_protocol*, such as `._tcp`
     #
-    #   When you register an instance, AWS Cloud Map creates an SRV record
+    #   When you register an instance, AWS Cloud Map creates an `SRV` record
     #   and assigns a name to the record by concatenating the service name
     #   and the namespace name, for example:
     #
@@ -246,16 +303,16 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] dns_config
-    #   A complex type that contains information about the Amazon Route 53
+    #   A complex type that contains information about the Amazon Route 53
     #   records that you want AWS Cloud Map to create when you register an
     #   instance.
     #   @return [Types::DnsConfig]
     #
     # @!attribute [rw] health_check_config
     #   *Public DNS and HTTP namespaces only.* A complex type that contains
-    #   settings for an optional Route 53 health check. If you specify
+    #   settings for an optional Route 53 health check. If you specify
     #   settings for a health check, AWS Cloud Map associates the health
-    #   check with all the Route 53 DNS records that you specify in
+    #   check with all the Route 53 DNS records that you specify in
     #   `DnsConfig`.
     #
     #   If you specify a health check configuration, you can specify either
@@ -280,6 +337,13 @@ module Aws::ServiceDiscovery
     #   configuration from an existing service.
     #   @return [Types::HealthCheckCustomConfig]
     #
+    # @!attribute [rw] tags
+    #   The tags to add to the service. Each tag consists of a key and an
+    #   optional value, both of which you define. Tag keys can have a
+    #   maximum character length of 128 characters, and tag values can have
+    #   a maximum length of 256 characters.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreateServiceRequest AWS API Documentation
     #
     class CreateServiceRequest < Struct.new(
@@ -289,7 +353,9 @@ module Aws::ServiceDiscovery
       :description,
       :dns_config,
       :health_check_config,
-      :health_check_custom_config)
+      :health_check_custom_config,
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -301,6 +367,7 @@ module Aws::ServiceDiscovery
     #
     class CreateServiceResponse < Struct.new(
       :service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -314,6 +381,7 @@ module Aws::ServiceDiscovery
     #
     class CustomHealthNotFound < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -332,6 +400,7 @@ module Aws::ServiceDiscovery
     #
     class DeleteNamespaceRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -349,6 +418,7 @@ module Aws::ServiceDiscovery
     #
     class DeleteNamespaceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -367,6 +437,7 @@ module Aws::ServiceDiscovery
     #
     class DeleteServiceRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -400,6 +471,7 @@ module Aws::ServiceDiscovery
     class DeregisterInstanceRequest < Struct.new(
       :service_id,
       :instance_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -416,6 +488,7 @@ module Aws::ServiceDiscovery
     #
     class DeregisterInstanceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -468,6 +541,7 @@ module Aws::ServiceDiscovery
       :max_results,
       :query_parameters,
       :health_status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -480,10 +554,11 @@ module Aws::ServiceDiscovery
     #
     class DiscoverInstancesResponse < Struct.new(
       :instances)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that contains information about the Amazon Route 53 DNS
+    # A complex type that contains information about the Amazon Route 53 DNS
     # records that you want AWS Cloud Map to create when you register an
     # instance.
     #
@@ -506,7 +581,7 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] routing_policy
-    #   The routing policy that you want to apply to all Route 53 DNS
+    #   The routing policy that you want to apply to all Route 53 DNS
     #   records that AWS Cloud Map creates when you register an instance and
     #   specify this service.
     #
@@ -520,43 +595,43 @@ module Aws::ServiceDiscovery
     #   **MULTIVALUE**
     #
     #   If you define a health check for the service and the health check is
-    #   healthy, Route 53 returns the applicable value for up to eight
+    #   healthy, Route 53 returns the applicable value for up to eight
     #   instances.
     #
-    #   For example, suppose the service includes configurations for one A
+    #   For example, suppose the service includes configurations for one `A`
     #   record and a health check, and you use the service to register 10
-    #   instances. Route 53 responds to DNS queries with IP addresses for up
+    #   instances. Route 53 responds to DNS queries with IP addresses for up
     #   to eight healthy instances. If fewer than eight instances are
-    #   healthy, Route 53 responds to every DNS query with the IP addresses
+    #   healthy, Route 53 responds to every DNS query with the IP addresses
     #   for all of the healthy instances.
     #
-    #   If you don't define a health check for the service, Route 53
+    #   If you don't define a health check for the service, Route 53
     #   assumes that all instances are healthy and returns the values for up
     #   to eight instances.
     #
     #   For more information about the multivalue routing policy, see
-    #   [Multivalue Answer Routing][1] in the *Route 53 Developer Guide*.
+    #   [Multivalue Answer Routing][1] in the *Route 53 Developer Guide*.
     #
     #   **WEIGHTED**
     #
-    #   Route 53 returns the applicable value from one randomly selected
+    #   Route 53 returns the applicable value from one randomly selected
     #   instance from among the instances that you registered using the same
     #   service. Currently, all records have the same weight, so you can't
     #   route more or less traffic to any instances.
     #
-    #   For example, suppose the service includes configurations for one A
+    #   For example, suppose the service includes configurations for one `A`
     #   record and a health check, and you use the service to register 10
-    #   instances. Route 53 responds to DNS queries with the IP address for
+    #   instances. Route 53 responds to DNS queries with the IP address for
     #   one randomly selected instance from among the healthy instances. If
-    #   no instances are healthy, Route 53 responds to DNS queries as if all
+    #   no instances are healthy, Route 53 responds to DNS queries as if all
     #   of the instances were healthy.
     #
-    #   If you don't define a health check for the service, Route 53
+    #   If you don't define a health check for the service, Route 53
     #   assumes that all instances are healthy and returns the applicable
     #   value for one randomly selected instance.
     #
     #   For more information about the weighted routing policy, see
-    #   [Weighted Routing][2] in the *Route 53 Developer Guide*.
+    #   [Weighted Routing][2] in the *Route 53 Developer Guide*.
     #
     #
     #
@@ -565,7 +640,7 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] dns_records
-    #   An array that contains one `DnsRecord` object for each Route 53 DNS
+    #   An array that contains one `DnsRecord` object for each Route 53 DNS
     #   record that you want AWS Cloud Map to create when you register an
     #   instance.
     #   @return [Array<Types::DnsRecord>]
@@ -576,10 +651,11 @@ module Aws::ServiceDiscovery
       :namespace_id,
       :routing_policy,
       :dns_records)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that contains information about changes to the Route 53
+    # A complex type that contains information about changes to the Route 53
     # DNS records that AWS Cloud Map creates when you register an instance.
     #
     # @note When making an API call, you may pass DnsConfigChange
@@ -595,7 +671,7 @@ module Aws::ServiceDiscovery
     #       }
     #
     # @!attribute [rw] dns_records
-    #   An array that contains one `DnsRecord` object for each Route 53
+    #   An array that contains one `DnsRecord` object for each Route 53
     #   record that you want AWS Cloud Map to create when you register an
     #   instance.
     #   @return [Array<Types::DnsRecord>]
@@ -604,14 +680,15 @@ module Aws::ServiceDiscovery
     #
     class DnsConfigChange < Struct.new(
       :dns_records)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that contains the ID for the Route 53 hosted zone that
+    # A complex type that contains the ID for the Route 53 hosted zone that
     # AWS Cloud Map creates when you create a namespace.
     #
     # @!attribute [rw] hosted_zone_id
-    #   The ID for the Route 53 hosted zone that AWS Cloud Map creates when
+    #   The ID for the Route 53 hosted zone that AWS Cloud Map creates when
     #   you create a namespace.
     #   @return [String]
     #
@@ -619,10 +696,11 @@ module Aws::ServiceDiscovery
     #
     class DnsProperties < Struct.new(
       :hosted_zone_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # A complex type that contains information about the Route 53 DNS
+    # A complex type that contains information about the Route 53 DNS
     # records that you want AWS Cloud Map to create when you register an
     # instance.
     #
@@ -636,110 +714,91 @@ module Aws::ServiceDiscovery
     #
     # @!attribute [rw] type
     #   The type of the resource, which indicates the type of value that
-    #   Route 53 returns in response to DNS queries. You can specify values
+    #   Route 53 returns in response to DNS queries. You can specify values
     #   for `Type` in the following combinations:
     #
-    #   * A
+    #   * `A`
     #
-    #   * AAAA
+    #   * `AAAA`
     #
-    #   * A and AAAA
+    #   * `A` and `AAAA`
     #
-    #   * SRV
+    #   * `SRV`
     #
-    #   * CNAME
+    #   * `CNAME`
     #
-    #   If you want AWS Cloud Map to create a Route 53 alias record when you
+    #   If you want AWS Cloud Map to create a Route 53 alias record when you
     #   register an instance, specify `A` or `AAAA` for `Type`.
     #
-    #   You specify other settings, such as the IP address for A and AAAA
-    #   records, when you register an instance. For more information, see
-    #   [RegisterInstance][1].
+    #   You specify other settings, such as the IP address for `A` and
+    #   `AAAA` records, when you register an instance. For more information,
+    #   see [RegisterInstance][1].
     #
     #   The following values are supported:
     #
-    #   **A**
-    #
-    #   Route 53 returns the IP address of the resource in IPv4 format, such
-    #   as 192.0.2.44.
-    #
-    #   **AAAA**
-    #
-    #   Route 53 returns the IP address of the resource in IPv6 format, such
-    #   as 2001:0db8:85a3:0000:0000:abcd:0001:2345.
-    #
-    #   **CNAME**
-    #
-    #   Route 53 returns the domain name of the resource, such as
-    #   www.example.com. Note the following:
-    #
-    #   * You specify the domain name that you want to route traffic to when
-    #     you register an instance. For more information, see
-    #     [Attributes][2] in the topic [RegisterInstance][1].
-    #
-    #   * You must specify `WEIGHTED` for the value of `RoutingPolicy`.
-    #
-    #   * You can't specify both `CNAME` for `Type` and settings for
-    #     `HealthCheckConfig`. If you do, the request will fail with an
-    #     `InvalidInput` error.
-    #
-    #   **SRV**
-    #
-    #   Route 53 returns the value for an SRV record. The value for an SRV
-    #   record uses the following values:
-    #
-    #   `priority weight port service-hostname`
-    #
-    #   Note the following about the values:
-    #
-    #   * The values of `priority` and `weight` are both set to `1` and
-    #     can't be changed.
-    #
-    #   * The value of `port` comes from the value that you specify for the
-    #     `AWS_INSTANCE_PORT` attribute when you submit a
-    #     [RegisterInstance][1] request.
-    #
-    #   * The value of `service-hostname` is a concatenation of the
-    #     following values:
-    #
-    #     * The value that you specify for `InstanceId` when you register an
-    #       instance.
-    #
-    #     * The name of the service.
-    #
-    #     * The name of the namespace.
-    #
-    #     For example, if the value of `InstanceId` is `test`, the name of
-    #     the service is `backend`, and the name of the namespace is
-    #     `example.com`, the value of `service-hostname` is:
-    #
-    #     `test.backend.example.com`
-    #
-    #   If you specify settings for an SRV record, note the following:
-    #
-    #   * If you specify values for `AWS_INSTANCE_IPV4`,
-    #     `AWS_INSTANCE_IPV6`, or both in the `RegisterInstance` request,
-    #     AWS Cloud Map automatically creates `A` and/or `AAAA` records that
-    #     have the same name as the value of `service-hostname` in the SRV
-    #     record. You can ignore these records.
-    #
-    #   * If you're using a system that requires a specific SRV format,
-    #     such as HAProxy, see the [Name][3] element in the documentation
-    #     about `CreateService` for information about how to specify the
-    #     correct name format.
+    #   `A` <b> <code> </b> </p> <p>Route 53 returns the IP address of the
+    #   resource in IPv4 format, such as 192.0.2.44.</p> <p>
+    #   <code>AAAA</code> <b> <code> </b> </p> <p>Route 53 returns the IP
+    #   address of the resource in IPv6 format, such as
+    #   2001:0db8:85a3:0000:0000:abcd:0001:2345.</p> <p> <code>CNAME</code>
+    #   <b> <code> </b> </p> <p>Route 53 returns the domain name of the
+    #   resource, such as www.example.com. Note the following:</p> <ul> <li>
+    #   <p>You specify the domain name that you want to route traffic to
+    #   when you register an instance. For more information, see <a
+    #   href="https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html#cloudmap-RegisterInstance-request-Attributes">Attributes</a>
+    #   in the topic <a
+    #   href="https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html">RegisterInstance</a>.</p>
+    #   </li> <li> <p>You must specify <code>WEIGHTED</code> for the value
+    #   of <code>RoutingPolicy</code>.</p> </li> <li> <p>You can't specify
+    #   both <code>CNAME</code> for <code>Type</code> and settings for
+    #   <code>HealthCheckConfig</code>. If you do, the request will fail
+    #   with an <code>InvalidInput</code> error.</p> </li> </ul> <p>
+    #   <b>SRV</b> </p> <p>Route 53 returns the value for an
+    #   <code>SRV</code> record. The value for an <code>SRV</code> record
+    #   uses the following values:</p> <p> <code>priority weight port
+    #   service-hostname</code> </p> <p>Note the following about the
+    #   values:</p> <ul> <li> <p>The values of <code>priority</code> and
+    #   <code>weight</code> are both set to <code>1</code> and can't be
+    #   changed. </p> </li> <li> <p>The value of <code>port</code> comes
+    #   from the value that you specify for the
+    #   <code>AWS_INSTANCE_PORT</code> attribute when you submit a <a
+    #   href="https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html">RegisterInstance</a>
+    #   request. </p> </li> <li> <p>The value of
+    #   <code>service-hostname</code> is a concatenation of the following
+    #   values:</p> <ul> <li> <p>The value that you specify for
+    #   <code>InstanceId</code> when you register an instance.</p> </li>
+    #   <li> <p>The name of the service.</p> </li> <li> <p>The name of the
+    #   namespace. </p> </li> </ul> <p>For example, if the value of
+    #   <code>InstanceId</code> is <code>test</code>, the name of the
+    #   service is <code>backend</code>, and the name of the namespace is
+    #   <code>example.com</code>, the value of <code>service-hostname</code>
+    #   is:</p> <p> <code>test.backend.example.com</code> </p> </li> </ul>
+    #   <p>If you specify settings for an <code>SRV</code> record, note the
+    #   following:</p> <ul> <li> <p>If you specify values for
+    #   <code>AWS_INSTANCE_IPV4</code>, <code>AWS_INSTANCE_IPV6</code>, or
+    #   both in the <code>RegisterInstance</code> request, AWS Cloud Map
+    #   automatically creates <code>A</code> and/or <code>AAAA</code>
+    #   records that have the same name as the value of
+    #   <code>service-hostname</code> in the <code>SRV</code> record. You
+    #   can ignore these records.</p> </li> <li> <p>If you're using a system
+    #   that requires a specific <code>SRV</code> format, such as HAProxy,
+    #   see the <a
+    #   href="https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html#cloudmap-CreateService-request-Name">Name</a>
+    #   element in the documentation about <code>CreateService</code> for
+    #   information about how to specify the correct name format.</p> </li>
+    #   </ul>
+    #   </code></b></p></code></b></p></code></b>
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html
-    #   [2]: https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html#cloudmap-RegisterInstance-request-Attributes
-    #   [3]: https://docs.aws.amazon.com/cloud-map/latest/api/API_CreateService.html#cloudmap-CreateService-request-Name
     #   @return [String]
     #
     # @!attribute [rw] ttl
     #   The amount of time, in seconds, that you want DNS resolvers to cache
     #   the settings for this record.
     #
-    #   <note markdown="1"> Alias records don't include a TTL because Route 53 uses the TTL for
+    #   <note markdown="1"> Alias records don't include a TTL because Route 53 uses the TTL for
     #   the AWS resource that an alias record routes traffic to. If you
     #   include the `AWS_ALIAS_DNS_NAME` attribute when you submit a
     #   [RegisterInstance][1] request, the `TTL` value is ignored. Always
@@ -758,6 +817,7 @@ module Aws::ServiceDiscovery
     class DnsRecord < Struct.new(
       :type,
       :ttl)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -775,6 +835,7 @@ module Aws::ServiceDiscovery
     class DuplicateRequest < Struct.new(
       :message,
       :duplicate_operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -799,6 +860,7 @@ module Aws::ServiceDiscovery
     class GetInstanceRequest < Struct.new(
       :service_id,
       :instance_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -810,6 +872,7 @@ module Aws::ServiceDiscovery
     #
     class GetInstanceResponse < Struct.new(
       :instance)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -867,6 +930,7 @@ module Aws::ServiceDiscovery
       :instances,
       :max_results,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -888,6 +952,7 @@ module Aws::ServiceDiscovery
     class GetInstancesHealthStatusResponse < Struct.new(
       :status,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -906,6 +971,7 @@ module Aws::ServiceDiscovery
     #
     class GetNamespaceRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -918,6 +984,7 @@ module Aws::ServiceDiscovery
     #
     class GetNamespaceResponse < Struct.new(
       :namespace)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -936,6 +1003,7 @@ module Aws::ServiceDiscovery
     #
     class GetOperationRequest < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -947,6 +1015,7 @@ module Aws::ServiceDiscovery
     #
     class GetOperationResponse < Struct.new(
       :operation)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -965,6 +1034,7 @@ module Aws::ServiceDiscovery
     #
     class GetServiceRequest < Struct.new(
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -976,6 +1046,7 @@ module Aws::ServiceDiscovery
     #
     class GetServiceResponse < Struct.new(
       :service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -987,21 +1058,21 @@ module Aws::ServiceDiscovery
     # If you specify a health check configuration, you can specify either
     # `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
     #
-    # Health checks are basic Route 53 health checks that monitor an AWS
+    # Health checks are basic Route 53 health checks that monitor an AWS
     # endpoint. For information about pricing for health checks, see [Amazon
-    # Route 53 Pricing][1].
+    # Route 53 Pricing][1].
     #
     # Note the following about configuring health checks.
     #
-    # **A and AAAA records**
+    # <b> <code>A</code> and <code>AAAA</code> records</b>
     #
-    # If `DnsConfig` includes configurations for both A and AAAA records,
-    # AWS Cloud Map creates a health check that uses the IPv4 address to
-    # check the health of the resource. If the endpoint that is specified by
-    # the IPv4 address is unhealthy, Route 53 considers both the A and AAAA
-    # records to be unhealthy.
+    # If `DnsConfig` includes configurations for both `A` and `AAAA`
+    # records, AWS Cloud Map creates a health check that uses the IPv4
+    # address to check the health of the resource. If the endpoint that is
+    # specified by the IPv4 address is unhealthy, Route 53 considers both
+    # the `A` and `AAAA` records to be unhealthy.
     #
-    # **CNAME records**
+    # <b> <code>CNAME</code> records</b>
     #
     # You can't specify settings for `HealthCheckConfig` when the
     # `DNSConfig` includes `CNAME` for the value of `Type`. If you do, the
@@ -1009,7 +1080,7 @@ module Aws::ServiceDiscovery
     #
     # **Request interval**
     #
-    # A Route 53 health checker in each health-checking region sends a
+    # A Route 53 health checker in each health-checking region sends a
     # health check request to an endpoint every 30 seconds. On average, your
     # endpoint receives a health check request about every two seconds.
     # However, health checkers don't coordinate with one another, so
@@ -1018,29 +1089,29 @@ module Aws::ServiceDiscovery
     #
     # **Health checking regions**
     #
-    # Health checkers perform checks from all Route 53 health-checking
+    # Health checkers perform checks from all Route 53 health-checking
     # regions. For a list of the current regions, see [Regions][2].
     #
     # **Alias records**
     #
     # When you register an instance, if you include the `AWS_ALIAS_DNS_NAME`
-    # attribute, AWS Cloud Map creates a Route 53 alias record. Note the
+    # attribute, AWS Cloud Map creates a Route 53 alias record. Note the
     # following:
     #
-    # * Route 53 automatically sets `EvaluateTargetHealth` to true for alias
+    # * Route 53 automatically sets `EvaluateTargetHealth` to true for alias
     #   records. When `EvaluateTargetHealth` is true, the alias record
     #   inherits the health of the referenced AWS resource. such as an ELB
     #   load balancer. For more information, see [EvaluateTargetHealth][3].
     #
     # * If you include `HealthCheckConfig` and then use the service to
-    #   register an instance that creates an alias record, Route 53 doesn't
+    #   register an instance that creates an alias record, Route 53 doesn't
     #   create the health check.
     #
     # **Charges for health checks**
     #
-    # Health checks are basic Route 53 health checks that monitor an AWS
+    # Health checks are basic Route 53 health checks that monitor an AWS
     # endpoint. For information about pricing for health checks, see [Amazon
-    # Route 53 Pricing][1].
+    # Route 53 Pricing][1].
     #
     #
     #
@@ -1059,31 +1130,31 @@ module Aws::ServiceDiscovery
     #
     # @!attribute [rw] type
     #   The type of health check that you want to create, which indicates
-    #   how Route 53 determines whether an endpoint is healthy.
+    #   how Route 53 determines whether an endpoint is healthy.
     #
     #   You can't change the value of `Type` after you create a health
     #   check.
     #
     #   You can create the following types of health checks:
     #
-    #   * **HTTP**\: Route 53 tries to establish a TCP connection. If
-    #     successful, Route 53 submits an HTTP request and waits for an HTTP
+    #   * **HTTP**\: Route 53 tries to establish a TCP connection. If
+    #     successful, Route 53 submits an HTTP request and waits for an HTTP
     #     status code of 200 or greater and less than 400.
     #
-    #   * **HTTPS**\: Route 53 tries to establish a TCP connection. If
-    #     successful, Route 53 submits an HTTPS request and waits for an
+    #   * **HTTPS**\: Route 53 tries to establish a TCP connection. If
+    #     successful, Route 53 submits an HTTPS request and waits for an
     #     HTTP status code of 200 or greater and less than 400.
     #
     #     If you specify HTTPS for the value of `Type`, the endpoint must
     #     support TLS v1.0 or later.
     #
-    #   * **TCP**\: Route 53 tries to establish a TCP connection.
+    #   * **TCP**\: Route 53 tries to establish a TCP connection.
     #
     #     If you specify `TCP` for `Type`, don't specify a value for
     #     `ResourcePath`.
     #
-    #   For more information, see [How Route 53 Determines Whether an
-    #   Endpoint Is Healthy][1] in the *Route 53 Developer Guide*.
+    #   For more information, see [How Route 53 Determines Whether an
+    #   Endpoint Is Healthy][1] in the *Route 53 Developer Guide*.
     #
     #
     #
@@ -1091,12 +1162,12 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] resource_path
-    #   The path that you want Route 53 to request when performing health
+    #   The path that you want Route 53 to request when performing health
     #   checks. The path can be any value for which your endpoint will
     #   return an HTTP status code of 2xx or 3xx when the endpoint is
-    #   healthy, such as the file `/docs/route53-health-check.html`. Route
-    #   53 automatically adds the DNS name for the service. If you don't
-    #   specify a value for `ResourcePath`, the default value is `/`.
+    #   healthy, such as the file `/docs/route53-health-check.html`.
+    #   Route 53 automatically adds the DNS name for the service. If you
+    #   don't specify a value for `ResourcePath`, the default value is `/`.
     #
     #   If you specify `TCP` for `Type`, you must *not* specify a value for
     #   `ResourcePath`.
@@ -1104,10 +1175,10 @@ module Aws::ServiceDiscovery
     #
     # @!attribute [rw] failure_threshold
     #   The number of consecutive health checks that an endpoint must pass
-    #   or fail for Route 53 to change the current status of the endpoint
+    #   or fail for Route 53 to change the current status of the endpoint
     #   from unhealthy to healthy or vice versa. For more information, see
-    #   [How Route 53 Determines Whether an Endpoint Is Healthy][1] in the
-    #   *Route 53 Developer Guide*.
+    #   [How Route 53 Determines Whether an Endpoint Is Healthy][1] in the
+    #   *Route 53 Developer Guide*.
     #
     #
     #
@@ -1120,6 +1191,7 @@ module Aws::ServiceDiscovery
       :type,
       :resource_path,
       :failure_threshold)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1209,6 +1281,7 @@ module Aws::ServiceDiscovery
     #
     class HealthCheckCustomConfig < Struct.new(
       :failure_threshold)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1253,6 +1326,7 @@ module Aws::ServiceDiscovery
       :service_name,
       :health_status,
       :attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1266,6 +1340,7 @@ module Aws::ServiceDiscovery
     #
     class HttpProperties < Struct.new(
       :http_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1277,8 +1352,8 @@ module Aws::ServiceDiscovery
     #   following:
     #
     #   * If the service that is specified by `ServiceId` includes settings
-    #     for an SRV record, the value of `InstanceId` is automatically
-    #     included as part of the value for the SRV record. For more
+    #     for an `SRV` record, the value of `InstanceId` is automatically
+    #     included as part of the value for the `SRV` record. For more
     #     information, see [DnsRecord &gt; Type][1].
     #
     #   * You can use this value to update an existing instance.
@@ -1328,7 +1403,7 @@ module Aws::ServiceDiscovery
     #
     #   ****
     #
-    #   If you want AWS Cloud Map to create a Route 53 alias record that
+    #   If you want AWS Cloud Map to create a Route 53 alias record that
     #   routes traffic to an Elastic Load Balancing load balancer, specify
     #   the DNS name that is associated with the load balancer. For
     #   information about how to get the DNS name, see "DNSName" in the
@@ -1337,7 +1412,8 @@ module Aws::ServiceDiscovery
     #   Note the following:
     #
     #   * The configuration for the service that is specified by `ServiceId`
-    #     must include settings for an A record, an AAAA record, or both.
+    #     must include settings for an `A` record, an `AAAA` record, or
+    #     both.
     #
     #   * In the service that is specified by `ServiceId`, the value of
     #     `RoutingPolicy` must be `WEIGHTED`.
@@ -1353,47 +1429,53 @@ module Aws::ServiceDiscovery
     #   * If you specify a value for `AWS_ALIAS_DNS_NAME`, don't specify
     #     values for any of the `AWS_INSTANCE` attributes.
     #
+    #   **AWS\_EC2\_INSTANCE\_ID**
+    #
+    #   *HTTP namespaces only.* The Amazon EC2 instance ID for the instance.
+    #   The `AWS_INSTANCE_IPV4` attribute contains the primary private IPv4
+    #   address.
+    #
     #   **AWS\_INSTANCE\_CNAME**
     #
-    #   If the service configuration includes a CNAME record, the domain
-    #   name that you want Route 53 to return in response to DNS queries,
+    #   If the service configuration includes a `CNAME` record, the domain
+    #   name that you want Route 53 to return in response to DNS queries,
     #   for example, `example.com`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an CNAME record.
+    #   includes settings for an `CNAME` record.
     #
     #   **AWS\_INSTANCE\_IPV4**
     #
-    #   If the service configuration includes an A record, the IPv4 address
-    #   that you want Route 53 to return in response to DNS queries, for
-    #   example, `192.0.2.44`.
+    #   If the service configuration includes an `A` record, the IPv4
+    #   address that you want Route 53 to return in response to DNS queries,
+    #   for example, `192.0.2.44`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an A record. If the service includes settings
-    #   for an SRV record, you must specify a value for `AWS_INSTANCE_IPV4`,
-    #   `AWS_INSTANCE_IPV6`, or both.
+    #   includes settings for an `A` record. If the service includes
+    #   settings for an `SRV` record, you must specify a value for
+    #   `AWS_INSTANCE_IPV4`, `AWS_INSTANCE_IPV6`, or both.
     #
     #   **AWS\_INSTANCE\_IPV6**
     #
-    #   If the service configuration includes an AAAA record, the IPv6
-    #   address that you want Route 53 to return in response to DNS queries,
+    #   If the service configuration includes an `AAAA` record, the IPv6
+    #   address that you want Route 53 to return in response to DNS queries,
     #   for example, `2001:0db8:85a3:0000:0000:abcd:0001:2345`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an AAAA record. If the service includes
-    #   settings for an SRV record, you must specify a value for
+    #   includes settings for an `AAAA` record. If the service includes
+    #   settings for an `SRV` record, you must specify a value for
     #   `AWS_INSTANCE_IPV4`, `AWS_INSTANCE_IPV6`, or both.
     #
     #   **AWS\_INSTANCE\_PORT**
     #
-    #   If the service includes an SRV record, the value that you want Route
-    #   53 to return for the port.
+    #   If the service includes an `SRV` record, the value that you want
+    #   Route 53 to return for the port.
     #
     #   If the service includes `HealthCheckConfig`, the port on the
-    #   endpoint that you want Route 53 to send requests to.
+    #   endpoint that you want Route 53 to send requests to.
     #
-    #   This value is required if you specified settings for an SRV record
-    #   or a Route 53 health check when you created the service.
+    #   This value is required if you specified settings for an `SRV` record
+    #   or a Route 53 health check when you created the service.
     #
     #
     #
@@ -1406,6 +1488,7 @@ module Aws::ServiceDiscovery
       :id,
       :creator_request_id,
       :attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1419,6 +1502,7 @@ module Aws::ServiceDiscovery
     #
     class InstanceNotFound < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1443,20 +1527,26 @@ module Aws::ServiceDiscovery
     #     an Elastic Load Balancing load balancer, the DNS name that is
     #     associated with the load balancer.
     #
-    #   * `AWS_INSTANCE_CNAME`\: For a CNAME record, the domain name that
-    #     Route 53 returns in response to DNS queries, for example,
+    #   * `AWS_EC2_INSTANCE_ID`\: (HTTP namespaces only) The Amazon EC2
+    #     instance ID for the instance. When the `AWS_EC2_INSTANCE_ID`
+    #     attribute is specified, then the `AWS_INSTANCE_IPV4` attribute
+    #     contains the primary private IPv4 address.
+    #
+    #   * `AWS_INSTANCE_CNAME`\: For a `CNAME` record, the domain name that
+    #     Route 53 returns in response to DNS queries, for example,
     #     `example.com`.
     #
-    #   * `AWS_INSTANCE_IPV4`\: For an A record, the IPv4 address that Route
-    #     53 returns in response to DNS queries, for example, `192.0.2.44`.
+    #   * `AWS_INSTANCE_IPV4`\: For an `A` record, the IPv4 address that
+    #     Route 53 returns in response to DNS queries, for example,
+    #     `192.0.2.44`.
     #
-    #   * `AWS_INSTANCE_IPV6`\: For an AAAA record, the IPv6 address that
-    #     Route 53 returns in response to DNS queries, for example,
+    #   * `AWS_INSTANCE_IPV6`\: For an `AAAA` record, the IPv6 address that
+    #     Route 53 returns in response to DNS queries, for example,
     #     `2001:0db8:85a3:0000:0000:abcd:0001:2345`.
     #
-    #   * `AWS_INSTANCE_PORT`\: For an SRV record, the value that Route 53
+    #   * `AWS_INSTANCE_PORT`\: For an `SRV` record, the value that Route 53
     #     returns for the port. In addition, if the service includes
-    #     `HealthCheckConfig`, the port on the endpoint that Route 53 sends
+    #     `HealthCheckConfig`, the port on the endpoint that Route 53 sends
     #     requests to.
     #   @return [Hash<String,String>]
     #
@@ -1465,6 +1555,7 @@ module Aws::ServiceDiscovery
     class InstanceSummary < Struct.new(
       :id,
       :attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1479,6 +1570,7 @@ module Aws::ServiceDiscovery
     #
     class InvalidInput < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1517,6 +1609,7 @@ module Aws::ServiceDiscovery
       :service_id,
       :next_token,
       :max_results)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1537,6 +1630,7 @@ module Aws::ServiceDiscovery
     class ListInstancesResponse < Struct.new(
       :instances,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1593,6 +1687,7 @@ module Aws::ServiceDiscovery
       :next_token,
       :max_results,
       :filters)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1621,6 +1716,7 @@ module Aws::ServiceDiscovery
     class ListNamespacesResponse < Struct.new(
       :namespaces,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1677,6 +1773,7 @@ module Aws::ServiceDiscovery
       :next_token,
       :max_results,
       :filters)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1705,6 +1802,7 @@ module Aws::ServiceDiscovery
     class ListOperationsResponse < Struct.new(
       :operations,
       :next_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1759,6 +1857,7 @@ module Aws::ServiceDiscovery
       :next_token,
       :max_results,
       :filters)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1786,6 +1885,39 @@ module Aws::ServiceDiscovery
     class ListServicesResponse < Struct.new(
       :services,
       :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass ListTagsForResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "AmazonResourceName", # required
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The Amazon Resource Name (ARN) of the resource that you want to
+    #   retrieve tags for.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/ListTagsForResourceRequest AWS API Documentation
+    #
+    class ListTagsForResourceRequest < Struct.new(
+      :resource_arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] tags
+    #   The tags that are assigned to the resource.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/ListTagsForResourceResponse AWS API Documentation
+    #
+    class ListTagsForResourceResponse < Struct.new(
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1857,6 +1989,7 @@ module Aws::ServiceDiscovery
       :properties,
       :create_date,
       :creator_request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1879,6 +2012,7 @@ module Aws::ServiceDiscovery
       :message,
       :creator_request_id,
       :namespace_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1927,6 +2061,7 @@ module Aws::ServiceDiscovery
       :name,
       :values,
       :condition)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1939,6 +2074,7 @@ module Aws::ServiceDiscovery
     #
     class NamespaceNotFound < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1946,7 +2082,7 @@ module Aws::ServiceDiscovery
     # namespace type.
     #
     # @!attribute [rw] dns_properties
-    #   A complex type that contains the ID for the Route 53 hosted zone
+    #   A complex type that contains the ID for the Route 53 hosted zone
     #   that AWS Cloud Map creates when you create a namespace.
     #   @return [Types::DnsProperties]
     #
@@ -1959,6 +2095,7 @@ module Aws::ServiceDiscovery
     class NamespaceProperties < Struct.new(
       :dns_properties,
       :http_properties)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1975,7 +2112,7 @@ module Aws::ServiceDiscovery
     #
     # @!attribute [rw] name
     #   The name of the namespace. When you create a namespace, AWS Cloud
-    #   Map automatically creates a Route 53 hosted zone that has the same
+    #   Map automatically creates a Route 53 hosted zone that has the same
     #   name as the namespace.
     #   @return [String]
     #
@@ -2011,6 +2148,7 @@ module Aws::ServiceDiscovery
       :service_count,
       :properties,
       :create_date)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2102,6 +2240,7 @@ module Aws::ServiceDiscovery
       :create_date,
       :update_date,
       :targets)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2179,6 +2318,7 @@ module Aws::ServiceDiscovery
       :name,
       :values,
       :condition)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2191,6 +2331,7 @@ module Aws::ServiceDiscovery
     #
     class OperationNotFound < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2225,6 +2366,7 @@ module Aws::ServiceDiscovery
     class OperationSummary < Struct.new(
       :id,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2250,8 +2392,8 @@ module Aws::ServiceDiscovery
     #   following:
     #
     #   * If the service that is specified by `ServiceId` includes settings
-    #     for an SRV record, the value of `InstanceId` is automatically
-    #     included as part of the value for the SRV record. For more
+    #     for an `SRV` record, the value of `InstanceId` is automatically
+    #     included as part of the value for the `SRV` record. For more
     #     information, see [DnsRecord &gt; Type][1].
     #
     #   * You can use this value to update an existing instance.
@@ -2302,33 +2444,42 @@ module Aws::ServiceDiscovery
     #
     #   **AWS\_ALIAS\_DNS\_NAME**
     #
-    #   ****
-    #
-    #   If you want AWS Cloud Map to create an Amazon Route 53 alias record
+    #   If you want AWS Cloud Map to create an Amazon Route 53 alias record
     #   that routes traffic to an Elastic Load Balancing load balancer,
     #   specify the DNS name that is associated with the load balancer. For
     #   information about how to get the DNS name, see "DNSName" in the
-    #   topic [AliasTarget][1] in the *Route 53 API Reference*.
+    #   topic [AliasTarget][1] in the *Route 53 API Reference*.
     #
     #   Note the following:
     #
     #   * The configuration for the service that is specified by `ServiceId`
-    #     must include settings for an A record, an AAAA record, or both.
+    #     must include settings for an `A` record, an `AAAA` record, or
+    #     both.
     #
     #   * In the service that is specified by `ServiceId`, the value of
     #     `RoutingPolicy` must be `WEIGHTED`.
     #
     #   * If the service that is specified by `ServiceId` includes
-    #     `HealthCheckConfig` settings, AWS Cloud Map will create the Route
-    #     53 health check, but it won't associate the health check with the
-    #     alias record.
+    #     `HealthCheckConfig` settings, AWS Cloud Map will create the
+    #     Route 53 health check, but it won't associate the health check
+    #     with the alias record.
     #
     #   * Auto naming currently doesn't support creating alias records that
-    #     route traffic to AWS resources other than ELB load balancers.
+    #     route traffic to AWS resources other than Elastic Load Balancing
+    #     load balancers.
     #
     #   * If you specify a value for `AWS_ALIAS_DNS_NAME`, don't specify
     #     values for any of the `AWS_INSTANCE` attributes.
     #
+    #   **AWS\_EC2\_INSTANCE\_ID**
+    #
+    #   *HTTP namespaces only.* The Amazon EC2 instance ID for the instance.
+    #   If the `AWS_EC2_INSTANCE_ID` attribute is specified, then the only
+    #   other attribute that can be specified is `AWS_INIT_HEALTH_STATUS`.
+    #   When the `AWS_EC2_INSTANCE_ID` attribute is specified, then the
+    #   `AWS_INSTANCE_IPV4` attribute will be filled out with the primary
+    #   private IPv4 address.
+    #
     #   **AWS\_INIT\_HEALTH\_STATUS**
     #
     #   If the service configuration includes `HealthCheckCustomConfig`, you
@@ -2339,51 +2490,53 @@ module Aws::ServiceDiscovery
     #
     #   **AWS\_INSTANCE\_CNAME**
     #
-    #   If the service configuration includes a CNAME record, the domain
-    #   name that you want Route 53 to return in response to DNS queries,
+    #   If the service configuration includes a `CNAME` record, the domain
+    #   name that you want Route 53 to return in response to DNS queries,
     #   for example, `example.com`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an CNAME record.
+    #   includes settings for an `CNAME` record.
     #
     #   **AWS\_INSTANCE\_IPV4**
     #
-    #   If the service configuration includes an A record, the IPv4 address
-    #   that you want Route 53 to return in response to DNS queries, for
-    #   example, `192.0.2.44`.
+    #   If the service configuration includes an `A` record, the IPv4
+    #   address that you want Route 53 to return in response to DNS queries,
+    #   for example, `192.0.2.44`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an A record. If the service includes settings
-    #   for an SRV record, you must specify a value for `AWS_INSTANCE_IPV4`,
-    #   `AWS_INSTANCE_IPV6`, or both.
+    #   includes settings for an `A` record. If the service includes
+    #   settings for an `SRV` record, you must specify a value for
+    #   `AWS_INSTANCE_IPV4`, `AWS_INSTANCE_IPV6`, or both.
     #
     #   **AWS\_INSTANCE\_IPV6**
     #
-    #   If the service configuration includes an AAAA record, the IPv6
-    #   address that you want Route 53 to return in response to DNS queries,
+    #   If the service configuration includes an `AAAA` record, the IPv6
+    #   address that you want Route 53 to return in response to DNS queries,
     #   for example, `2001:0db8:85a3:0000:0000:abcd:0001:2345`.
     #
     #   This value is required if the service specified by `ServiceId`
-    #   includes settings for an AAAA record. If the service includes
-    #   settings for an SRV record, you must specify a value for
+    #   includes settings for an `AAAA` record. If the service includes
+    #   settings for an `SRV` record, you must specify a value for
     #   `AWS_INSTANCE_IPV4`, `AWS_INSTANCE_IPV6`, or both.
     #
     #   **AWS\_INSTANCE\_PORT**
     #
-    #   If the service includes an SRV record, the value that you want Route
-    #   53 to return for the port.
+    #   If the service includes an `SRV` record, the value that you want
+    #   Route 53 to return for the port.
     #
     #   If the service includes `HealthCheckConfig`, the port on the
-    #   endpoint that you want Route 53 to send requests to.
+    #   endpoint that you want Route 53 to send requests to.
     #
-    #   This value is required if you specified settings for an SRV record
-    #   or a Route 53 health check when you created the service.
+    #   This value is required if you specified settings for an `SRV` record
+    #   or a Route 53 health check when you created the service.
     #
     #   **Custom attributes**
     #
     #   You can add up to 30 custom attributes. For each key-value pair, the
     #   maximum length of the attribute name is 255 characters, and the
-    #   maximum length of the attribute value is 1,024 characters.
+    #   maximum length of the attribute value is 1,024 characters. The total
+    #   size of all provided attributes (sum of all keys and values) must
+    #   not exceed 5,000 characters.
     #
     #
     #
@@ -2397,6 +2550,7 @@ module Aws::ServiceDiscovery
       :instance_id,
       :creator_request_id,
       :attributes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2414,6 +2568,27 @@ module Aws::ServiceDiscovery
     #
     class RegisterInstanceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The operation can't be completed because you've reached the quota
+    # for the number of requests. For more information, see [AWS Cloud Map
+    # API request throttling quota][1] in the *AWS Cloud Map Developer
+    # Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/cloud-map/latest/dg/throttling.html
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/RequestLimitExceeded AWS API Documentation
+    #
+    class RequestLimitExceeded < Struct.new(
+      :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2428,10 +2603,11 @@ module Aws::ServiceDiscovery
     #
     class ResourceInUse < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
-    # The resource can't be created because you've reached the limit on
+    # The resource can't be created because you've reached the quota on
     # the number of resources.
     #
     # @!attribute [rw] message
@@ -2441,6 +2617,20 @@ module Aws::ServiceDiscovery
     #
     class ResourceLimitExceeded < Struct.new(
       :message)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The operation can't be completed because the resource was not found.
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/ResourceNotFoundException AWS API Documentation
+    #
+    class ResourceNotFoundException < Struct.new(
+      :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2476,7 +2666,7 @@ module Aws::ServiceDiscovery
     #   @return [Integer]
     #
     # @!attribute [rw] dns_config
-    #   A complex type that contains information about the Route 53 DNS
+    #   A complex type that contains information about the Route 53 DNS
     #   records that you want AWS Cloud Map to create when you register an
     #   instance.
     #   @return [Types::DnsConfig]
@@ -2488,7 +2678,7 @@ module Aws::ServiceDiscovery
     #   records that you specify in `DnsConfig`.
     #
     #   For information about the charges for health checks, see [Amazon
-    #   Route 53 Pricing][1].
+    #   Route 53 Pricing][1].
     #
     #
     #
@@ -2531,6 +2721,7 @@ module Aws::ServiceDiscovery
       :health_check_custom_config,
       :create_date,
       :creator_request_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2554,6 +2745,7 @@ module Aws::ServiceDiscovery
       :message,
       :creator_request_id,
       :service_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2564,7 +2756,7 @@ module Aws::ServiceDiscovery
     #
     #       {
     #         description: "ResourceDescription",
-    #         dns_config: { # required
+    #         dns_config: {
     #           dns_records: [ # required
     #             {
     #               type: "SRV", # required, accepts SRV, A, AAAA, CNAME
@@ -2584,7 +2776,7 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] dns_config
-    #   A complex type that contains information about the Route 53 DNS
+    #   A complex type that contains information about the Route 53 DNS
     #   records that you want AWS Cloud Map to create when you register an
     #   instance.
     #   @return [Types::DnsConfigChange]
@@ -2598,21 +2790,21 @@ module Aws::ServiceDiscovery
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
     #
-    #   Health checks are basic Route 53 health checks that monitor an AWS
+    #   Health checks are basic Route 53 health checks that monitor an AWS
     #   endpoint. For information about pricing for health checks, see
-    #   [Amazon Route 53 Pricing][1].
+    #   [Amazon Route 53 Pricing][1].
     #
     #   Note the following about configuring health checks.
     #
-    #   **A and AAAA records**
+    #   <b> <code>A</code> and <code>AAAA</code> records</b>
     #
-    #   If `DnsConfig` includes configurations for both A and AAAA records,
-    #   AWS Cloud Map creates a health check that uses the IPv4 address to
-    #   check the health of the resource. If the endpoint that is specified
-    #   by the IPv4 address is unhealthy, Route 53 considers both the A and
-    #   AAAA records to be unhealthy.
+    #   If `DnsConfig` includes configurations for both `A` and `AAAA`
+    #   records, AWS Cloud Map creates a health check that uses the IPv4
+    #   address to check the health of the resource. If the endpoint that is
+    #   specified by the IPv4 address is unhealthy, Route 53 considers both
+    #   the `A` and `AAAA` records to be unhealthy.
     #
-    #   **CNAME records**
+    #   <b> <code>CNAME</code> records</b>
     #
     #   You can't specify settings for `HealthCheckConfig` when the
     #   `DNSConfig` includes `CNAME` for the value of `Type`. If you do, the
@@ -2620,7 +2812,7 @@ module Aws::ServiceDiscovery
     #
     #   **Request interval**
     #
-    #   A Route 53 health checker in each health-checking region sends a
+    #   A Route 53 health checker in each health-checking region sends a
     #   health check request to an endpoint every 30 seconds. On average,
     #   your endpoint receives a health check request about every two
     #   seconds. However, health checkers don't coordinate with one
@@ -2629,30 +2821,30 @@ module Aws::ServiceDiscovery
     #
     #   **Health checking regions**
     #
-    #   Health checkers perform checks from all Route 53 health-checking
+    #   Health checkers perform checks from all Route 53 health-checking
     #   regions. For a list of the current regions, see [Regions][2].
     #
     #   **Alias records**
     #
     #   When you register an instance, if you include the
-    #   `AWS_ALIAS_DNS_NAME` attribute, AWS Cloud Map creates a Route 53
+    #   `AWS_ALIAS_DNS_NAME` attribute, AWS Cloud Map creates a Route 53
     #   alias record. Note the following:
     #
-    #   * Route 53 automatically sets `EvaluateTargetHealth` to true for
+    #   * Route 53 automatically sets `EvaluateTargetHealth` to true for
     #     alias records. When `EvaluateTargetHealth` is true, the alias
     #     record inherits the health of the referenced AWS resource. such as
     #     an ELB load balancer. For more information, see
     #     [EvaluateTargetHealth][3].
     #
     #   * If you include `HealthCheckConfig` and then use the service to
-    #     register an instance that creates an alias record, Route 53
+    #     register an instance that creates an alias record, Route 53
     #     doesn't create the health check.
     #
     #   **Charges for health checks**
     #
-    #   Health checks are basic Route 53 health checks that monitor an AWS
+    #   Health checks are basic Route 53 health checks that monitor an AWS
     #   endpoint. For information about pricing for health checks, see
-    #   [Amazon Route 53 Pricing][1].
+    #   [Amazon Route 53 Pricing][1].
     #
     #
     #
@@ -2667,6 +2859,7 @@ module Aws::ServiceDiscovery
       :description,
       :dns_config,
       :health_check_config)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2712,6 +2905,7 @@ module Aws::ServiceDiscovery
       :name,
       :values,
       :condition)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2724,6 +2918,7 @@ module Aws::ServiceDiscovery
     #
     class ServiceNotFound < Struct.new(
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2755,7 +2950,7 @@ module Aws::ServiceDiscovery
     #   @return [Integer]
     #
     # @!attribute [rw] dns_config
-    #   A complex type that contains information about the Amazon Route 53
+    #   A complex type that contains information about the Amazon Route 53
     #   DNS records that you want AWS Cloud Map to create when you register
     #   an instance.
     #   @return [Types::DnsConfig]
@@ -2769,21 +2964,21 @@ module Aws::ServiceDiscovery
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
     #
-    #   Health checks are basic Route 53 health checks that monitor an AWS
+    #   Health checks are basic Route 53 health checks that monitor an AWS
     #   endpoint. For information about pricing for health checks, see
-    #   [Amazon Route 53 Pricing][1].
+    #   [Amazon Route 53 Pricing][1].
     #
     #   Note the following about configuring health checks.
     #
-    #   **A and AAAA records**
+    #   <b> <code>A</code> and <code>AAAA</code> records</b>
     #
-    #   If `DnsConfig` includes configurations for both A and AAAA records,
-    #   AWS Cloud Map creates a health check that uses the IPv4 address to
-    #   check the health of the resource. If the endpoint that is specified
-    #   by the IPv4 address is unhealthy, Route 53 considers both the A and
-    #   AAAA records to be unhealthy.
+    #   If `DnsConfig` includes configurations for both `A` and `AAAA`
+    #   records, AWS Cloud Map creates a health check that uses the IPv4
+    #   address to check the health of the resource. If the endpoint that is
+    #   specified by the IPv4 address is unhealthy, Route 53 considers both
+    #   the `A` and `AAAA` records to be unhealthy.
     #
-    #   **CNAME records**
+    #   <b> <code>CNAME</code> records</b>
     #
     #   You can't specify settings for `HealthCheckConfig` when the
     #   `DNSConfig` includes `CNAME` for the value of `Type`. If you do, the
@@ -2791,7 +2986,7 @@ module Aws::ServiceDiscovery
     #
     #   **Request interval**
     #
-    #   A Route 53 health checker in each health-checking region sends a
+    #   A Route 53 health checker in each health-checking region sends a
     #   health check request to an endpoint every 30 seconds. On average,
     #   your endpoint receives a health check request about every two
     #   seconds. However, health checkers don't coordinate with one
@@ -2800,30 +2995,30 @@ module Aws::ServiceDiscovery
     #
     #   **Health checking regions**
     #
-    #   Health checkers perform checks from all Route 53 health-checking
+    #   Health checkers perform checks from all Route 53 health-checking
     #   regions. For a list of the current regions, see [Regions][2].
     #
     #   **Alias records**
     #
     #   When you register an instance, if you include the
-    #   `AWS_ALIAS_DNS_NAME` attribute, AWS Cloud Map creates a Route 53
+    #   `AWS_ALIAS_DNS_NAME` attribute, AWS Cloud Map creates a Route 53
     #   alias record. Note the following:
     #
-    #   * Route 53 automatically sets `EvaluateTargetHealth` to true for
+    #   * Route 53 automatically sets `EvaluateTargetHealth` to true for
     #     alias records. When `EvaluateTargetHealth` is true, the alias
     #     record inherits the health of the referenced AWS resource. such as
     #     an ELB load balancer. For more information, see
     #     [EvaluateTargetHealth][3].
     #
     #   * If you include `HealthCheckConfig` and then use the service to
-    #     register an instance that creates an alias record, Route 53
+    #     register an instance that creates an alias record, Route 53
     #     doesn't create the health check.
     #
     #   **Charges for health checks**
     #
-    #   Health checks are basic Route 53 health checks that monitor an AWS
+    #   Health checks are basic Route 53 health checks that monitor an AWS
     #   endpoint. For information about pricing for health checks, see
-    #   [Amazon Route 53 Pricing][1].
+    #   [Amazon Route 53 Pricing][1].
     #
     #
     #
@@ -2909,9 +3104,125 @@ module Aws::ServiceDiscovery
       :health_check_config,
       :health_check_custom_config,
       :create_date)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A custom key-value pair associated with a resource.
+    #
+    # @note When making an API call, you may pass Tag
+    #   data as a hash:
+    #
+    #       {
+    #         key: "TagKey", # required
+    #         value: "TagValue", # required
+    #       }
+    #
+    # @!attribute [rw] key
+    #   The key identifier, or name, of the tag.
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   The string value associated with the key of the tag. You can set the
+    #   value of a tag to an empty string, but you can't set the value of a
+    #   tag to null.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/Tag AWS API Documentation
+    #
+    class Tag < Struct.new(
+      :key,
+      :value)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass TagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "AmazonResourceName", # required
+    #         tags: [ # required
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The Amazon Resource Name (ARN) of the resource that you want to
+    #   retrieve tags for.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The tags to add to the specified resource. Specifying the tag key is
+    #   required. You can set the value of a tag to an empty string, but you
+    #   can't set the value of a tag to null.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/TagResourceRequest AWS API Documentation
+    #
+    class TagResourceRequest < Struct.new(
+      :resource_arn,
+      :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/TagResourceResponse AWS API Documentation
+    #
+    class TagResourceResponse < Aws::EmptyStructure; end
+
+    # The list of tags on the resource is over the quota. The maximum number
+    # of tags that can be applied to a resource is 50.
+    #
+    # @!attribute [rw] message
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_name
+    #   The name of the resource.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/TooManyTagsException AWS API Documentation
+    #
+    class TooManyTagsException < Struct.new(
+      :message,
+      :resource_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass UntagResourceRequest
+    #   data as a hash:
+    #
+    #       {
+    #         resource_arn: "AmazonResourceName", # required
+    #         tag_keys: ["TagKey"], # required
+    #       }
+    #
+    # @!attribute [rw] resource_arn
+    #   The Amazon Resource Name (ARN) of the resource that you want to
+    #   retrieve tags for.
+    #   @return [String]
+    #
+    # @!attribute [rw] tag_keys
+    #   The tag keys to remove from the specified resource.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/UntagResourceRequest AWS API Documentation
+    #
+    class UntagResourceRequest < Struct.new(
+      :resource_arn,
+      :tag_keys)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/UntagResourceResponse AWS API Documentation
+    #
+    class UntagResourceResponse < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass UpdateInstanceCustomHealthStatusRequest
     #   data as a hash:
     #
@@ -2941,6 +3252,7 @@ module Aws::ServiceDiscovery
       :service_id,
       :instance_id,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2951,7 +3263,7 @@ module Aws::ServiceDiscovery
     #         id: "ResourceId", # required
     #         service: { # required
     #           description: "ResourceDescription",
-    #           dns_config: { # required
+    #           dns_config: {
     #             dns_records: [ # required
     #               {
     #                 type: "SRV", # required, accepts SRV, A, AAAA, CNAME
@@ -2980,6 +3292,7 @@ module Aws::ServiceDiscovery
     class UpdateServiceRequest < Struct.new(
       :id,
       :service)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2997,6 +3310,7 @@ module Aws::ServiceDiscovery
     #
     class UpdateServiceResponse < Struct.new(
       :operation_id)
+      SENSITIVE = []
       include Aws::Structure
     end