aws-sdk-applicationdiscoveryservice 1.51.0 → 1.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e9f62ad3a81851f06c2fd38e635cb438918317317176091253fdf1c59c810e
-  data.tar.gz: b6f00215725959322352c752667f193b1444c4639b5d6feee9c6dc1e614b8714
+  metadata.gz: a7d9c70db47e4331ed7f33241eefe0072e776d52480a860d9240152146d2133a
+  data.tar.gz: 8bb419c1e5366df1f628674435535be4f8a419c0ce0fd0b51aca93ed653ad1de
 SHA512:
-  metadata.gz: 37b965616e9074409ba3084d2aac37bde4db73dec6ac4c2984000ea9de307eb2b5f071f560152bf4ba57159524cdc874cde5bd0d57616bf7c0866a92a0edcfd4
-  data.tar.gz: 8612034f945792b00be9cda1301dba1a8dfc9399d7b92f673288aa1a67f7c50756796f4f25da1fabd9fb39999653c5e9e1a6e0507682f74e79121a42c1caf6b9
+  metadata.gz: c19b69ee62530e8b8a27414cf9411bf6bcd656a499d9127b1e839057a711960c16e0fc7d14dcfd85dceff8fbc45bcb0cf7362f680ceab997d5eb103d0e00e667
+  data.tar.gz: b8072a7ef504d5ab4410bf2877837c367ea722e06f4daabf292ad8539b9979a5c2697aa78c0c9dead458253f2a392cee595706aca26762428f831c85d372b389

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.52.0 (2023-06-16)
+------------------
+
+* Feature - Add Amazon EC2 instance recommendations export
+
 1.51.0 (2023-06-15)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.51.0
+1.52.0

data/lib/aws-sdk-applicationdiscoveryservice/client.rb

@@ -570,15 +570,14 @@ module Aws::ApplicationDiscoveryService
       req.send_request(options)
     end
 
-    # Lists agents or connectors as specified by ID or other filters. All
-    # agents/connectors associated with your user account can be listed if
-    # you call `DescribeAgents` as is without passing any parameters.
+    # Lists agents or collectors as specified by ID or other filters. All
+    # agents/collectors associated with your user can be listed if you call
+    # `DescribeAgents` as is without passing any parameters.
     #
     # @option params [Array<String>] :agent_ids
-    #   The agent or the Connector IDs for which you want information. If you
+    #   The agent or the collector IDs for which you want information. If you
     #   specify no IDs, the system returns information about all
-    #   agents/Connectors associated with your Amazon Web Services user
-    #   account.
+    #   agents/collectors associated with your user.
     #
     # @option params [Array<Types::Filter>] :filters
     #   You can filter the request using various logical operators and a
@@ -587,7 +586,7 @@ module Aws::ApplicationDiscoveryService
     #   `\{"key": "collectionStatus", "value": "STARTED"\}`
     #
     # @option params [Integer] :max_results
-    #   The total number of agents/Connectors to return in a single page of
+    #   The total number of agents/collectors to return in a single page of
     #   output. The maximum value is 100.
     #
     # @option params [String] :next_token
@@ -696,8 +695,8 @@ module Aws::ApplicationDiscoveryService
     end
 
     # Lists exports as specified by ID. All continuous exports associated
-    # with your user account can be listed if you call
-    # `DescribeContinuousExports` as is without passing any parameters.
+    # with your user can be listed if you call `DescribeContinuousExports`
+    # as is without passing any parameters.
     #
     # @option params [Array<String>] :export_ids
     #   The unique IDs assigned to the exports.
@@ -935,9 +934,9 @@ module Aws::ApplicationDiscoveryService
     #
     # * configurationId
     #
-    # Also, all configuration items associated with your user account that
-    # have tags can be listed if you call `DescribeTags` as is without
-    # passing any parameters.
+    # Also, all configuration items associated with your user that have tags
+    # can be listed if you call `DescribeTags` as is without passing any
+    # parameters.
     #
     # @option params [Array<Types::TagFilter>] :filters
     #   You can filter the list using a *key*-*value* format. You can separate
@@ -1260,17 +1259,16 @@ module Aws::ApplicationDiscoveryService
       req.send_request(options)
     end
 
-    # Instructs the specified agents or connectors to start collecting data.
+    # Instructs the specified agents to start collecting data.
     #
     # @option params [required, Array<String>] :agent_ids
-    #   The IDs of the agents or connectors from which to start collecting
-    #   data. If you send a request to an agent/connector ID that you do not
-    #   have permission to contact, according to your Amazon Web Services
-    #   account, the service does not throw an exception. Instead, it returns
-    #   the error in the *Description* field. If you send a request to
-    #   multiple agents/connectors and you do not have permission to contact
-    #   some of those agents/connectors, the system does not throw an
-    #   exception. Instead, the system shows `Failed` in the *Description*
+    #   The IDs of the agents from which to start collecting data. If you send
+    #   a request to an agent ID that you do not have permission to contact,
+    #   according to your Amazon Web Services account, the service does not
+    #   throw an exception. Instead, it returns the error in the *Description*
+    #   field. If you send a request to multiple agents and you do not have
+    #   permission to contact some of those agents, the system does not throw
+    #   an exception. Instead, the system shows `Failed` in the *Description*
     #   field.
     #
     # @return [Types::StartDataCollectionByAgentIdsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
@@ -1297,19 +1295,36 @@ module Aws::ApplicationDiscoveryService
       req.send_request(options)
     end
 
-    # Begins the export of discovered data to an S3 bucket.
+    # Begins the export of a discovered data report to an Amazon S3 bucket
+    # managed by Amazon Web Services.
+    #
+    # <note markdown="1"> Exports might provide an estimate of fees and savings based on certain
+    # information that you provide. Fee estimates do not include any taxes
+    # that might apply. Your actual fees and savings depend on a variety of
+    # factors, including your actual usage of Amazon Web Services services,
+    # which might vary from the estimates provided in this report.
+    #
+    #  </note>
+    #
+    # If you do not specify `preferences` or `agentIds` in the filter, a
+    # summary of all servers, applications, tags, and performance is
+    # generated. This data is an aggregation of all server data collected
+    # through on-premises tooling, file import, application grouping and
+    # applying tags.
     #
     # If you specify `agentIds` in a filter, the task exports up to 72 hours
     # of detailed data collected by the identified Application Discovery
     # Agent, including network, process, and performance details. A time
     # range for exported agent data may be set by using `startTime` and
     # `endTime`. Export of detailed agent data is limited to five
-    # concurrently running exports.
+    # concurrently running exports. Export of detailed agent data is limited
+    # to two exports per day.
     #
-    # If you do not include an `agentIds` filter, summary data is exported
-    # that includes both Amazon Web Services Agentless Discovery Connector
-    # data and summary data from Amazon Web Services Discovery Agents.
-    # Export of summary data is limited to two exports per day.
+    # If you enable `ec2RecommendationsPreferences` in `preferences` , an
+    # Amazon EC2 instance matching the characteristics of each server in
+    # Application Discovery Service is generated. Changing the attributes of
+    # the `ec2RecommendationsPreferences` changes the criteria of the
+    # recommendation.
     #
     # @option params [Array<String>] :export_data_format
     #   The file format for the returned export data. Default value is `CSV`.
@@ -1320,8 +1335,9 @@ module Aws::ApplicationDiscoveryService
     #   Application Discovery Agent for which data is exported. The `agentId`
     #   can be found in the results of the `DescribeAgents` API or CLI. If no
     #   filter is present, `startTime` and `endTime` are ignored and exported
-    #   data includes both Agentless Discovery Connector data and summary data
-    #   from Application Discovery agents.
+    #   data includes both Amazon Web Services Application Discovery Service
+    #   Agentless Collector collectors data and summary data from Application
+    #   Discovery Agent agents.
     #
     # @option params [Time,DateTime,Date,Integer,String] :start_time
     #   The start timestamp for exported data from the single Application
@@ -1333,6 +1349,14 @@ module Aws::ApplicationDiscoveryService
     #   Discovery Agent selected in the filters. If no value is specified,
     #   exported data includes the most recent data collected by the agent.
     #
+    # @option params [Types::ExportPreferences] :preferences
+    #   Indicates the type of data that needs to be exported. Only one
+    #   [ExportPreferences][1] can be enabled at any time.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/application-discovery/latest/APIReference/API_ExportPreferences.html
+    #
     # @return [Types::StartExportTaskResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::StartExportTaskResponse#export_id #export_id} => String
@@ -1340,7 +1364,7 @@ module Aws::ApplicationDiscoveryService
     # @example Request syntax with placeholder values
     #
     #   resp = client.start_export_task({
-    #     export_data_format: ["CSV"], # accepts CSV, GRAPHML
+    #     export_data_format: ["CSV"], # accepts CSV
     #     filters: [
     #       {
     #         name: "FilterName", # required
@@ -1350,6 +1374,27 @@ module Aws::ApplicationDiscoveryService
     #     ],
     #     start_time: Time.now,
     #     end_time: Time.now,
+    #     preferences: {
+    #       ec2_recommendations_preferences: {
+    #         enabled: false,
+    #         cpu_performance_metric_basis: {
+    #           name: "UsageMetricBasisName",
+    #           percentage_adjust: 1.0,
+    #         },
+    #         ram_performance_metric_basis: {
+    #           name: "UsageMetricBasisName",
+    #           percentage_adjust: 1.0,
+    #         },
+    #         tenancy: "DEDICATED", # accepts DEDICATED, SHARED
+    #         excluded_instance_types: ["EC2InstanceType"],
+    #         preferred_region: "UserPreferredRegion",
+    #         reserved_instance_options: {
+    #           purchasing_option: "ALL_UPFRONT", # required, accepts ALL_UPFRONT, PARTIAL_UPFRONT, NO_UPFRONT
+    #           offering_class: "STANDARD", # required, accepts STANDARD, CONVERTIBLE
+    #           term_length: "ONE_YEAR", # required, accepts ONE_YEAR, THREE_YEAR
+    #         },
+    #       },
+    #     },
     #   })
     #
     # @example Response structure
@@ -1365,11 +1410,13 @@ module Aws::ApplicationDiscoveryService
 
     # Starts an import task, which allows you to import details of your
     # on-premises environment directly into Amazon Web Services Migration
-    # Hub without having to use the Application Discovery Service (ADS)
-    # tools such as the Discovery Connector or Discovery Agent. This gives
-    # you the option to perform migration assessment and planning directly
-    # from your imported data, including the ability to group your devices
-    # as applications and track their migration status.
+    # Hub without having to use the Amazon Web Services Application
+    # Discovery Service (Application Discovery Service) tools such as the
+    # Amazon Web Services Application Discovery Service Agentless Collector
+    # or Application Discovery Agent. This gives you the option to perform
+    # migration assessment and planning directly from your imported data,
+    # including the ability to group your devices as applications and track
+    # their migration status.
     #
     # To start an import request, do this:
     #
@@ -1493,11 +1540,10 @@ module Aws::ApplicationDiscoveryService
       req.send_request(options)
     end
 
-    # Instructs the specified agents or connectors to stop collecting data.
+    # Instructs the specified agents to stop collecting data.
     #
     # @option params [required, Array<String>] :agent_ids
-    #   The IDs of the agents or connectors from which to stop collecting
-    #   data.
+    #   The IDs of the agents from which to stop collecting data.
     #
     # @return [Types::StopDataCollectionByAgentIdsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1564,7 +1610,7 @@ module Aws::ApplicationDiscoveryService
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-applicationdiscoveryservice'
-      context[:gem_version] = '1.51.0'
+      context[:gem_version] = '1.52.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -88,13 +88,18 @@ module Aws::ApplicationDiscoveryService
     DescribeTagsResponse = Shapes::StructureShape.new(name: 'DescribeTagsResponse')
     DisassociateConfigurationItemsFromApplicationRequest = Shapes::StructureShape.new(name: 'DisassociateConfigurationItemsFromApplicationRequest')
     DisassociateConfigurationItemsFromApplicationResponse = Shapes::StructureShape.new(name: 'DisassociateConfigurationItemsFromApplicationResponse')
+    EC2InstanceType = Shapes::StringShape.new(name: 'EC2InstanceType')
+    Ec2RecommendationsExportPreferences = Shapes::StructureShape.new(name: 'Ec2RecommendationsExportPreferences')
+    ExcludedInstanceTypes = Shapes::ListShape.new(name: 'ExcludedInstanceTypes')
     ExportConfigurationsResponse = Shapes::StructureShape.new(name: 'ExportConfigurationsResponse')
     ExportDataFormat = Shapes::StringShape.new(name: 'ExportDataFormat')
     ExportDataFormats = Shapes::ListShape.new(name: 'ExportDataFormats')
+    ExportEnabled = Shapes::BooleanShape.new(name: 'ExportEnabled')
     ExportFilter = Shapes::StructureShape.new(name: 'ExportFilter')
     ExportFilters = Shapes::ListShape.new(name: 'ExportFilters')
     ExportIds = Shapes::ListShape.new(name: 'ExportIds')
     ExportInfo = Shapes::StructureShape.new(name: 'ExportInfo')
+    ExportPreferences = Shapes::UnionShape.new(name: 'ExportPreferences')
     ExportRequestTime = Shapes::TimestampShape.new(name: 'ExportRequestTime')
     ExportStatus = Shapes::StringShape.new(name: 'ExportStatus')
     ExportStatusMessage = Shapes::StringShape.new(name: 'ExportStatusMessage')
@@ -129,10 +134,13 @@ module Aws::ApplicationDiscoveryService
     NeighborConnectionDetail = Shapes::StructureShape.new(name: 'NeighborConnectionDetail')
     NeighborDetailsList = Shapes::ListShape.new(name: 'NeighborDetailsList')
     NextToken = Shapes::StringShape.new(name: 'NextToken')
+    OfferingClass = Shapes::StringShape.new(name: 'OfferingClass')
     OperationNotPermittedException = Shapes::StructureShape.new(name: 'OperationNotPermittedException')
     OrderByElement = Shapes::StructureShape.new(name: 'OrderByElement')
     OrderByElementFieldName = Shapes::StringShape.new(name: 'OrderByElementFieldName')
     OrderByList = Shapes::ListShape.new(name: 'OrderByList')
+    PurchasingOption = Shapes::StringShape.new(name: 'PurchasingOption')
+    ReservedInstanceOptions = Shapes::StructureShape.new(name: 'ReservedInstanceOptions')
     ResourceInUseException = Shapes::StructureShape.new(name: 'ResourceInUseException')
     ResourceNotFoundException = Shapes::StructureShape.new(name: 'ResourceNotFoundException')
     S3Bucket = Shapes::StringShape.new(name: 'S3Bucket')
@@ -159,10 +167,16 @@ module Aws::ApplicationDiscoveryService
     TagKey = Shapes::StringShape.new(name: 'TagKey')
     TagSet = Shapes::ListShape.new(name: 'TagSet')
     TagValue = Shapes::StringShape.new(name: 'TagValue')
+    Tenancy = Shapes::StringShape.new(name: 'Tenancy')
+    TermLength = Shapes::StringShape.new(name: 'TermLength')
     TimeStamp = Shapes::TimestampShape.new(name: 'TimeStamp')
     ToDeleteIdentifierList = Shapes::ListShape.new(name: 'ToDeleteIdentifierList')
     UpdateApplicationRequest = Shapes::StructureShape.new(name: 'UpdateApplicationRequest')
     UpdateApplicationResponse = Shapes::StructureShape.new(name: 'UpdateApplicationResponse')
+    UsageMetricBasis = Shapes::StructureShape.new(name: 'UsageMetricBasis')
+    UsageMetricBasisName = Shapes::StringShape.new(name: 'UsageMetricBasisName')
+    UsageMetricPercentageAdjust = Shapes::FloatShape.new(name: 'UsageMetricPercentageAdjust')
+    UserPreferredRegion = Shapes::StringShape.new(name: 'UserPreferredRegion')
     orderString = Shapes::StringShape.new(name: 'orderString')
 
     AgentConfigurationStatus.add_member(:agent_id, Shapes::ShapeRef.new(shape: String, location_name: "agentId"))
@@ -386,6 +400,17 @@ module Aws::ApplicationDiscoveryService
 
     DisassociateConfigurationItemsFromApplicationResponse.struct_class = Types::DisassociateConfigurationItemsFromApplicationResponse
 
+    Ec2RecommendationsExportPreferences.add_member(:enabled, Shapes::ShapeRef.new(shape: ExportEnabled, location_name: "enabled"))
+    Ec2RecommendationsExportPreferences.add_member(:cpu_performance_metric_basis, Shapes::ShapeRef.new(shape: UsageMetricBasis, location_name: "cpuPerformanceMetricBasis"))
+    Ec2RecommendationsExportPreferences.add_member(:ram_performance_metric_basis, Shapes::ShapeRef.new(shape: UsageMetricBasis, location_name: "ramPerformanceMetricBasis"))
+    Ec2RecommendationsExportPreferences.add_member(:tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "tenancy"))
+    Ec2RecommendationsExportPreferences.add_member(:excluded_instance_types, Shapes::ShapeRef.new(shape: ExcludedInstanceTypes, location_name: "excludedInstanceTypes"))
+    Ec2RecommendationsExportPreferences.add_member(:preferred_region, Shapes::ShapeRef.new(shape: UserPreferredRegion, location_name: "preferredRegion"))
+    Ec2RecommendationsExportPreferences.add_member(:reserved_instance_options, Shapes::ShapeRef.new(shape: ReservedInstanceOptions, location_name: "reservedInstanceOptions"))
+    Ec2RecommendationsExportPreferences.struct_class = Types::Ec2RecommendationsExportPreferences
+
+    ExcludedInstanceTypes.member = Shapes::ShapeRef.new(shape: EC2InstanceType)
+
     ExportConfigurationsResponse.add_member(:export_id, Shapes::ShapeRef.new(shape: ConfigurationsExportId, location_name: "exportId"))
     ExportConfigurationsResponse.struct_class = Types::ExportConfigurationsResponse
 
@@ -410,6 +435,12 @@ module Aws::ApplicationDiscoveryService
     ExportInfo.add_member(:requested_end_time, Shapes::ShapeRef.new(shape: TimeStamp, location_name: "requestedEndTime"))
     ExportInfo.struct_class = Types::ExportInfo
 
+    ExportPreferences.add_member(:ec2_recommendations_preferences, Shapes::ShapeRef.new(shape: Ec2RecommendationsExportPreferences, location_name: "ec2RecommendationsPreferences"))
+    ExportPreferences.add_member(:unknown, Shapes::ShapeRef.new(shape: nil, location_name: 'unknown'))
+    ExportPreferences.add_member_subclass(:ec2_recommendations_preferences, Types::ExportPreferences::Ec2RecommendationsPreferences)
+    ExportPreferences.add_member_subclass(:unknown, Types::ExportPreferences::Unknown)
+    ExportPreferences.struct_class = Types::ExportPreferences
+
     ExportsInfo.member = Shapes::ShapeRef.new(shape: ExportInfo)
 
     Filter.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "name"))
@@ -506,6 +537,11 @@ module Aws::ApplicationDiscoveryService
 
     OrderByList.member = Shapes::ShapeRef.new(shape: OrderByElement)
 
+    ReservedInstanceOptions.add_member(:purchasing_option, Shapes::ShapeRef.new(shape: PurchasingOption, required: true, location_name: "purchasingOption"))
+    ReservedInstanceOptions.add_member(:offering_class, Shapes::ShapeRef.new(shape: OfferingClass, required: true, location_name: "offeringClass"))
+    ReservedInstanceOptions.add_member(:term_length, Shapes::ShapeRef.new(shape: TermLength, required: true, location_name: "termLength"))
+    ReservedInstanceOptions.struct_class = Types::ReservedInstanceOptions
+
     ResourceInUseException.add_member(:message, Shapes::ShapeRef.new(shape: Message, location_name: "message"))
     ResourceInUseException.struct_class = Types::ResourceInUseException
 
@@ -537,6 +573,7 @@ module Aws::ApplicationDiscoveryService
     StartExportTaskRequest.add_member(:filters, Shapes::ShapeRef.new(shape: ExportFilters, location_name: "filters"))
     StartExportTaskRequest.add_member(:start_time, Shapes::ShapeRef.new(shape: TimeStamp, location_name: "startTime"))
     StartExportTaskRequest.add_member(:end_time, Shapes::ShapeRef.new(shape: TimeStamp, location_name: "endTime"))
+    StartExportTaskRequest.add_member(:preferences, Shapes::ShapeRef.new(shape: ExportPreferences, location_name: "preferences"))
     StartExportTaskRequest.struct_class = Types::StartExportTaskRequest
 
     StartExportTaskResponse.add_member(:export_id, Shapes::ShapeRef.new(shape: ConfigurationsExportId, location_name: "exportId"))
@@ -584,6 +621,10 @@ module Aws::ApplicationDiscoveryService
 
     UpdateApplicationResponse.struct_class = Types::UpdateApplicationResponse
 
+    UsageMetricBasis.add_member(:name, Shapes::ShapeRef.new(shape: UsageMetricBasisName, location_name: "name"))
+    UsageMetricBasis.add_member(:percentage_adjust, Shapes::ShapeRef.new(shape: UsageMetricPercentageAdjust, location_name: "percentageAdjust"))
+    UsageMetricBasis.struct_class = Types::UsageMetricBasis
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|

data/lib/aws-sdk-applicationdiscoveryservice/endpoint_parameters.rb

@@ -50,9 +50,6 @@ module Aws::ApplicationDiscoveryService
 
     def initialize(options = {})
       self[:region] = options[:region]
-      if self[:region].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :region"
-      end
       self[:use_dual_stack] = options[:use_dual_stack]
       self[:use_dual_stack] = false if self[:use_dual_stack].nil?
       if self[:use_dual_stack].nil?

data/lib/aws-sdk-applicationdiscoveryservice/endpoint_provider.rb

@@ -14,36 +14,39 @@ module Aws::ApplicationDiscoveryService
       use_dual_stack = parameters.use_dual_stack
       use_fips = parameters.use_fips
       endpoint = parameters.endpoint
-      if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
-        if Aws::Endpoints::Matchers.set?(endpoint)
-          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-            raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
-          end
-          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-            raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
-          end
-          return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
-        end
-        if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://discovery-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
-        end
+      if Aws::Endpoints::Matchers.set?(endpoint)
         if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
-            return Aws::Endpoints::Endpoint.new(url: "https://discovery-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
         end
         if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://discovery.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+          raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
+        end
+        return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
+      end
+      if Aws::Endpoints::Matchers.set?(region)
+        if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://discovery-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
+              return Aws::Endpoints::Endpoint.new(url: "https://discovery-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://discovery.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
           end
-          raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
+          return Aws::Endpoints::Endpoint.new(url: "https://discovery.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
         end
-        return Aws::Endpoints::Endpoint.new(url: "https://discovery.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
       end
+      raise ArgumentError, "Invalid Configuration: Missing Region"
       raise ArgumentError, 'No endpoint could be resolved'
 
     end

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

@@ -10,20 +10,19 @@
 module Aws::ApplicationDiscoveryService
   module Types
 
-    # Information about agents or connectors that were instructed to start
-    # collecting data. Information includes the agent/connector ID, a
-    # description of the operation, and whether the agent/connector
-    # configuration was updated.
+    # Information about agents that were instructed to start collecting
+    # data. Information includes the agent ID, a description of the
+    # operation, and whether the agent configuration was updated.
     #
     # @!attribute [rw] agent_id
-    #   The agent/connector ID.
+    #   The agent ID.
     #   @return [String]
     #
     # @!attribute [rw] operation_succeeded
     #   Information about the status of the `StartDataCollection` and
     #   `StopDataCollection` operations. The system has recorded the data
-    #   collection operation. The agent/connector receives this command the
-    #   next time it polls for a new command.
+    #   collection operation. The agent receives this command the next time
+    #   it polls for a new command.
     #   @return [Boolean]
     #
     # @!attribute [rw] description
@@ -38,23 +37,22 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
-    # Information about agents or connectors associated with the user’s
-    # Amazon Web Services account. Information includes agent or connector
-    # IDs, IP addresses, media access control (MAC) addresses, agent or
-    # connector health, hostname where the agent or connector resides, and
-    # agent version for each agent.
+    # Information about agents associated with the user’s Amazon Web
+    # Services account. Information includes agent IDs, IP addresses, media
+    # access control (MAC) addresses, agent or collector status, hostname
+    # where the agent resides, and agent version for each agent.
     #
     # @!attribute [rw] agent_id
-    #   The agent or connector ID.
+    #   The agent or collector ID.
     #   @return [String]
     #
     # @!attribute [rw] host_name
-    #   The name of the host where the agent or connector resides. The host
+    #   The name of the host where the agent or collector resides. The host
     #   can be a server or virtual machine.
     #   @return [String]
     #
     # @!attribute [rw] agent_network_info_list
-    #   Network details about the host where the agent or connector resides.
+    #   Network details about the host where the agent or collector resides.
     #   @return [Array<Types::AgentNetworkInfo>]
     #
     # @!attribute [rw] connector_id
@@ -62,19 +60,19 @@ module Aws::ApplicationDiscoveryService
     #   @return [String]
     #
     # @!attribute [rw] version
-    #   The agent or connector version.
+    #   The agent or collector version.
     #   @return [String]
     #
     # @!attribute [rw] health
-    #   The health of the agent or connector.
+    #   The health of the agent.
     #   @return [String]
     #
     # @!attribute [rw] last_health_ping_time
-    #   Time since agent or connector health was reported.
+    #   Time since agent health was reported.
     #   @return [String]
     #
     # @!attribute [rw] collection_status
-    #   Status of the collection process for an agent or connector.
+    #   Status of the collection process for an agent.
     #   @return [String]
     #
     # @!attribute [rw] agent_type
@@ -100,14 +98,14 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
-    # Network details about the host where the agent/connector resides.
+    # Network details about the host where the agent/collector resides.
     #
     # @!attribute [rw] ip_address
-    #   The IP address for the host where the agent/connector resides.
+    #   The IP address for the host where the agent/collector resides.
     #   @return [String]
     #
     # @!attribute [rw] mac_address
-    #   The MAC address for the host where the agent/connector resides.
+    #   The MAC address for the host where the agent/collector resides.
     #   @return [String]
     #
     class AgentNetworkInfo < Struct.new(
@@ -136,8 +134,8 @@ module Aws::ApplicationDiscoveryService
 
     class AssociateConfigurationItemsToApplicationResponse < Aws::EmptyStructure; end
 
-    # The Amazon Web Services user account does not have permission to
-    # perform the action. Check the IAM policy associated with this account.
+    # The user does not have permission to perform the action. Check the IAM
+    # policy associated with this user.
     #
     # @!attribute [rw] message
     #   @return [String]
@@ -285,16 +283,16 @@ module Aws::ApplicationDiscoveryService
     #     Kinesis Data Streams Developer Guide.
     #
     #   * FIREHOSE\_ROLE\_MISSING - The Data Exploration feature is in an
-    #     error state because your IAM User is missing the
-    #     AWSApplicationDiscoveryServiceFirehose role. Turn on Data
+    #     error state because your user is missing the Amazon Web
+    #     ServicesApplicationDiscoveryServiceFirehose role. Turn on Data
     #     Exploration in Amazon Athena and try again. For more information,
-    #     see [Step 3: Provide Application Discovery Service Access to
-    #     Non-Administrator Users by Attaching Policies][3] in the
+    #     see [Creating the Amazon Web
+    #     ServicesApplicationDiscoveryServiceFirehose Role][3] in the
     #     Application Discovery Service User Guide.
     #
     #   * FIREHOSE\_STREAM\_DOES\_NOT\_EXIST - The Data Exploration feature
-    #     is in an error state because your IAM User is missing one or more
-    #     of the Kinesis data delivery streams.
+    #     is in an error state because your user is missing one or more of
+    #     the Kinesis data delivery streams.
     #
     #   * INTERNAL\_FAILURE - The Data Exploration feature is in an error
     #     state because of an internal failure. Try again later. If this
@@ -346,7 +344,7 @@ module Aws::ApplicationDiscoveryService
     #
     #   [1]: http://docs.aws.amazon.com/application-discovery/latest/userguide/setting-up.html
     #   [2]: http://docs.aws.amazon.com/streams/latest/dev/service-sizes-and-limits.html
-    #   [3]: http://docs.aws.amazon.com/application-discovery/latest/userguide/setting-up.html#setting-up-user-policy
+    #   [3]: https://docs.aws.amazon.com/application-discovery/latest/userguide/security-iam-awsmanpol.html#security-iam-awsmanpol-create-firehose-role
     #   [4]: http://docs.aws.amazon.com/lake-formation/latest/dg/upgrade-glue-lake-formation.html
     #   [5]: https://docs.aws.amazon.com/lake-formation/latest/dg/getting-started-setup.html#setup-change-cat-settings
     #   [6]: https://docs.aws.amazon.com/lake-formation/latest/dg/granting-database-permissions.html
@@ -484,25 +482,34 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
+    # The inventory data for installed Agentless Collector collectors.
+    #
     # @!attribute [rw] active_agentless_collectors
+    #   The number of active Agentless Collector collectors.
     #   @return [Integer]
     #
     # @!attribute [rw] healthy_agentless_collectors
+    #   The number of healthy Agentless Collector collectors.
     #   @return [Integer]
     #
     # @!attribute [rw] deny_listed_agentless_collectors
+    #   The number of deny-listed Agentless Collector collectors.
     #   @return [Integer]
     #
     # @!attribute [rw] shutdown_agentless_collectors
+    #   The number of Agentless Collector collectors with `SHUTDOWN` status.
     #   @return [Integer]
     #
     # @!attribute [rw] unhealthy_agentless_collectors
+    #   The number of unhealthy Agentless Collector collectors.
     #   @return [Integer]
     #
     # @!attribute [rw] total_agentless_collectors
+    #   The total number of Agentless Collector collectors.
     #   @return [Integer]
     #
     # @!attribute [rw] unknown_agentless_collectors
+    #   The number of unknown Agentless Collector collectors.
     #   @return [Integer]
     #
     class CustomerAgentlessCollectorInfo < Struct.new(
@@ -635,10 +642,9 @@ module Aws::ApplicationDiscoveryService
     class DeleteTagsResponse < Aws::EmptyStructure; end
 
     # @!attribute [rw] agent_ids
-    #   The agent or the Connector IDs for which you want information. If
+    #   The agent or the collector IDs for which you want information. If
     #   you specify no IDs, the system returns information about all
-    #   agents/Connectors associated with your Amazon Web Services user
-    #   account.
+    #   agents/collectors associated with your user.
     #   @return [Array<String>]
     #
     # @!attribute [rw] filters
@@ -649,7 +655,7 @@ module Aws::ApplicationDiscoveryService
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
-    #   The total number of agents/Connectors to return in a single page of
+    #   The total number of agents/collectors to return in a single page of
     #   output. The maximum value is 100.
     #   @return [Integer]
     #
@@ -671,12 +677,12 @@ module Aws::ApplicationDiscoveryService
     end
 
     # @!attribute [rw] agents_info
-    #   Lists agents or the Connector by ID or lists all agents/Connectors
-    #   associated with your user account if you did not specify an
-    #   agent/Connector ID. The output includes agent/Connector IDs, IP
-    #   addresses, media access control (MAC) addresses, agent/Connector
-    #   health, host name where the agent/Connector resides, and the version
-    #   number of each agent/Connector.
+    #   Lists agents or the collector by ID or lists all agents/collectors
+    #   associated with your user, if you did not specify an agent/collector
+    #   ID. The output includes agent/collector IDs, IP addresses, media
+    #   access control (MAC) addresses, agent/collector health, host name
+    #   where the agent/collector resides, and the version number of each
+    #   agent/collector.
     #   @return [Array<Types::AgentInfo>]
     #
     # @!attribute [rw] next_token
@@ -943,6 +949,65 @@ module Aws::ApplicationDiscoveryService
 
     class DisassociateConfigurationItemsFromApplicationResponse < Aws::EmptyStructure; end
 
+    # Indicates that the exported data must include EC2 instance type
+    # matches for on-premises servers that are discovered through Amazon Web
+    # Services Application Discovery Service.
+    #
+    # @!attribute [rw] enabled
+    #   If set to true, the export [preferences][1] is set to
+    #   `Ec2RecommendationsExportPreferences`.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/application-discovery/latest/APIReference/API_StartExportTask.html#API_StartExportTask_RequestSyntax
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] cpu_performance_metric_basis
+    #   The recommended EC2 instance type that matches the CPU usage metric
+    #   of server performance data.
+    #   @return [Types::UsageMetricBasis]
+    #
+    # @!attribute [rw] ram_performance_metric_basis
+    #   The recommended EC2 instance type that matches the Memory usage
+    #   metric of server performance data.
+    #   @return [Types::UsageMetricBasis]
+    #
+    # @!attribute [rw] tenancy
+    #   The target tenancy to use for your recommended EC2 instances.
+    #   @return [String]
+    #
+    # @!attribute [rw] excluded_instance_types
+    #   An array of instance types to exclude from recommendations.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] preferred_region
+    #   The target Amazon Web Services Region for the recommendations. You
+    #   can use any of the Region codes available for the chosen service, as
+    #   listed in [Amazon Web Services service endpoints][1] in the *Amazon
+    #   Web Services General Reference*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/general/latest/gr/rande.html
+    #   @return [String]
+    #
+    # @!attribute [rw] reserved_instance_options
+    #   The contract type for a reserved instance. If blank, we assume an
+    #   On-Demand instance is preferred.
+    #   @return [Types::ReservedInstanceOptions]
+    #
+    class Ec2RecommendationsExportPreferences < Struct.new(
+      :enabled,
+      :cpu_performance_metric_basis,
+      :ram_performance_metric_basis,
+      :tenancy,
+      :excluded_instance_types,
+      :preferred_region,
+      :reserved_instance_options)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] export_id
     #   A unique identifier that you can use to query the export status.
     #   @return [String]
@@ -1041,6 +1106,32 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
+    # Indicates the type of data that is being exported. Only one
+    # `ExportPreferences` can be enabled for a [StartExportTask][1] action.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/application-discovery/latest/APIReference/API_StartExportTask.html
+    #
+    # @note ExportPreferences is a union - when making an API calls you must set exactly one of the members.
+    #
+    # @!attribute [rw] ec2_recommendations_preferences
+    #   If enabled, exported data includes EC2 instance type matches for
+    #   on-premises servers discovered through Amazon Web Services
+    #   Application Discovery Service.
+    #   @return [Types::Ec2RecommendationsExportPreferences]
+    #
+    class ExportPreferences < Struct.new(
+      :ec2_recommendations_preferences,
+      :unknown)
+      SENSITIVE = []
+      include Aws::Structure
+      include Aws::Structure::Union
+
+      class Ec2RecommendationsPreferences < ExportPreferences; end
+      class Unknown < ExportPreferences; end
+    end
+
     # A filter that can use conditional operators.
     #
     # For more information about filters, see [Querying Discovered
@@ -1114,6 +1205,7 @@ module Aws::ApplicationDiscoveryService
     #   @return [Types::CustomerMeCollectorInfo]
     #
     # @!attribute [rw] agentless_collector_summary
+    #   Details about Agentless Collector collectors, including status.
     #   @return [Types::CustomerAgentlessCollectorInfo]
     #
     class GetDiscoverySummaryResponse < Struct.new(
@@ -1129,7 +1221,7 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
-    # The home region is not set. Set the home region to continue.
+    # The home Region is not set. Set the home Region to continue.
     #
     # @!attribute [rw] message
     #   @return [String]
@@ -1490,6 +1582,29 @@ module Aws::ApplicationDiscoveryService
       include Aws::Structure
     end
 
+    # Used to provide Reserved Instance preferences for the recommendation.
+    #
+    # @!attribute [rw] purchasing_option
+    #   The payment plan to use for your Reserved Instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] offering_class
+    #   The flexibility to change the instance types needed for your
+    #   Reserved Instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] term_length
+    #   The preferred duration of the Reserved Instance term.
+    #   @return [String]
+    #
+    class ReservedInstanceOptions < Struct.new(
+      :purchasing_option,
+      :offering_class,
+      :term_length)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # This issue occurs when the same `clientRequestToken` is used with the
     # `StartImportTask` action, but with different parameters. For example,
     # you use the same request token but have two different import URLs, you
@@ -1570,15 +1685,14 @@ module Aws::ApplicationDiscoveryService
     end
 
     # @!attribute [rw] agent_ids
-    #   The IDs of the agents or connectors from which to start collecting
-    #   data. If you send a request to an agent/connector ID that you do not
-    #   have permission to contact, according to your Amazon Web Services
-    #   account, the service does not throw an exception. Instead, it
-    #   returns the error in the *Description* field. If you send a request
-    #   to multiple agents/connectors and you do not have permission to
-    #   contact some of those agents/connectors, the system does not throw
-    #   an exception. Instead, the system shows `Failed` in the
-    #   *Description* field.
+    #   The IDs of the agents from which to start collecting data. If you
+    #   send a request to an agent ID that you do not have permission to
+    #   contact, according to your Amazon Web Services account, the service
+    #   does not throw an exception. Instead, it returns the error in the
+    #   *Description* field. If you send a request to multiple agents and
+    #   you do not have permission to contact some of those agents, the
+    #   system does not throw an exception. Instead, the system shows
+    #   `Failed` in the *Description* field.
     #   @return [Array<String>]
     #
     class StartDataCollectionByAgentIdsRequest < Struct.new(
@@ -1588,10 +1702,10 @@ module Aws::ApplicationDiscoveryService
     end
 
     # @!attribute [rw] agents_configuration_status
-    #   Information about agents or the connector that were instructed to
-    #   start collecting data. Information includes the agent/connector ID,
-    #   a description of the operation performed, and whether the
-    #   agent/connector configuration was updated.
+    #   Information about agents that were instructed to start collecting
+    #   data. Information includes the agent ID, a description of the
+    #   operation performed, and whether the agent configuration was
+    #   updated.
     #   @return [Array<Types::AgentConfigurationStatus>]
     #
     class StartDataCollectionByAgentIdsResponse < Struct.new(
@@ -1610,8 +1724,9 @@ module Aws::ApplicationDiscoveryService
     #   Application Discovery Agent for which data is exported. The
     #   `agentId` can be found in the results of the `DescribeAgents` API or
     #   CLI. If no filter is present, `startTime` and `endTime` are ignored
-    #   and exported data includes both Agentless Discovery Connector data
-    #   and summary data from Application Discovery agents.
+    #   and exported data includes both Amazon Web Services Application
+    #   Discovery Service Agentless Collector collectors data and summary
+    #   data from Application Discovery Agent agents.
     #   @return [Array<Types::ExportFilter>]
     #
     # @!attribute [rw] start_time
@@ -1627,11 +1742,21 @@ module Aws::ApplicationDiscoveryService
     #   exported data includes the most recent data collected by the agent.
     #   @return [Time]
     #
+    # @!attribute [rw] preferences
+    #   Indicates the type of data that needs to be exported. Only one
+    #   [ExportPreferences][1] can be enabled at any time.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/application-discovery/latest/APIReference/API_ExportPreferences.html
+    #   @return [Types::ExportPreferences]
+    #
     class StartExportTaskRequest < Struct.new(
       :export_data_format,
       :filters,
       :start_time,
-      :end_time)
+      :end_time,
+      :preferences)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1722,8 +1847,7 @@ module Aws::ApplicationDiscoveryService
     end
 
     # @!attribute [rw] agent_ids
-    #   The IDs of the agents or connectors from which to stop collecting
-    #   data.
+    #   The IDs of the agents from which to stop collecting data.
     #   @return [Array<String>]
     #
     class StopDataCollectionByAgentIdsRequest < Struct.new(
@@ -1733,10 +1857,10 @@ module Aws::ApplicationDiscoveryService
     end
 
     # @!attribute [rw] agents_configuration_status
-    #   Information about the agents or connector that were instructed to
-    #   stop collecting data. Information includes the agent/connector ID, a
-    #   description of the operation performed, and whether the
-    #   agent/connector configuration was updated.
+    #   Information about the agents that were instructed to stop collecting
+    #   data. Information includes the agent ID, a description of the
+    #   operation performed, and whether the agent configuration was
+    #   updated.
     #   @return [Array<Types::AgentConfigurationStatus>]
     #
     class StopDataCollectionByAgentIdsResponse < Struct.new(
@@ -1804,5 +1928,24 @@ module Aws::ApplicationDiscoveryService
 
     class UpdateApplicationResponse < Aws::EmptyStructure; end
 
+    # Specifies the performance metrics to use for the server that is used
+    # for recommendations.
+    #
+    # @!attribute [rw] name
+    #   A utilization metric that is used by the recommendations.
+    #   @return [String]
+    #
+    # @!attribute [rw] percentage_adjust
+    #   Specifies the percentage of the specified utilization metric that is
+    #   used by the recommendations.
+    #   @return [Float]
+    #
+    class UsageMetricBasis < Struct.new(
+      :name,
+      :percentage_adjust)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
   end
 end

data/lib/aws-sdk-applicationdiscoveryservice.rb

@@ -52,6 +52,6 @@ require_relative 'aws-sdk-applicationdiscoveryservice/customizations'
 # @!group service
 module Aws::ApplicationDiscoveryService
 
-  GEM_VERSION = '1.51.0'
+  GEM_VERSION = '1.52.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-applicationdiscoveryservice
 version: !ruby/object:Gem::Version
-  version: 1.51.0
+  version: 1.52.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core