Merge branch 'main' into cailinn

Author: kai-ion

CMakeLists.txt

@@ -61,6 +61,7 @@ if (LEGACY_BUILD)
     option(ENABLE_ZLIB_REQUEST_COMPRESSION "For services that support it, request content will be compressed. On by default if dependency available" ON)
     option(DISABLE_INTERNAL_IMDSV1_CALLS "Disables IMDSv1 internal client calls" OFF)
     option(BUILD_BENCHMARKS "Enables building the benchmark executable" OFF)
+    option(BUILD_PERFORMANCE_TESTS "Enables building the performance test executables" OFF)
     option(BUILD_OPTEL "Enables building the open telemetry implementation of tracing" OFF)
     option(AWS_SDK_WARNINGS_ARE_ERRORS "Compiler warning is treated as an error. Try turning this off when observing errors on a new or uncommon compiler" ON)
     option(BUILD_OPTEL_OTLP_BENCHMARKS "Enables building the benchmark tests with open telemetry OTLP clients" OFF)
@@ -341,6 +342,11 @@ if (LEGACY_BUILD)
     add_sdks()
     include(tests)
 
+    # Performance tests for services
+    if (BUILD_PERFORMANCE_TESTS)
+        add_subdirectory(tests/performance-tests)
+    endif()
+
     # for user friendly cmake usage
     include(setup_cmake_find_module)
 

VERSION

@@ -1 +1 @@
-1.11.606
+1.11.610

docs/CMake_Parameters.md

@@ -128,6 +128,9 @@ You can also tell gcc or clang to pass these linker flags by specifying `-Wl,--g
 ### BUILD_BENCHMARKS
 (Defaults to OFF) Enables building the benchmark executable
 
+### BUILD_PERFORMANCE_TESTS
+(Defaults to OFF) Enables building the performance test executables for S3 and DynamoDB. These tests measure operation latencies and output results to JSON files. Requires S3 and DynamoDB clients to be built.
+
 ### BUILD_OPTEL
 (Defaults to OFF) Enables building the open telemetry implementation of tracing
 

generated/src/aws-cpp-sdk-cleanroomsml/include/aws/cleanroomsml/model/ProtectedQueryInputParameters.h

@@ -7,6 +7,7 @@
 #include <aws/cleanroomsml/CleanRoomsML_EXPORTS.h>
 #include <aws/cleanroomsml/model/ProtectedQuerySQLParameters.h>
 #include <aws/cleanroomsml/model/ComputeConfiguration.h>
+#include <aws/cleanroomsml/model/ResultFormat.h>
 #include <utility>
 
 namespace Aws
@@ -61,13 +62,27 @@ namespace Model
     template<typename ComputeConfigurationT = ComputeConfiguration>
     ProtectedQueryInputParameters& WithComputeConfiguration(ComputeConfigurationT&& value) { SetComputeConfiguration(std::forward<ComputeConfigurationT>(value)); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The format in which the query results should be returned. If not specified,
+     * defaults to <code>CSV</code>. </p>
+     */
+    inline ResultFormat GetResultFormat() const { return m_resultFormat; }
+    inline bool ResultFormatHasBeenSet() const { return m_resultFormatHasBeenSet; }
+    inline void SetResultFormat(ResultFormat value) { m_resultFormatHasBeenSet = true; m_resultFormat = value; }
+    inline ProtectedQueryInputParameters& WithResultFormat(ResultFormat value) { SetResultFormat(value); return *this;}
+    ///@}
   private:
 
     ProtectedQuerySQLParameters m_sqlParameters;
     bool m_sqlParametersHasBeenSet = false;
 
     ComputeConfiguration m_computeConfiguration;
     bool m_computeConfigurationHasBeenSet = false;
+
+    ResultFormat m_resultFormat{ResultFormat::NOT_SET};
+    bool m_resultFormatHasBeenSet = false;
   };
 
 } // namespace Model

generated/src/aws-cpp-sdk-cleanroomsml/include/aws/cleanroomsml/model/ResultFormat.h

@@ -0,0 +1,31 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cleanroomsml/CleanRoomsML_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace CleanRoomsML
+{
+namespace Model
+{
+  enum class ResultFormat
+  {
+    NOT_SET,
+    CSV,
+    PARQUET
+  };
+
+namespace ResultFormatMapper
+{
+AWS_CLEANROOMSML_API ResultFormat GetResultFormatForName(const Aws::String& name);
+
+AWS_CLEANROOMSML_API Aws::String GetNameForResultFormat(ResultFormat value);
+} // namespace ResultFormatMapper
+} // namespace Model
+} // namespace CleanRoomsML
+} // namespace Aws

generated/src/aws-cpp-sdk-cleanroomsml/source/model/ProtectedQueryInputParameters.cpp

@@ -35,6 +35,11 @@ ProtectedQueryInputParameters& ProtectedQueryInputParameters::operator =(JsonVie
     m_computeConfiguration = jsonValue.GetObject("computeConfiguration");
     m_computeConfigurationHasBeenSet = true;
   }
+  if(jsonValue.ValueExists("resultFormat"))
+  {
+    m_resultFormat = ResultFormatMapper::GetResultFormatForName(jsonValue.GetString("resultFormat"));
+    m_resultFormatHasBeenSet = true;
+  }
   return *this;
 }
 
@@ -54,6 +59,11 @@ JsonValue ProtectedQueryInputParameters::Jsonize() const
 
   }
 
+  if(m_resultFormatHasBeenSet)
+  {
+   payload.WithString("resultFormat", ResultFormatMapper::GetNameForResultFormat(m_resultFormat));
+  }
+
   return payload;
 }
 

generated/src/aws-cpp-sdk-cleanroomsml/source/model/ResultFormat.cpp

@@ -0,0 +1,72 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cleanroomsml/model/ResultFormat.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace CleanRoomsML
+  {
+    namespace Model
+    {
+      namespace ResultFormatMapper
+      {
+
+        static const int CSV_HASH = HashingUtils::HashString("CSV");
+        static const int PARQUET_HASH = HashingUtils::HashString("PARQUET");
+
+
+        ResultFormat GetResultFormatForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == CSV_HASH)
+          {
+            return ResultFormat::CSV;
+          }
+          else if (hashCode == PARQUET_HASH)
+          {
+            return ResultFormat::PARQUET;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<ResultFormat>(hashCode);
+          }
+
+          return ResultFormat::NOT_SET;
+        }
+
+        Aws::String GetNameForResultFormat(ResultFormat enumValue)
+        {
+          switch(enumValue)
+          {
+          case ResultFormat::NOT_SET:
+            return {};
+          case ResultFormat::CSV:
+            return "CSV";
+          case ResultFormat::PARQUET:
+            return "PARQUET";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace ResultFormatMapper
+    } // namespace Model
+  } // namespace CleanRoomsML
+} // namespace Aws

generated/src/aws-cpp-sdk-cloudfront/include/aws/cloudfront/CloudFrontClient.h

@@ -84,19 +84,25 @@ namespace CloudFront
 
 
         /**
-         * <p>Associates an alias (also known as a CNAME or an alternate domain name) with
-         * a CloudFront distribution.</p> <p>With this operation you can move an alias
-         * that's already in use on a CloudFront distribution to a different distribution
-         * in one step. This prevents the downtime that could occur if you first remove the
-         * alias from one distribution and then separately add the alias to another
-         * distribution.</p> <p>To use this operation to associate an alias with a
-         * distribution, you provide the alias and the ID of the target distribution for
-         * the alias. For more information, including how to set up the target
+         * <p> <p>The <code>AssociateAlias</code> API operation only supports
+         * standard distributions. To move domains between distribution tenants and/or
+         * standard distributions, we recommend that you use the <a
+         * href="https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDomainAssociation.html">UpdateDomainAssociation</a>
+         * API operation instead.</p>  <p>Associates an alias with a CloudFront
+         * standard distribution. An alias is commonly known as a custom domain or vanity
+         * domain. It can also be called a CNAME or alternate domain name.</p> <p>With this
+         * operation, you can move an alias that's already used for a standard distribution
+         * to a different standard distribution. This prevents the downtime that could
+         * occur if you first remove the alias from one standard distribution and then
+         * separately add the alias to another standard distribution.</p> <p>To use this
+         * operation, specify the alias and the ID of the target standard distribution.</p>
+         * <p>For more information, including how to set up the target standard
          * distribution, prerequisites that you must complete, and other restrictions, see
          * <a
          * href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html#alternate-domain-names-move">Moving
-         * an alternate domain name to a different distribution</a> in the <i>Amazon
-         * CloudFront Developer Guide</i>.</p><p><h3>See Also:</h3>   <a
+         * an alternate domain name to a different standard distribution or distribution
+         * tenant</a> in the <i>Amazon CloudFront Developer Guide</i>.</p></p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2020-05-31/AssociateAlias2020_05_31">AWS
          * API Reference</a></p>
          */
@@ -2682,33 +2688,39 @@ namespace CloudFront
         }
 
         /**
-         * <p>Gets a list of aliases (also called CNAMEs or alternate domain names) that
-         * conflict or overlap with the provided alias, and the associated CloudFront
-         * distributions and Amazon Web Services accounts for each conflicting alias. In
-         * the returned list, the distribution and account IDs are partially hidden, which
-         * allows you to identify the distributions and accounts that you own, but helps to
+         * <p> <p>The <code>ListConflictingAliases</code> API operation only supports
+         * standard distributions. To list domain conflicts for both standard distributions
+         * and distribution tenants, we recommend that you use the <a
+         * href="https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListDomainConflicts.html">ListDomainConflicts</a>
+         * API operation instead.</p>  <p>Gets a list of aliases that conflict or
+         * overlap with the provided alias, and the associated CloudFront standard
+         * distribution and Amazon Web Services accounts for each conflicting alias. An
+         * alias is commonly known as a custom domain or vanity domain. It can also be
+         * called a CNAME or alternate domain name.</p> <p>In the returned list, the
+         * standard distribution and account IDs are partially hidden, which allows you to
+         * identify the standard distribution and accounts that you own, and helps to
          * protect the information of ones that you don't own.</p> <p>Use this operation to
          * find aliases that are in use in CloudFront that conflict or overlap with the
          * provided alias. For example, if you provide <code>www.example.com</code> as
          * input, the returned list can include <code>www.example.com</code> and the
-         * overlapping wildcard alternate domain name (<code>*.example.com</code>), if they
-         * exist. If you provide <code>*.example.com</code> as input, the returned list can
-         * include <code>*.example.com</code> and any alternate domain names covered by
-         * that wildcard (for example, <code>www.example.com</code>,
+         * overlapping wildcard alternate domain name (<code><em>.example.com</code>), if
+         * they exist. If you provide <code></em>.example.com</code> as input, the returned
+         * list can include <code>*.example.com</code> and any alternate domain names
+         * covered by that wildcard (for example, <code>www.example.com</code>,
          * <code>test.example.com</code>, <code>dev.example.com</code>, and so on), if they
-         * exist.</p> <p>To list conflicting aliases, you provide the alias to search and
-         * the ID of a distribution in your account that has an attached SSL/TLS
+         * exist.</p> <p>To list conflicting aliases, specify the alias to search and the
+         * ID of a standard distribution in your account that has an attached TLS
          * certificate that includes the provided alias. For more information, including
-         * how to set up the distribution and certificate, see <a
+         * how to set up the standard distribution and certificate, see <a
          * href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html#alternate-domain-names-move">Moving
-         * an alternate domain name to a different distribution</a> in the <i>Amazon
-         * CloudFront Developer Guide</i>.</p> <p>You can optionally specify the maximum
-         * number of items to receive in the response. If the total number of items in the
-         * list exceeds the maximum that you specify, or the default maximum, the response
-         * is paginated. To get the next page of items, send a subsequent request that
-         * specifies the <code>NextMarker</code> value from the current response as the
-         * <code>Marker</code> value in the subsequent request.</p><p><h3>See Also:</h3>  
-         * <a
+         * an alternate domain name to a different standard distribution or distribution
+         * tenant</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> <p>You can
+         * optionally specify the maximum number of items to receive in the response. If
+         * the total number of items in the list exceeds the maximum that you specify, or
+         * the default maximum, the response is paginated. To get the next page of items,
+         * send a subsequent request that specifies the <code>NextMarker</code> value from
+         * the current response as the <code>Marker</code> value in the subsequent
+         * request.</p></p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2020-05-31/ListConflictingAliases2020_05_31">AWS
          * API Reference</a></p>
          */
@@ -3137,10 +3149,37 @@ namespace CloudFront
         }
 
         /**
+         * <p> <p>We recommend that you use the <code>ListDomainConflicts</code> API
+         * operation to check for domain conflicts, as it supports both standard
+         * distributions and distribution tenants. <a
+         * href="https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListConflictingAliases.html">ListConflictingAliases</a>
+         * performs similar checks but only supports standard distributions.</p> 
          * <p>Lists existing domain associations that conflict with the domain that you
-         * specify.</p> <p>You can use this API operation when transferring domains to
-         * identify potential domain conflicts. Domain conflicts must be resolved first
-         * before they can be moved.</p><p><h3>See Also:</h3>   <a
+         * specify.</p> <p>You can use this API operation to identify potential domain
+         * conflicts when moving domains between standard distributions and/or distribution
+         * tenants. Domain conflicts must be resolved first before they can be moved. </p>
+         * <p>For example, if you provide <code>www.example.com</code> as input, the
+         * returned list can include <code>www.example.com</code> and the overlapping
+         * wildcard alternate domain name (<code><em>.example.com</code>), if they exist.
+         * If you provide <code></em>.example.com</code> as input, the returned list can
+         * include <code>*.example.com</code> and any alternate domain names covered by
+         * that wildcard (for example, <code>www.example.com</code>,
+         * <code>test.example.com</code>, <code>dev.example.com</code>, and so on), if they
+         * exist.</p> <p>To list conflicting domains, specify the following:</p> <ul> <li>
+         * <p>The domain to search for</p> </li> <li> <p>The ID of a standard distribution
+         * or distribution tenant in your account that has an attached TLS certificate,
+         * which covers the specified domain</p> </li> </ul> <p>For more information,
+         * including how to set up the standard distribution or distribution tenant, and
+         * the certificate, see <a
+         * href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html#alternate-domain-names-move">Moving
+         * an alternate domain name to a different standard distribution or distribution
+         * tenant</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> <p>You can
+         * optionally specify the maximum number of items to receive in the response. If
+         * the total number of items in the list exceeds the maximum that you specify, or
+         * the default maximum, the response is paginated. To get the next page of items,
+         * send a subsequent request that specifies the <code>NextMarker</code> value from
+         * the current response as the <code>Marker</code> value in the subsequent
+         * request.</p></p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2020-05-31/ListDomainConflicts2020_05_31">AWS
          * API Reference</a></p>
          */
@@ -3950,8 +3989,23 @@ namespace CloudFront
         }
 
         /**
-         * <p>Moves a domain from its current distribution or distribution tenant to
-         * another one.</p><p><h3>See Also:</h3>   <a
+         * <p> <p>We recommend that you use the <code>UpdateDomainAssociation</code>
+         * API operation to move a domain association, as it supports both standard
+         * distributions and distribution tenants. <a
+         * href="https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_AssociateAlias.html">AssociateAlias</a>
+         * performs similar checks but only supports standard distributions.</p> 
+         * <p>Moves a domain from its current standard distribution or distribution tenant
+         * to another one.</p> <p>You must first disable the source distribution (standard
+         * distribution or distribution tenant) and then separately call this operation to
+         * move the domain to another target distribution (standard distribution or
+         * distribution tenant).</p> <p>To use this operation, specify the domain and the
+         * ID of the target resource (standard distribution or distribution tenant). For
+         * more information, including how to set up the target resource, prerequisites
+         * that you must complete, and other restrictions, see <a
+         * href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html#alternate-domain-names-move">Moving
+         * an alternate domain name to a different standard distribution or distribution
+         * tenant</a> in the <i>Amazon CloudFront Developer Guide</i>.</p></p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cloudfront-2020-05-31/UpdateDomainAssociation2020_05_31">AWS
          * API Reference</a></p>
          */

generated/src/aws-cpp-sdk-cloudfront/include/aws/cloudfront/model/AssociateAlias2020_05_31Request.h

@@ -40,7 +40,8 @@ namespace Model
 
     ///@{
     /**
-     * <p>The ID of the distribution that you're associating the alias with.</p>
+     * <p>The ID of the standard distribution that you're associating the alias
+     * with.</p>
      */
     inline const Aws::String& GetTargetDistributionId() const { return m_targetDistributionId; }
     inline bool TargetDistributionIdHasBeenSet() const { return m_targetDistributionIdHasBeenSet; }
@@ -52,7 +53,8 @@ namespace Model
 
     ///@{
     /**
-     * <p>The alias (also known as a CNAME) to add to the target distribution.</p>
+     * <p>The alias (also known as a CNAME) to add to the target standard
+     * distribution.</p>
      */
     inline const Aws::String& GetAlias() const { return m_alias; }
     inline bool AliasHasBeenSet() const { return m_aliasHasBeenSet; }