chore: avoid conflict on zip download from s3 (#286)

aneoconsulting · Jul 30, 2024 · 389462f · 389462f
2 parents da71390 + 7a70f3a
commit 389462f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Worker/src/Common/Adapter/S3Adapter.cs b/Worker/src/Common/Adapter/S3Adapter.cs
@@ -103,8 +103,10 @@ public async Task DownloadFileAsync(string fileName)
                                         });
     var stream2 = new BufferedStream(r.ResponseStream);
 
+    var materializedFileName = fileName + Guid.NewGuid();
+
     var file = new FileStream(Path.Combine(LocalZipDir,
-                                           fileName),
+                                           materializedFileName),
                               FileMode.Create,
                               FileAccess.Write);
     try
@@ -133,5 +135,10 @@ public async Task DownloadFileAsync(string fileName)
 
       throw new Exception("Error occurred: " + amazonS3Exception.Message);
     }
+
+    File.Move(Path.Combine(LocalZipDir,
+                           materializedFileName),
+              Path.Combine(LocalZipDir,
+                           fileName));
   }
 }