Testcontainers - images

managedcode · Jun 3, 2024 · 1b5fd89 · 1b5fd89
1 parent e64b91f
commit 1b5fd89
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 16 deletions.
diff --git a/ManagedCode.Storage.Azure/ManagedCode.Storage.Azure.csproj b/ManagedCode.Storage.Azure/ManagedCode.Storage.Azure.csproj
@@ -18,7 +18,6 @@
 
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.11.3" />
-        <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.18.0" />
         <PackageReference Include="ManagedCode.Communication" Version="8.0.1" />
         <PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />

diff --git a/ManagedCode.Storage.IntegrationTests/ManagedCode.Storage.IntegrationTests.csproj b/ManagedCode.Storage.IntegrationTests/ManagedCode.Storage.IntegrationTests.csproj
@@ -35,6 +35,7 @@
       <ProjectReference Include="..\ManagedCode.Storage.FileSystem\ManagedCode.Storage.FileSystem.csproj" />
       <ProjectReference Include="..\ManagedCode.Storage.Google\ManagedCode.Storage.Google.csproj" />
       <ProjectReference Include="..\ManagedCode.Storage.Server\ManagedCode.Storage.Server.csproj" />
+      <ProjectReference Include="..\ManagedCode.Storage.Tests\ManagedCode.Storage.Tests.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/ManagedCode.Storage.IntegrationTests/StorageTestApplication.cs b/ManagedCode.Storage.IntegrationTests/StorageTestApplication.cs
@@ -11,6 +11,7 @@
 using ManagedCode.Storage.Google.Extensions;
 using ManagedCode.Storage.Google.Options;
 using ManagedCode.Storage.IntegrationTests.TestApp;
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -27,7 +28,7 @@ public class StorageTestApplication : WebApplicationFactory<HttpHostProgram>, IC
     public StorageTestApplication()
     {
         _azuriteContainer = new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.30.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
 
         _azuriteContainer.StartAsync().Wait();

diff --git a/ManagedCode.Storage.Tests/Common/ContainerImages.cs b/ManagedCode.Storage.Tests/Common/ContainerImages.cs
@@ -0,0 +1,8 @@
+namespace ManagedCode.Storage.Tests.Common;
+
+public class ContainerImages
+{
+    public const string Azurite = "mcr.microsoft.com/azure-storage/azurite:3.30.0";
+    public const string FakeGCSServer = "fsouza/fake-gcs-server:1.49.1";
+    public const string LocalStack = "localstack/localstack:3.4.0";
+}
diff --git a/ManagedCode.Storage.Tests/ManagedCode.Storage.Tests.csproj b/ManagedCode.Storage.Tests/ManagedCode.Storage.Tests.csproj
@@ -56,5 +56,9 @@
         <ProjectReference Include="..\ManagedCode.Storage.TestFakes\ManagedCode.Storage.TestFakes.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="TestFakes\" />
+    </ItemGroup>
+
 </Project>
 
diff --git a/ManagedCode.Storage.Tests/Storages/AWS/AWSBlobTests.cs b/ManagedCode.Storage.Tests/Storages/AWS/AWSBlobTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.LocalStack;
 
@@ -7,7 +8,9 @@ public class AWSBlobTests : BlobTests<LocalStackContainer>
 {
     protected override LocalStackContainer Build()
     {
-        return new LocalStackBuilder().Build();
+        return new LocalStackBuilder()
+            .WithImage(ContainerImages.LocalStack)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/AWS/AWSContainerTests.cs b/ManagedCode.Storage.Tests/Storages/AWS/AWSContainerTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.LocalStack;
 
@@ -7,7 +8,9 @@ public class AWSContainerTests : ContainerTests<LocalStackContainer>
 {
     protected override LocalStackContainer Build()
     {
-        return new LocalStackBuilder().Build();
+        return new LocalStackBuilder()
+            .WithImage(ContainerImages.LocalStack)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/AWS/AWSDownloadTests.cs b/ManagedCode.Storage.Tests/Storages/AWS/AWSDownloadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.LocalStack;
 
@@ -7,7 +8,9 @@ public class AWSDownloadTests : DownloadTests<LocalStackContainer>
 {
     protected override LocalStackContainer Build()
     {
-        return new LocalStackBuilder().Build();
+        return new LocalStackBuilder()
+            .WithImage(ContainerImages.LocalStack)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/AWS/AWSUploadTests.cs b/ManagedCode.Storage.Tests/Storages/AWS/AWSUploadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.LocalStack;
 
@@ -7,7 +8,9 @@ public class AWSUploadTests : UploadTests<LocalStackContainer>
 {
     protected override LocalStackContainer Build()
     {
-        return new LocalStackBuilder().Build();
+        return new LocalStackBuilder()
+            .WithImage(ContainerImages.LocalStack)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/Azure/AzureBlobStreamTests.cs b/ManagedCode.Storage.Tests/Storages/Azure/AzureBlobStreamTests.cs
@@ -17,7 +17,7 @@ public class AzureBlobStreamTests : StreamTests<AzuriteContainer>
     protected override AzuriteContainer Build()
     {
         return new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.26.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
     }
 

diff --git a/ManagedCode.Storage.Tests/Storages/Azure/AzureBlobTests.cs b/ManagedCode.Storage.Tests/Storages/Azure/AzureBlobTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.Azurite;
 
@@ -8,7 +9,7 @@ public class AzureBlobTests : BlobTests<AzuriteContainer>
     protected override AzuriteContainer Build()
     {
         return new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.26.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
     }
 

diff --git a/ManagedCode.Storage.Tests/Storages/Azure/AzureContainerTests.cs b/ManagedCode.Storage.Tests/Storages/Azure/AzureContainerTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.Azurite;
 
@@ -8,7 +9,7 @@ public class AzureContainerTests : ContainerTests<AzuriteContainer>
     protected override AzuriteContainer Build()
     {
         return new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.26.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
     }
 

diff --git a/ManagedCode.Storage.Tests/Storages/Azure/AzureDownloadTests.cs b/ManagedCode.Storage.Tests/Storages/Azure/AzureDownloadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.Azurite;
 
@@ -8,7 +9,7 @@ public class AzureDownloadTests : DownloadTests<AzuriteContainer>
     protected override AzuriteContainer Build()
     {
         return new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.26.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
     }
 

diff --git a/ManagedCode.Storage.Tests/Storages/Azure/AzureUploadTests.cs b/ManagedCode.Storage.Tests/Storages/Azure/AzureUploadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.Azurite;
 
@@ -8,7 +9,7 @@ public class  AzureUploadTests : UploadTests<AzuriteContainer>
     protected override AzuriteContainer Build()
     {
         return new AzuriteBuilder()
-            .WithImage("mcr.microsoft.com/azure-storage/azurite:3.26.0")
+            .WithImage(ContainerImages.Azurite)
             .Build();
     }
 

diff --git a/ManagedCode.Storage.Tests/Storages/GCS/GCSBlobTests.cs b/ManagedCode.Storage.Tests/Storages/GCS/GCSBlobTests.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using ManagedCode.Storage.Tests.Common;
+using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.FakeGcsServer;
 using Xunit;
 
@@ -11,7 +12,9 @@ public class GCSBlobTests : BlobTests<FakeGcsServerContainer>
 {
     protected override FakeGcsServerContainer Build()
     {
-        return new FakeGcsServerBuilder().Build();
+        return new FakeGcsServerBuilder()
+            .WithImage(ContainerImages.FakeGCSServer)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/GCS/GCSContainerTests.cs b/ManagedCode.Storage.Tests/Storages/GCS/GCSContainerTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.FakeGcsServer;
 using Xunit;
@@ -9,7 +10,9 @@ public class GCSContainerTests : ContainerTests<FakeGcsServerContainer>
 {
     protected override FakeGcsServerContainer Build()
     {
-        return new FakeGcsServerBuilder().Build();
+        return new FakeGcsServerBuilder()
+            .WithImage(ContainerImages.FakeGCSServer)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/GCS/GCSDownloadTests.cs b/ManagedCode.Storage.Tests/Storages/GCS/GCSDownloadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.FakeGcsServer;
 using Xunit;
@@ -9,7 +10,9 @@ public class GCSDownloadTests : DownloadTests<FakeGcsServerContainer>
 {
     protected override FakeGcsServerContainer Build()
     {
-        return new FakeGcsServerBuilder().Build();
+        return new FakeGcsServerBuilder()
+            .WithImage(ContainerImages.FakeGCSServer)
+            .Build();
     }
 
     protected override ServiceProvider ConfigureServices()

diff --git a/ManagedCode.Storage.Tests/Storages/GCS/GCSUploadTests.cs b/ManagedCode.Storage.Tests/Storages/GCS/GCSUploadTests.cs
@@ -1,3 +1,4 @@
+using ManagedCode.Storage.Tests.Common;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.FakeGcsServer;
 using Xunit;
@@ -9,7 +10,10 @@ public class GCSUploadTests : UploadTests<FakeGcsServerContainer>
 {
     protected override FakeGcsServerContainer Build()
     {
-        return new FakeGcsServerBuilder().Build();
+        return new FakeGcsServerBuilder()
+            .WithImage(ContainerImages.FakeGCSServer)
+            .Build();
+
     }
 
     protected override ServiceProvider ConfigureServices()