simplyfy test

Author: sbera87

tests/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp

@@ -735,13 +735,13 @@ TEST_F(S3ControlTest, TestRemoveHostPrefix)
     ClientConfiguration config;
     config.region = Aws::Region::US_EAST_1;
     auto s3controlClient = S3ControlClient(config);
-    Aws::String bucket = "bdaivat-test-ap-bucket--use2-az1--x-s3";
-    Aws::String accessPointName = "bdaivat-test-ap--use2-az1--xa-s3";
+    Aws::String bucket = "test-ap-bucket--use2-az1--x-s3";
+    Aws::String accessPointName = "test-ap--use2-az1--xa-s3";
     auto request = CreateAccessPointRequest{}
     .WithName(accessPointName)
     .WithBucket(bucket)
-    .WithAccountId("382420381362")
-    .WithBucketAccountId("382420381362");
+    .WithAccountId(m_accountId)
+    .WithBucketAccountId(m_accountId);
     auto resolveEndpointOutcome = s3controlClient.accessEndpointProvider()->ResolveEndpoint(request.GetEndpointContextParams());
     EXPECT_TRUE(resolveEndpointOutcome.IsSuccess());
     EXPECT_EQ(resolveEndpointOutcome.GetResult().GetURL(), "https://s3express-control.us-east-1.amazonaws.com");

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/common/UriRequestQueryParams.vm

@@ -26,8 +26,7 @@ ${indent}  }
 #if(!$operation.request.shape.hasEventStreamMembers() && !($serviceNamespace == "S3Crt" && $operation.s3CrtEnabled))
 ${indent}  AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ${operation.name}, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
 #if($operation.hasEndpointTrait)## Note: EndpointDiscovery Trait is not Endpoint Trait
-#if($serviceNamespace == "S3Control" && $serviceModel.rawEndpointRules)
-#else
+#if(!($serviceNamespace == "S3Control" && $serviceModel.rawEndpointRules))
 ${indent}  auto addPrefixErr = endpointResolutionOutcome.GetResult().AddPrefixIfMissing(${operation.endpoint.constructHostPrefixString("request")});
 ${indent}  AWS_CHECK(SERVICE_NAME, !addPrefixErr, addPrefixErr->GetMessage(), ${operation.name}Outcome(addPrefixErr.value()));
 #end