aws-sdk-servicediscovery 1.20.0 → 1.25.1

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

@@ -11,6 +11,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 +35,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 +80,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 +112,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 +131,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 +152,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 +162,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 +171,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 +184,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 +213,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 +357,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 +443,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 +474,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 +501,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 +566,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 +579,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 +592,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 +605,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 +656,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 +778,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 +801,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

@@ -32,10 +32,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 +166,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 +211,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 +266,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

@@ -6,13 +6,7 @@
 # WARNING ABOUT GENERATED CODE
 
 module Aws::ServiceDiscovery
-  # This class provides a resource oriented interface for ServiceDiscovery.
-  # To create a resource object:
-  #     resource = Aws::ServiceDiscovery::Resource.new(region: 'us-west-2')
-  # You can supply a client object with custom configuration that will be used for all resource operations.
-  # If you do not pass +:client+, a default client will be constructed.
-  #     client = Aws::ServiceDiscovery::Client.new(region: 'us-west-2')
-  #     resource = Aws::ServiceDiscovery::Resource.new(client: client)
+
   class Resource
 
     # @param options ({})

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

@@ -15,6 +15,12 @@ module Aws::ServiceDiscovery
     #         name: "NamespaceName", # required
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -35,18 +41,31 @@ 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)
       include Aws::Structure
     end
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreateHttpNamespaceResponse AWS API Documentation
@@ -64,6 +83,12 @@ module Aws::ServiceDiscovery
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
     #         vpc: "ResourceId", # required
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -92,19 +117,32 @@ 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)
       include Aws::Structure
     end
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreatePrivateDnsNamespaceResponse AWS API Documentation
@@ -121,6 +159,12 @@ module Aws::ServiceDiscovery
     #         name: "NamespaceName", # required
     #         creator_request_id: "ResourceId",
     #         description: "ResourceDescription",
+    #         tags: [
+    #           {
+    #             key: "TagKey", # required
+    #             value: "TagValue", # required
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] name
@@ -141,18 +185,31 @@ 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)
       include Aws::Structure
     end
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/CreatePublicDnsNamespaceResponse AWS API Documentation
@@ -188,10 +245,34 @@ 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`\:
+    #
+    #   * 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
+    #   and assigns a name to the record by concatenating the service name
+    #   and the namespace name, for example:
+    #
+    #   `_exampleservice._tcp.example.com`
+    #
+    #
+    #
+    #   [1]: http://www.haproxy.org/
     #   @return [String]
     #
     # @!attribute [rw] namespace_id
@@ -219,10 +300,11 @@ module Aws::ServiceDiscovery
     #   @return [Types::DnsConfig]
     #
     # @!attribute [rw] health_check_config
-    #   *Public DNS namespaces only.* A complex type that contains 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 `DnsConfig`.
+    #   *Public DNS and HTTP namespaces only.* A complex type that contains
+    #   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
+    #   `DnsConfig`.
     #
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
@@ -241,8 +323,18 @@ module Aws::ServiceDiscovery
     #
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
+    #
+    #   You can't add, update, or delete a `HealthCheckCustomConfig`
+    #   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(
@@ -252,7 +344,8 @@ module Aws::ServiceDiscovery
       :description,
       :dns_config,
       :health_check_config,
-      :health_check_custom_config)
+      :health_check_custom_config,
+      :tags)
       include Aws::Structure
     end
 
@@ -300,7 +393,12 @@ module Aws::ServiceDiscovery
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/DeleteNamespaceResponse AWS API Documentation
@@ -345,8 +443,12 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] instance_id
-    #   The value that you specified for `Id` in the RegisterInstance
+    #   The value that you specified for `Id` in the [RegisterInstance][1]
     #   request.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/DeregisterInstanceRequest AWS API Documentation
@@ -359,7 +461,11 @@ module Aws::ServiceDiscovery
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. For more information, see GetOperation.
+    #   successfully. For more information, see [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/DeregisterInstanceResponse AWS API Documentation
@@ -393,9 +499,10 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] max_results
-    #   The maximum number of instances that you want Cloud Map to return in
-    #   the response to a `DiscoverInstances` request. If you don't specify
-    #   a value for `MaxResults`, Cloud Map returns up to 100 instances.
+    #   The maximum number of instances that you want AWS Cloud Map to
+    #   return in the response to a `DiscoverInstances` request. If you
+    #   don't specify a value for `MaxResults`, AWS Cloud Map returns up to
+    #   100 instances.
     #   @return [Integer]
     #
     # @!attribute [rw] query_parameters
@@ -509,8 +616,8 @@ module Aws::ServiceDiscovery
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-multivalue
-    #   [2]: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted
+    #   [1]: https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-multivalue
+    #   [2]: https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted
     #   @return [String]
     #
     # @!attribute [rw] dns_records
@@ -585,25 +692,25 @@ 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.
+    #   Route 53 returns in response to DNS queries. You can specify values
+    #   for `Type` in the following combinations:
     #
-    #   Note the following:
+    #   * A
+    #
+    #   * AAAA
     #
-    #   * **A, AAAA, and SRV records:** You can specify settings for a
-    #     maximum of one A, one AAAA, and one SRV record. You can specify
-    #     them in any combination.
+    #   * A and AAAA
     #
-    #   * **CNAME records:** If you specify `CNAME` for `Type`, you can't
-    #     define any other records. This is a limitation of DNS: you can't
-    #     create a CNAME record and any other type of record that has the
-    #     same name as a CNAME record.
+    #   * SRV
     #
-    #   * **Alias records:** If you want AWS Cloud Map to create a Route 53
-    #     alias record when you register an instance, specify `A` or `AAAA`
-    #     for `Type`.
+    #   * CNAME
     #
-    #   * **All records:** You specify settings other than `TTL` and `Type`
-    #     when you register an instance.
+    #   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].
     #
     #   The following values are supported:
     #
@@ -624,7 +731,7 @@ module Aws::ServiceDiscovery
     #
     #   * You specify the domain name that you want to route traffic to when
     #     you register an instance. For more information, see
-    #     RegisterInstanceRequest$Attributes.
+    #     [Attributes][2] in the topic [RegisterInstance][1].
     #
     #   * You must specify `WEIGHTED` for the value of `RoutingPolicy`.
     #
@@ -645,8 +752,8 @@ module Aws::ServiceDiscovery
     #     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
-    #     request.
+    #     `AWS_INSTANCE_PORT` attribute when you submit a
+    #     [RegisterInstance][1] request.
     #
     #   * The value of `service-hostname` is a concatenation of the
     #     following values:
@@ -664,11 +771,24 @@ module Aws::ServiceDiscovery
     #
     #     `test.backend.example.com`
     #
-    #   If you specify settings for an SRV record and 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 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.
+    #
+    #
+    #
+    #   [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
@@ -678,11 +798,15 @@ module Aws::ServiceDiscovery
     #   <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 request, the `TTL` value is ignored. Always specify
-    #   a TTL for the service; you can use a service to register instances
-    #   that create either alias or non-alias records.
+    #   [RegisterInstance][1] request, the `TTL` value is ignored. Always
+    #   specify a TTL for the service; you can use a service to register
+    #   instances that create either alias or non-alias records.
     #
     #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_RegisterInstance.html
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/DnsRecord AWS API Documentation
@@ -767,9 +891,13 @@ module Aws::ServiceDiscovery
     #   all the instances that are associated with the specified service.
     #
     #   <note markdown="1"> To get the IDs for the instances that you've registered by using a
-    #   specified service, submit a ListInstances request.
+    #   specified service, submit a [ListInstances][1] request.
     #
     #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_ListInstances.html
     #   @return [Array<String>]
     #
     # @!attribute [rw] max_results
@@ -907,10 +1035,10 @@ module Aws::ServiceDiscovery
       include Aws::Structure
     end
 
-    # *Public DNS namespaces only.* A complex type that contains settings
-    # for an optional health check. If you specify settings for a health
-    # check, AWS Cloud Map associates the health check with the records that
-    # you specify in `DnsConfig`.
+    # *Public DNS and HTTP namespaces only.* A complex type that contains
+    # settings for an optional health check. If you specify settings for a
+    # health check, AWS Cloud Map associates the health check with the
+    # records that you specify in `DnsConfig`.
     #
     # If you specify a health check configuration, you can specify either
     # `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
@@ -973,8 +1101,8 @@ module Aws::ServiceDiscovery
     #
     #
     # [1]: http://aws.amazon.com/route53/pricing/
-    # [2]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
-    # [3]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
+    # [2]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
+    # [3]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
     #
     # @note When making an API call, you may pass HealthCheckConfig
     #   data as a hash:
@@ -1015,7 +1143,7 @@ module Aws::ServiceDiscovery
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html
+    #   [1]: https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html
     #   @return [String]
     #
     # @!attribute [rw] resource_path
@@ -1039,7 +1167,7 @@ module Aws::ServiceDiscovery
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html
+    #   [1]: https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/HealthCheckConfig AWS API Documentation
@@ -1069,9 +1197,9 @@ module Aws::ServiceDiscovery
     # `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
     #
     # To change the status of a custom health check, submit an
-    # `UpdateInstanceCustomHealthStatus` request. Cloud Map doesn't monitor
-    # the status of the resource, it just keeps a record of the status
-    # specified in the most recent `UpdateInstanceCustomHealthStatus`
+    # `UpdateInstanceCustomHealthStatus` request. AWS Cloud Map doesn't
+    # monitor the status of the resource, it just keeps a record of the
+    # status specified in the most recent `UpdateInstanceCustomHealthStatus`
     # request.
     #
     # Here's how custom health checks work:
@@ -1080,9 +1208,9 @@ module Aws::ServiceDiscovery
     #
     #     The failure threshold indicates the number of 30-second intervals
     #     you want AWS Cloud Map to wait between the time that your
-    #     application sends an UpdateInstanceCustomHealthStatus request and
-    #     the time that AWS Cloud Map stops routing internet traffic to the
-    #     corresponding resource.
+    #     application sends an [UpdateInstanceCustomHealthStatus][1] request
+    #     and the time that AWS Cloud Map stops routing internet traffic to
+    #     the corresponding resource.
     #
     # 2.  You register an instance.
     #
@@ -1105,7 +1233,9 @@ module Aws::ServiceDiscovery
     #     arrive during that time to change the status back to healthy, AWS
     #     Cloud Map stops routing traffic to the resource.
     #
-    # Note the following about configuring custom health checks.
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_UpdateInstanceCustomHealthStatus.html
     #
     # @note When making an API call, you may pass HealthCheckCustomConfig
     #   data as a hash:
@@ -1115,18 +1245,18 @@ module Aws::ServiceDiscovery
     #       }
     #
     # @!attribute [rw] failure_threshold
-    #   The number of 30-second intervals that you want Cloud Map to wait
-    #   after receiving an `UpdateInstanceCustomHealthStatus` request before
-    #   it changes the health status of a service instance. For example,
-    #   suppose you specify a value of `2` for `FailureTheshold`, and then
-    #   your application sends an `UpdateInstanceCustomHealthStatus`
-    #   request. Cloud Map waits for approximately 60 seconds (2 x 30)
-    #   before changing the status of the service instance based on that
-    #   request.
+    #   The number of 30-second intervals that you want AWS Cloud Map to
+    #   wait after receiving an `UpdateInstanceCustomHealthStatus` request
+    #   before it changes the health status of a service instance. For
+    #   example, suppose you specify a value of `2` for `FailureTheshold`,
+    #   and then your application sends an
+    #   `UpdateInstanceCustomHealthStatus` request. AWS Cloud Map waits for
+    #   approximately 60 seconds (2 x 30) before changing the status of the
+    #   service instance based on that request.
     #
     #   Sending a second or subsequent `UpdateInstanceCustomHealthStatus`
     #   request with the same value before `FailureThreshold x 30` seconds
-    #   has passed doesn't accelerate the change. Cloud Map still waits
+    #   has passed doesn't accelerate the change. AWS Cloud Map still waits
     #   `FailureThreshold x 30` seconds after the first request to make the
     #   change.
     #   @return [Integer]
@@ -1138,9 +1268,13 @@ module Aws::ServiceDiscovery
       include Aws::Structure
     end
 
-    # In a response to a DiscoverInstance request, `HttpInstanceSummary`
-    # contains information about one instance that matches the values that
-    # you specified in the request.
+    # In a response to a [DiscoverInstances][1] request,
+    # `HttpInstanceSummary` contains information about one instance that
+    # matches the values that you specified in the request.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html
     #
     # @!attribute [rw] instance_id
     #   The ID of an instance that matches the values that you specified in
@@ -1201,7 +1335,7 @@ module Aws::ServiceDiscovery
     #   * 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
-    #     information, see DnsRecord$Type.
+    #     information, see [DnsRecord &gt; Type][1].
     #
     #   * You can use this value to update an existing instance.
     #
@@ -1219,6 +1353,10 @@ module Aws::ServiceDiscovery
     #     example.
     #
     #      </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_DnsRecord.html#cloudmap-Type-DnsRecord-Type
     #   @return [String]
     #
     # @!attribute [rw] creator_request_id
@@ -1311,11 +1449,11 @@ module Aws::ServiceDiscovery
     #   endpoint that you want Route 53 to send requests to.
     #
     #   This value is required if you specified settings for an SRV record
-    #   when you created the service.
+    #   or a Route 53 health check when you created the service.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html
+    #   [1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/Instance AWS API Documentation
@@ -1707,6 +1845,36 @@ module Aws::ServiceDiscovery
       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)
+      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)
+      include Aws::Structure
+    end
+
     # A complex type that contains information about a specified namespace.
     #
     # @!attribute [rw] id
@@ -1723,8 +1891,17 @@ module Aws::ServiceDiscovery
     #   @return [String]
     #
     # @!attribute [rw] type
-    #   The type of the namespace. Valid values are `DNS_PUBLIC` and
-    #   `DNS_PRIVATE`.
+    #   The type of the namespace. The methods for discovering instances
+    #   depends on the value that you specify:
+    #
+    #   * `HTTP`\: Instances can be discovered only programmatically, using
+    #     the AWS Cloud Map `DiscoverInstances` API.
+    #
+    #   * `DNS_PUBLIC`\: Instances can be discovered using public DNS
+    #     queries and using the `DiscoverInstances` API.
+    #
+    #   * `DNS_PRIVATE`\: Instances can be discovered using DNS queries in
+    #     VPCs and using the `DiscoverInstances` API.
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -2104,7 +2281,12 @@ module Aws::ServiceDiscovery
     end
 
     # A complex type that contains information about an operation that
-    # matches the criteria that you specified in a ListOperations request.
+    # matches the criteria that you specified in a [ListOperations][1]
+    # request.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_ListOperations.html
     #
     # @!attribute [rw] id
     #   The ID for an operation.
@@ -2156,7 +2338,7 @@ module Aws::ServiceDiscovery
     #   * 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
-    #     information, see DnsRecord$Type.
+    #     information, see [DnsRecord &gt; Type][1].
     #
     #   * You can use this value to update an existing instance.
     #
@@ -2174,6 +2356,10 @@ module Aws::ServiceDiscovery
     #     example.
     #
     #      </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_DnsRecord.html#cloudmap-Type-DnsRecord-Type
     #   @return [String]
     #
     # @!attribute [rw] creator_request_id
@@ -2277,17 +2463,19 @@ module Aws::ServiceDiscovery
     #   endpoint that you want Route 53 to send requests to.
     #
     #   This value is required if you specified settings for an SRV record
-    #   when you created the service.
+    #   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. Total
+    #   size of all provided attributes (sum of all keys and values) must
+    #   not exceed 5,000 characters.
     #
     #
     #
-    #   [1]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html
+    #   [1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/RegisterInstanceRequest AWS API Documentation
@@ -2302,7 +2490,12 @@ module Aws::ServiceDiscovery
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/RegisterInstanceResponse AWS API Documentation
@@ -2312,6 +2505,19 @@ module Aws::ServiceDiscovery
       include Aws::Structure
     end
 
+    # The operation can't be completed because you've reached the limit on
+    # the number of requests.
+    #
+    # @!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)
+      include Aws::Structure
+    end
+
     # The specified resource can't be deleted because it contains other
     # resources. For example, you can't delete a service that contains any
     # instances.
@@ -2339,6 +2545,18 @@ module Aws::ServiceDiscovery
       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)
+      include Aws::Structure
+    end
+
     # A complex type that contains information about the specified service.
     #
     # @!attribute [rw] id
@@ -2366,7 +2584,8 @@ module Aws::ServiceDiscovery
     # @!attribute [rw] instance_count
     #   The number of instances that are currently associated with the
     #   service. Instances that were previously associated with the service
-    #   but that have been deleted are not included in the count.
+    #   but that have been deleted are not included in the count. The count
+    #   might not reflect pending registrations and deregistrations.
     #   @return [Integer]
     #
     # @!attribute [rw] dns_config
@@ -2376,10 +2595,10 @@ module Aws::ServiceDiscovery
     #   @return [Types::DnsConfig]
     #
     # @!attribute [rw] health_check_config
-    #   *Public DNS namespaces only.* A complex type that contains settings
-    #   for an optional health check. If you specify settings for a health
-    #   check, AWS Cloud Map associates the health check with the records
-    #   that you specify in `DnsConfig`.
+    #   *Public DNS and HTTP namespaces only.* A complex type that contains
+    #   settings for an optional health check. If you specify settings for a
+    #   health check, AWS Cloud Map associates the health check with the
+    #   records that you specify in `DnsConfig`.
     #
     #   For information about the charges for health checks, see [Amazon
     #   Route 53 Pricing][1].
@@ -2458,7 +2677,7 @@ module Aws::ServiceDiscovery
     #
     #       {
     #         description: "ResourceDescription",
-    #         dns_config: { # required
+    #         dns_config: {
     #           dns_records: [ # required
     #             {
     #               type: "SRV", # required, accepts SRV, A, AAAA, CNAME
@@ -2484,10 +2703,10 @@ module Aws::ServiceDiscovery
     #   @return [Types::DnsConfigChange]
     #
     # @!attribute [rw] health_check_config
-    #   *Public DNS namespaces only.* A complex type that contains settings
-    #   for an optional health check. If you specify settings for a health
-    #   check, AWS Cloud Map associates the health check with the records
-    #   that you specify in `DnsConfig`.
+    #   *Public DNS and HTTP namespaces only.* A complex type that contains
+    #   settings for an optional health check. If you specify settings for a
+    #   health check, AWS Cloud Map associates the health check with the
+    #   records that you specify in `DnsConfig`.
     #
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
@@ -2551,8 +2770,8 @@ module Aws::ServiceDiscovery
     #
     #
     #   [1]: http://aws.amazon.com/route53/pricing/
-    #   [2]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
-    #   [3]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
+    #   [2]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
+    #   [3]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
     #   @return [Types::HealthCheckConfig]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/ServiceChange AWS API Documentation
@@ -2644,7 +2863,8 @@ module Aws::ServiceDiscovery
     # @!attribute [rw] instance_count
     #   The number of instances that are currently associated with the
     #   service. Instances that were previously associated with the service
-    #   but that have been deleted are not included in the count.
+    #   but that have been deleted are not included in the count. The count
+    #   might not reflect pending registrations and deregistrations.
     #   @return [Integer]
     #
     # @!attribute [rw] dns_config
@@ -2654,10 +2874,10 @@ module Aws::ServiceDiscovery
     #   @return [Types::DnsConfig]
     #
     # @!attribute [rw] health_check_config
-    #   *Public DNS namespaces only.* A complex type that contains settings
-    #   for an optional health check. If you specify settings for a health
-    #   check, AWS Cloud Map associates the health check with the records
-    #   that you specify in `DnsConfig`.
+    #   *Public DNS and HTTP namespaces only.* A complex type that contains
+    #   settings for an optional health check. If you specify settings for a
+    #   health check, AWS Cloud Map associates the health check with the
+    #   records that you specify in `DnsConfig`.
     #
     #   If you specify a health check configuration, you can specify either
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
@@ -2721,8 +2941,8 @@ module Aws::ServiceDiscovery
     #
     #
     #   [1]: http://aws.amazon.com/route53/pricing/
-    #   [2]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
-    #   [3]: http://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
+    #   [2]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheckConfig.html#Route53-Type-HealthCheckConfig-Regions
+    #   [3]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-EvaluateTargetHealth
     #   @return [Types::HealthCheckConfig]
     #
     # @!attribute [rw] health_check_custom_config
@@ -2744,7 +2964,7 @@ module Aws::ServiceDiscovery
     #   `HealthCheckCustomConfig` or `HealthCheckConfig` but not both.
     #
     #   To change the status of a custom health check, submit an
-    #   `UpdateInstanceCustomHealthStatus` request. Cloud Map doesn't
+    #   `UpdateInstanceCustomHealthStatus` request. AWS Cloud Map doesn't
     #   monitor the status of the resource, it just keeps a record of the
     #   status specified in the most recent
     #   `UpdateInstanceCustomHealthStatus` request.
@@ -2755,7 +2975,7 @@ module Aws::ServiceDiscovery
     #
     #       The failure threshold indicates the number of 30-second
     #       intervals you want AWS Cloud Map to wait between the time that
-    #       your application sends an UpdateInstanceCustomHealthStatus
+    #       your application sends an [UpdateInstanceCustomHealthStatus][1]
     #       request and the time that AWS Cloud Map stops routing internet
     #       traffic to the corresponding resource.
     #
@@ -2781,7 +3001,9 @@ module Aws::ServiceDiscovery
     #       arrive during that time to change the status back to healthy,
     #       AWS Cloud Map stops routing traffic to the resource.
     #
-    #   Note the following about configuring custom health checks.
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_UpdateInstanceCustomHealthStatus.html
     #   @return [Types::HealthCheckCustomConfig]
     #
     # @!attribute [rw] create_date
@@ -2803,6 +3025,117 @@ module Aws::ServiceDiscovery
       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 that's 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)
+      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)
+      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 limit. 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)
+      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)
+      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:
     #
@@ -2842,7 +3175,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
@@ -2876,7 +3209,12 @@ module Aws::ServiceDiscovery
 
     # @!attribute [rw] operation_id
     #   A value that you can use to determine whether the request completed
-    #   successfully. To get the status of the operation, see GetOperation.
+    #   successfully. To get the status of the operation, see
+    #   [GetOperation][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cloud-map/latest/api/API_GetOperation.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/servicediscovery-2017-03-14/UpdateServiceResponse AWS API Documentation