Skip Virtual-Addressing when bucket name contains uppercase letters.

Marco Magdy · Marco Magdy · commit 3d43c1db758a · 2017-06-07T12:31:20.000-07:00
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientSource.vm
@@ -14,7 +14,11 @@ Aws::String ${className}::GeneratePresignedUrl(const Aws::String& bucketName, co
 Aws::String ${className}::ComputeEndpointString(const Aws::String& bucket) const
 {
     Aws::StringStream ss;
-    if(m_useVirtualAdressing && Aws::Utils::IsValidDnsLabel(bucket))
+    // when using virtual hosting of buckets, the bucket name has to follow some rules.
+    // Mainly, it has to be a valid DNS label, and it must be lowercase.
+    // For more information see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingSpecifyBucket
+    if(m_useVirtualAdressing && Aws::Utils::IsValidDnsLabel(bucket) && 
+            bucket == Aws::Utils::StringUtils::ToLower(bucket.c_str())) 
     {
         ss << m_scheme << "://" << bucket << "." << m_baseUri;
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ Aws::String ${className}::GeneratePresignedUrl(const Aws::String& bucketName, co`
`14`	`14`	`Aws::String ${className}::ComputeEndpointString(const Aws::String& bucket) const`
`15`	`15`	`{`
`16`	`16`	`Aws::StringStream ss;`
`17`		`- if(m_useVirtualAdressing && Aws::Utils::IsValidDnsLabel(bucket))`
	`17`	`+ // when using virtual hosting of buckets, the bucket name has to follow some rules.`
	`18`	`+ // Mainly, it has to be a valid DNS label, and it must be lowercase.`
	`19`	`+ // For more information see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingSpecifyBucket`
	`20`	`+ if(m_useVirtualAdressing && Aws::Utils::IsValidDnsLabel(bucket) &&`
	`21`	`+ bucket == Aws::Utils::StringUtils::ToLower(bucket.c_str()))`
`18`	`22`	`{`
`19`	`23`	`ss << m_scheme << "://" << bucket << "." << m_baseUri;`
`20`	`24`	`}`