Update AWS and Azure packages (#199)

* Update AWS and identity packages * ECSTaskCredentials -> GenericContainerCredentials
emgarten · Jul 10, 2024 · 610cb10 · 610cb10
1 parent 11922d4
commit 610cb10
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 6.1.0
+* Updated AWS SDK packages to improve support for non AWS S3 storage
+* Updated Azure Storage and Azure Identity packages to fix vulnerability
+
 ## 6.0.2
 * Fixed a bug where Azure feeds failed when path was not set to the full container URI [Issue](https://github.com/emgarten/Sleet/issues/197)
 

diff --git a/build/config.props b/build/config.props
@@ -3,17 +3,17 @@
   <!-- Dependency versions -->
   <PropertyGroup>
     <NuGetPackageVersion>6.9.1</NuGetPackageVersion>
-    <AzureStorageBlobsVersion>12.19.1</AzureStorageBlobsVersion>
+    <AzureStorageBlobsVersion>12.20.0</AzureStorageBlobsVersion>
     <JsonVersion>13.0.3</JsonVersion>
     <CommandLineUtilsVersion>2.0.0</CommandLineUtilsVersion>
     <NuGetTestHelpersVersion>2.1.36</NuGetTestHelpersVersion>
     <PortablePdbVersion>1.5.0</PortablePdbVersion>
-    <AWSSDKVersion>3.7.305.14</AWSSDKVersion>
-    <AWSSDKTokenVersion>3.7.300.40</AWSSDKTokenVersion>
-    <AWSSDKSSOVersion>3.7.300.39</AWSSDKSSOVersion>
-    <AWSSDKSSOOIDCVersion>3.7.301.34</AWSSDKSSOOIDCVersion>
+    <AWSSDKVersion>3.7.310.4</AWSSDKVersion>
+    <AWSSDKTokenVersion>3.7.300.117</AWSSDKTokenVersion>
+    <AWSSDKSSOVersion>3.7.300.116</AWSSDKSSOVersion>
+    <AWSSDKSSOOIDCVersion>3.7.302.27</AWSSDKSSOOIDCVersion>
     <DotNetConfigVersion>1.0.6</DotNetConfigVersion>
-    <AzureIdentityVersion>1.11.2</AzureIdentityVersion>
+    <AzureIdentityVersion>1.12.0</AzureIdentityVersion>
   </PropertyGroup>
 
   <!-- Config -->

diff --git a/src/SleetLib/FileSystem/FileSystemFactory.cs b/src/SleetLib/FileSystem/FileSystemFactory.cs
@@ -182,10 +182,13 @@ public static async Task<ISleetFileSystem> CreateFileSystemAsync(LocalSettings s
                             amazonS3Client = new AmazonS3Client(new EnvironmentVariablesAWSCredentials(), config);
                         }
                         // Load credentials from an ECS docker container
+                        // Check if the env var GenericContainerCredentials.RelativeURIEnvVariable exists
+                        // Previously this used ECSTaskCredentials.RelativeURIEnvVariable but that was 
+                        // deprecated and the property is now internal on GenericContainerCredentials
                         else if (
-                            !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable(ECSTaskCredentials.ContainerCredentialsURIEnvVariable)))
+                            !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")))
                         {
-                            amazonS3Client = new AmazonS3Client(new ECSTaskCredentials(), config);
+                            amazonS3Client = new AmazonS3Client(new GenericContainerCredentials(), config);
                         }
                         // Assume IAM role
                         else