merge conflict handle

aws · Dec 16, 2024 · 8f6a536 · 8f6a536
2 parents d1ce263 + 907d505
commit 8f6a536
Show file tree

Hide file tree

Showing 67 changed files with 2,214 additions and 1,152 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.467
+1.11.468
diff --git a/generated/smoke-tests/acm/ACMSmokeTests.cpp b/generated/smoke-tests/acm/ACMSmokeTests.cpp
@@ -18,6 +18,7 @@
 #include <aws/acm/model/ListCertificatesRequest.h>
 #include <aws/acm/ACMClient.h>
 #include <aws/acm/model/GetCertificateRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace ACMSmokeTest{
 using namespace Aws::Auth;
@@ -31,7 +32,7 @@ class ACMSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char ACMSmokeTestSuite::ALLOCATION_TAG[] = "ACMSmokeTest";
-TEST_F(ACMSmokeTestSuite, GetCertificateFailure )
+TEST_F(ACMSmokeTestSuite, ListCertificatesSuccess )
 {
     Aws::ACM::ACMClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -40,12 +41,11 @@ TEST_F(ACMSmokeTestSuite, GetCertificateFailure )
     auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    GetCertificateRequest input;
-    input.SetCertificateArn("arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012");
-    auto outcome = clientSp->GetCertificate(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    ListCertificatesRequest input;
+    auto outcome = clientSp->ListCertificates(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
-TEST_F(ACMSmokeTestSuite, ListCertificatesSuccess )
+TEST_F(ACMSmokeTestSuite, GetCertificateFailure )
 {
     Aws::ACM::ACMClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -54,8 +54,9 @@ TEST_F(ACMSmokeTestSuite, ListCertificatesSuccess )
     auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListCertificatesRequest input;
-    auto outcome = clientSp->ListCertificates(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    GetCertificateRequest input;
+    input.SetCertificateArn("arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012");
+    auto outcome = clientSp->GetCertificate(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/ec2/EC2SmokeTests.cpp b/generated/smoke-tests/ec2/EC2SmokeTests.cpp
@@ -18,7 +18,6 @@
 #include <aws/ec2/model/DescribeInstancesRequest.h>
 #include <aws/ec2/model/DescribeRegionsRequest.h>
 #include <aws/ec2/EC2Client.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace EC2SmokeTest{
 using namespace Aws::Auth;
@@ -32,19 +31,6 @@ class EC2SmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char EC2SmokeTestSuite::ALLOCATION_TAG[] = "EC2SmokeTest";
-TEST_F(EC2SmokeTestSuite, DescribeRegionsSuccess )
-{
-    Aws::EC2::EC2ClientConfiguration clientConfiguration;
-    clientConfiguration.region = "us-west-2";
-    clientConfiguration.useFIPS = false;
-    clientConfiguration.useDualStack = false;
-    auto clientSp = Aws::MakeShared<EC2Client>(ALLOCATION_TAG, clientConfiguration);
-    //populate input params
-
-    DescribeRegionsRequest input;
-    auto outcome = clientSp->DescribeRegions(input);
-    EXPECT_TRUE( outcome.IsSuccess());
-}
 TEST_F(EC2SmokeTestSuite, DescribeInstancesFailure )
 {
     Aws::EC2::EC2ClientConfiguration clientConfiguration;
@@ -68,4 +54,17 @@ TEST_F(EC2SmokeTestSuite, DescribeInstancesFailure )
     auto outcome = clientSp->DescribeInstances(input);
     EXPECT_FALSE( outcome.IsSuccess());
 }
+TEST_F(EC2SmokeTestSuite, DescribeRegionsSuccess )
+{
+    Aws::EC2::EC2ClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<EC2Client>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    DescribeRegionsRequest input;
+    auto outcome = clientSp->DescribeRegions(input);
+    EXPECT_TRUE( outcome.IsSuccess());
+}
 }
diff --git a/generated/smoke-tests/ecr/ECRSmokeTests.cpp b/generated/smoke-tests/ecr/ECRSmokeTests.cpp
@@ -18,7 +18,6 @@
 #include <aws/ecr/model/ListImagesRequest.h>
 #include <aws/ecr/model/DescribeRepositoriesRequest.h>
 #include <aws/ecr/ECRClient.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace ECRSmokeTest{
 using namespace Aws::Auth;
@@ -32,7 +31,7 @@ class ECRSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char ECRSmokeTestSuite::ALLOCATION_TAG[] = "ECRSmokeTest";
-TEST_F(ECRSmokeTestSuite, DescribeRepositoriesSuccess )
+TEST_F(ECRSmokeTestSuite, ListImagesFailure )
 {
     Aws::ECR::ECRClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -41,11 +40,12 @@ TEST_F(ECRSmokeTestSuite, DescribeRepositoriesSuccess )
     auto clientSp = Aws::MakeShared<ECRClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    DescribeRepositoriesRequest input;
-    auto outcome = clientSp->DescribeRepositories(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    ListImagesRequest input;
+    input.SetRepositoryName("not-a-real-repository");
+    auto outcome = clientSp->ListImages(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
-TEST_F(ECRSmokeTestSuite, ListImagesFailure )
+TEST_F(ECRSmokeTestSuite, DescribeRepositoriesSuccess )
 {
     Aws::ECR::ECRClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -54,9 +54,8 @@ TEST_F(ECRSmokeTestSuite, ListImagesFailure )
     auto clientSp = Aws::MakeShared<ECRClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListImagesRequest input;
-    input.SetRepositoryName("not-a-real-repository");
-    auto outcome = clientSp->ListImages(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    DescribeRepositoriesRequest input;
+    auto outcome = clientSp->DescribeRepositories(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/iam/IAMSmokeTests.cpp b/generated/smoke-tests/iam/IAMSmokeTests.cpp
@@ -18,6 +18,7 @@
 #include <aws/iam/model/GetUserRequest.h>
 #include <aws/iam/IAMClient.h>
 #include <aws/iam/model/ListUsersRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace IAMSmokeTest{
 using namespace Aws::Auth;
@@ -31,7 +32,7 @@ class IAMSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char IAMSmokeTestSuite::ALLOCATION_TAG[] = "IAMSmokeTest";
-TEST_F(IAMSmokeTestSuite, GetUserFailure )
+TEST_F(IAMSmokeTestSuite, ListUsersSuccess )
 {
     Aws::IAM::IAMClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-east-1";
@@ -40,12 +41,11 @@ TEST_F(IAMSmokeTestSuite, GetUserFailure )
     auto clientSp = Aws::MakeShared<IAMClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    GetUserRequest input;
-    input.SetUserName("fake_user");
-    auto outcome = clientSp->GetUser(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    ListUsersRequest input;
+    auto outcome = clientSp->ListUsers(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
-TEST_F(IAMSmokeTestSuite, ListUsersSuccess )
+TEST_F(IAMSmokeTestSuite, GetUserFailure )
 {
     Aws::IAM::IAMClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-east-1";
@@ -54,8 +54,9 @@ TEST_F(IAMSmokeTestSuite, ListUsersSuccess )
     auto clientSp = Aws::MakeShared<IAMClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListUsersRequest input;
-    auto outcome = clientSp->ListUsers(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    GetUserRequest input;
+    input.SetUserName("fake_user");
+    auto outcome = clientSp->GetUser(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/kinesis/KinesisSmokeTests.cpp b/generated/smoke-tests/kinesis/KinesisSmokeTests.cpp
@@ -18,6 +18,7 @@
 #include <aws/kinesis/KinesisClient.h>
 #include <aws/kinesis/model/ListStreamsRequest.h>
 #include <aws/kinesis/model/DescribeStreamRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace KinesisSmokeTest{
 using namespace Aws::Auth;
@@ -31,7 +32,7 @@ class KinesisSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char KinesisSmokeTestSuite::ALLOCATION_TAG[] = "KinesisSmokeTest";
-TEST_F(KinesisSmokeTestSuite, DescribeStreamFailure )
+TEST_F(KinesisSmokeTestSuite, ListStreamsSuccess )
 {
     Aws::Kinesis::KinesisClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -40,12 +41,11 @@ TEST_F(KinesisSmokeTestSuite, DescribeStreamFailure )
     auto clientSp = Aws::MakeShared<KinesisClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    DescribeStreamRequest input;
-    input.SetStreamName("bogus-stream-name");
-    auto outcome = clientSp->DescribeStream(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    ListStreamsRequest input;
+    auto outcome = clientSp->ListStreams(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
-TEST_F(KinesisSmokeTestSuite, ListStreamsSuccess )
+TEST_F(KinesisSmokeTestSuite, DescribeStreamFailure )
 {
     Aws::Kinesis::KinesisClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -54,8 +54,9 @@ TEST_F(KinesisSmokeTestSuite, ListStreamsSuccess )
     auto clientSp = Aws::MakeShared<KinesisClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListStreamsRequest input;
-    auto outcome = clientSp->ListStreams(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    DescribeStreamRequest input;
+    input.SetStreamName("bogus-stream-name");
+    auto outcome = clientSp->DescribeStream(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/neptune/NeptuneSmokeTests.cpp b/generated/smoke-tests/neptune/NeptuneSmokeTests.cpp
@@ -18,7 +18,6 @@
 #include <aws/neptune/NeptuneClient.h>
 #include <aws/neptune/model/DescribeDBInstancesRequest.h>
 #include <aws/neptune/model/DescribeDBEngineVersionsRequest.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace NeptuneSmokeTest{
 using namespace Aws::Auth;
@@ -32,7 +31,7 @@ class NeptuneSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char NeptuneSmokeTestSuite::ALLOCATION_TAG[] = "NeptuneSmokeTest";
-TEST_F(NeptuneSmokeTestSuite, DescribeDBEngineVersionsSuccess )
+TEST_F(NeptuneSmokeTestSuite, DescribeDBInstancesFailure )
 {
     Aws::Neptune::NeptuneClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -41,11 +40,12 @@ TEST_F(NeptuneSmokeTestSuite, DescribeDBEngineVersionsSuccess )
     auto clientSp = Aws::MakeShared<NeptuneClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    DescribeDBEngineVersionsRequest input;
-    auto outcome = clientSp->DescribeDBEngineVersions(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    DescribeDBInstancesRequest input;
+    input.SetDBInstanceIdentifier("fake-id");
+    auto outcome = clientSp->DescribeDBInstances(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
-TEST_F(NeptuneSmokeTestSuite, DescribeDBInstancesFailure )
+TEST_F(NeptuneSmokeTestSuite, DescribeDBEngineVersionsSuccess )
 {
     Aws::Neptune::NeptuneClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -54,9 +54,8 @@ TEST_F(NeptuneSmokeTestSuite, DescribeDBInstancesFailure )
     auto clientSp = Aws::MakeShared<NeptuneClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    DescribeDBInstancesRequest input;
-    input.SetDBInstanceIdentifier("fake-id");
-    auto outcome = clientSp->DescribeDBInstances(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    DescribeDBEngineVersionsRequest input;
+    auto outcome = clientSp->DescribeDBEngineVersions(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/secretsmanager/SecretsManagerSmokeTests.cpp b/generated/smoke-tests/secretsmanager/SecretsManagerSmokeTests.cpp
@@ -18,7 +18,6 @@
 #include <aws/secretsmanager/model/ListSecretsRequest.h>
 #include <aws/secretsmanager/model/DescribeSecretRequest.h>
 #include <aws/secretsmanager/SecretsManagerClient.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace SecretsManagerSmokeTest{
 using namespace Aws::Auth;
@@ -32,7 +31,7 @@ class SecretsManagerSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char SecretsManagerSmokeTestSuite::ALLOCATION_TAG[] = "SecretsManagerSmokeTest";
-TEST_F(SecretsManagerSmokeTestSuite, ListSecretsSuccess )
+TEST_F(SecretsManagerSmokeTestSuite, DescribeSecretFailure )
 {
     Aws::SecretsManager::SecretsManagerClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -41,11 +40,12 @@ TEST_F(SecretsManagerSmokeTestSuite, ListSecretsSuccess )
     auto clientSp = Aws::MakeShared<SecretsManagerClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListSecretsRequest input;
-    auto outcome = clientSp->ListSecrets(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    DescribeSecretRequest input;
+    input.SetSecretId("fake-secret-id");
+    auto outcome = clientSp->DescribeSecret(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
-TEST_F(SecretsManagerSmokeTestSuite, DescribeSecretFailure )
+TEST_F(SecretsManagerSmokeTestSuite, ListSecretsSuccess )
 {
     Aws::SecretsManager::SecretsManagerClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-west-2";
@@ -54,9 +54,8 @@ TEST_F(SecretsManagerSmokeTestSuite, DescribeSecretFailure )
     auto clientSp = Aws::MakeShared<SecretsManagerClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    DescribeSecretRequest input;
-    input.SetSecretId("fake-secret-id");
-    auto outcome = clientSp->DescribeSecret(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    ListSecretsRequest input;
+    auto outcome = clientSp->ListSecrets(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
 }
diff --git a/generated/smoke-tests/ssm-quicksetup/SSMQuickSetupSmokeTests.cpp b/generated/smoke-tests/ssm-quicksetup/SSMQuickSetupSmokeTests.cpp
@@ -15,9 +15,10 @@
 #include <algorithm>
 #include <aws/testing/AwsCppSdkGTestSuite.h>
 #include <aws/testing/AwsTestHelpers.h>
-#include <aws/ssm-quicksetup/model/GetConfigurationManagerRequest.h>
 #include <aws/ssm-quicksetup/model/ListConfigurationManagersRequest.h>
+#include <aws/ssm-quicksetup/model/GetConfigurationManagerRequest.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupClient.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 
 namespace SSMQuickSetupSmokeTest{
 using namespace Aws::Auth;
@@ -31,7 +32,7 @@ class SSMQuickSetupSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
     static const char ALLOCATION_TAG[];
 };
 const char SSMQuickSetupSmokeTestSuite::ALLOCATION_TAG[] = "SSMQuickSetupSmokeTest";
-TEST_F(SSMQuickSetupSmokeTestSuite, GetConfigurationManagerFailure )
+TEST_F(SSMQuickSetupSmokeTestSuite, ListConfigurationManagersSuccess )
 {
     Aws::SSMQuickSetup::SSMQuickSetupClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-east-1";
@@ -40,12 +41,11 @@ TEST_F(SSMQuickSetupSmokeTestSuite, GetConfigurationManagerFailure )
     auto clientSp = Aws::MakeShared<SSMQuickSetupClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    GetConfigurationManagerRequest input;
-    input.SetManagerArn("arn:aws:ssm-quicksetup:us-east-1:602768233532:configuration-manager/7cac1a1b-64a9-4c9a-97e8-8c68928b8f13");
-    auto outcome = clientSp->GetConfigurationManager(input);
-    EXPECT_FALSE( outcome.IsSuccess());
+    ListConfigurationManagersRequest input;
+    auto outcome = clientSp->ListConfigurationManagers(input);
+    EXPECT_TRUE( outcome.IsSuccess());
 }
-TEST_F(SSMQuickSetupSmokeTestSuite, ListConfigurationManagersSuccess )
+TEST_F(SSMQuickSetupSmokeTestSuite, GetConfigurationManagerFailure )
 {
     Aws::SSMQuickSetup::SSMQuickSetupClientConfiguration clientConfiguration;
     clientConfiguration.region = "us-east-1";
@@ -54,8 +54,9 @@ TEST_F(SSMQuickSetupSmokeTestSuite, ListConfigurationManagersSuccess )
     auto clientSp = Aws::MakeShared<SSMQuickSetupClient>(ALLOCATION_TAG, clientConfiguration);
     //populate input params
 
-    ListConfigurationManagersRequest input;
-    auto outcome = clientSp->ListConfigurationManagers(input);
-    EXPECT_TRUE( outcome.IsSuccess());
+    GetConfigurationManagerRequest input;
+    input.SetManagerArn("arn:aws:ssm-quicksetup:us-east-1:602768233532:configuration-manager/7cac1a1b-64a9-4c9a-97e8-8c68928b8f13");
+    auto outcome = clientSp->GetConfigurationManager(input);
+    EXPECT_FALSE( outcome.IsSuccess());
 }
 }