Address PR feedback2

aws · Oct 17, 2024 · 73efa50 · 73efa50
1 parent 68f6a05
commit 73efa50
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 76 deletions.
diff --git a/sdk/src/Services/S3/Custom/AmazonS3Config.cs b/sdk/src/Services/S3/Custom/AmazonS3Config.cs
@@ -35,7 +35,6 @@ public partial class AmazonS3Config : ClientConfig
         private const string DefaultProfileName = "default";
         private const string AwsS3UsEast1RegionalEndpointsEnvironmentVariable = "AWS_S3_US_EAST_1_REGIONAL_ENDPOINT";
         private const string DisableMRAPEnvName = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS";
-        private const string AwsConfigFileEnvName = "AWS_CONFIG_FILE";
 
         private bool forcePathStyle = false;
         private bool useAccelerateEndpoint = false;

diff --git a/sdk/test/Services/S3/UnitTests/Custom/UseArnRegionTests.cs b/sdk/test/Services/S3/UnitTests/Custom/UseArnRegionTests.cs
@@ -99,117 +99,69 @@ public void ExplicitlyEnable()
         [TestCategory("S3")]
         public void EnvironmentVariableEnable()
         {
-            var beginningS3UseArnRegionEnvValue = Environment.GetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE);
-            try
-            {
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "true");
-
-                var config = new AmazonS3Config
-                {
-                };
+            Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "true");
 
-                Assert.IsTrue(config.UseArnRegion);
-            }
-            finally
+            var config = new AmazonS3Config
             {
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, beginningS3UseArnRegionEnvValue);
-            }
+            };
+
+            Assert.IsTrue(config.UseArnRegion);
         }
 
         [TestMethod]
         [TestCategory("S3")]
         public void ExplicitDisableOverridesEnvironmentVariable()
         {
-            var beginningS3UseArnRegionEnvValue = Environment.GetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE);
-            try
-            {
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "true");
+            Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "true");
 
-                var config = new AmazonS3Config
-                {
-                    UseArnRegion = false
-                };
-
-                Assert.IsFalse(config.UseArnRegion);
-            }
-
-            finally
+            var config = new AmazonS3Config
             {
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, beginningS3UseArnRegionEnvValue);
-            }
+                UseArnRegion = false
+            };
 
+            Assert.IsFalse(config.UseArnRegion);
         }
 
         [TestMethod]
         [TestCategory("S3")]
         public void ProfileValueIsUsedIfSet()
         {
-            var beginningS3UseArnRegionEnvValue = Environment.GetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE);
-            try
-            {
-                Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-enabled");
-
-                var config = new AmazonS3Config
-                {
-                };
+            Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-enabled");
 
-                Assert.IsTrue(config.UseArnRegion);
-            }
-            finally
+            var config = new AmazonS3Config
             {
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, beginningS3UseArnRegionEnvValue);
-            }
+            };
 
+            Assert.IsTrue(config.UseArnRegion);
         }
 
         [TestMethod]
         [TestCategory("S3")]
         public void EnvironmentVariableTakesPrecedenceOverProfileValue()
         {
-            var beginningAwsProfileEnvValue = Environment.GetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE);
-            var beginningS3UseArnRegionEnvValue = Environment.GetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE);
-
-            try
-            {
-                Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-enabled");
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "false");
+            Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-enabled");
+            Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "false");
 
-                var config = new AmazonS3Config
-                {
-                };
-
-                Assert.IsFalse(config.UseArnRegion);
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "");
-            }
-            finally
+            var config = new AmazonS3Config
             {
+            };
 
-                Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, beginningAwsProfileEnvValue);
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, beginningS3UseArnRegionEnvValue);
-            }
+            Assert.IsFalse(config.UseArnRegion);
         }
 
         [TestMethod]
         [TestCategory("S3")]
         public void ConfigValueTakesPrecedenceOverAllValues()
         {
-            var beginningAwsProfileEnvValue = Environment.GetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE);
-            var beginningS3UseArnRegionEnvValue = Environment.GetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE);
-            try
-            {
-                Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-disabled");
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "false");
-                var config = new AmazonS3Config
-                {
-                    UseArnRegion = true
-                };
-                Assert.IsTrue(config.UseArnRegion);
-            }
-            finally
+            Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, "use-arn-region-disabled");
+            Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, "false");
+            var config = new AmazonS3Config
             {
-                Environment.SetEnvironmentVariable(AWS_PROFILE_ENVIRONMENT_VARIABLE, beginningAwsProfileEnvValue);
-                Environment.SetEnvironmentVariable(AWS_S3_USE_ARN_REGION_ENVIRONMENT_VARIABLE, beginningS3UseArnRegionEnvValue);
-            }
+                UseArnRegion = true
+            };
+
+            Assert.IsTrue(config.UseArnRegion);
+
         }
     }
 }