Fix the S3 getUrl tests not being isolated from other tests (#2111)

Author: abrooksv

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/s3/S3VirtualBucketTest.kt

@@ -35,9 +35,11 @@ import software.amazon.awssdk.services.s3.model.ListObjectsV2Response
 import software.amazon.awssdk.services.s3.model.ObjectIdentifier
 import software.amazon.awssdk.services.s3.model.PutObjectRequest
 import software.amazon.awssdk.services.s3.model.PutObjectResponse
+import software.aws.toolkits.core.region.AwsRegion
 import software.aws.toolkits.core.utils.delegateMock
 import software.aws.toolkits.jetbrains.core.AwsClientManager
 import software.aws.toolkits.jetbrains.core.MockClientManagerRule
+import software.aws.toolkits.jetbrains.core.credentials.MockAwsConnectionManager.ProjectAccountSettingsManagerRule
 import software.aws.toolkits.jetbrains.services.s3.editor.S3VirtualBucket
 import java.io.ByteArrayInputStream
 import java.net.URL
@@ -53,6 +55,10 @@ class S3VirtualBucketTest {
     @Rule
     val mockClientManager = MockClientManagerRule(projectRule)
 
+    @Rule
+    @JvmField
+    val settingsManagerRule = ProjectAccountSettingsManagerRule(projectRule)
+
     @Test
     fun deleteObjects() {
         val s3Client = mockClientManager.create<S3Client>()
@@ -203,16 +209,20 @@ class S3VirtualBucketTest {
 
     @Test
     fun getUrl() {
+        settingsManagerRule.settingsManager.changeRegionAndWait(AwsRegion("us-west-2", "US West (Oregon)", "aws"))
+
         // Use real manager for this since it can affect the S3Configuration that goes into S3Utilities
         AwsClientManager(projectRule.project).getClient<S3Client>().use {
             val sut = S3VirtualBucket(Bucket.builder().name("test-bucket").build(), it)
 
-            assertThat(sut.generateUrl("prefix/key")).isEqualTo(URL("https://test-bucket.s3.amazonaws.com/prefix/key"))
+            assertThat(sut.generateUrl("prefix/key")).isEqualTo(URL("https://test-bucket.s3.us-west-2.amazonaws.com/prefix/key"))
         }
     }
 
     @Test
     fun getUrlError() {
+        settingsManagerRule.settingsManager.changeRegionAndWait(AwsRegion("us-west-2", "US West (Oregon)", "aws"))
+
         // Use real manager for this since it can affect the S3Configuration that goes into S3Utilities
         AwsClientManager(projectRule.project).getClient<S3Client>().use {
             val sut = S3VirtualBucket(Bucket.builder().name("test-bucket").build(), it)