fix test container for google

Author: KSemenenko

ManagedCode.Storage.Tests/Storages/GCS/GCSBlobTests.cs

@@ -6,7 +6,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSBlobTests : BlobTests<GCSContainer>
 {
     protected override GCSContainer Build()

ManagedCode.Storage.Tests/Storages/GCS/GCSConfigTests.cs

@@ -11,7 +11,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSConfigTests 
 {
     [Fact]

ManagedCode.Storage.Tests/Storages/GCS/GCSConfigurator.cs

@@ -6,7 +6,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSConfigurator
 {
     public static ServiceProvider ConfigureServices(string connectionString)

ManagedCode.Storage.Tests/Storages/GCS/GCSContainerTests.cs

@@ -4,7 +4,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSContainerTests : ContainerTests<GCSContainer>
 {
     protected override GCSContainer Build()

ManagedCode.Storage.Tests/Storages/GCS/GCSDownloadTests.cs

@@ -4,7 +4,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSDownloadTests : DownloadTests<GCSContainer>
 {
     protected override GCSContainer Build()

ManagedCode.Storage.Tests/Storages/GCS/GCSUploadTests.cs

@@ -4,7 +4,7 @@
 
 namespace ManagedCode.Storage.Tests.Storages.GCS;
 
-[Collection("Google")]
+
 public class GCSUploadTests : UploadTests<GCSContainer>
 {
     protected override GCSContainer Build()

TestcontainersGCS/GCSBuilder.cs

@@ -1,11 +1,15 @@
+using System.Text;
+using System.Text.RegularExpressions;
+
 namespace TestcontainersGCS;
 
 /// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
 [PublicAPI]
 public sealed class GCSBuilder : ContainerBuilder<GCSBuilder, GCSContainer, GCSConfiguration>
 {
-    public const string GCSImage = "fsouza/fake-gcs-server:1.47.5";
-    public const ushort GCSPort = 30000;
+    public const string FakeGCSServerImage = "fsouza/fake-gcs-server:1.47.5";
+    public const ushort FakeGCSServerPort = 4443;
+    public const string StartupScriptFilePath = "/testcontainers.sh";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="GCSBuilder" /> class.
@@ -40,14 +44,21 @@ public override GCSContainer Build()
     protected override GCSBuilder Init()
     {
         return base.Init()
-            .WithImage(GCSImage)
-            .WithPortBinding(GCSPort, GCSPort)
-            .WithCommand("-scheme", "http")
-            .WithCommand("-backend", "memory")
-            .WithCommand("-external-url", $"http://localhost:{GCSPort}")
-            .WithCommand("-port", $"{GCSPort}")
-            .WithWaitStrategy(Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(request =>
-                request.ForPath("/").ForPort(GCSPort).ForStatusCode(HttpStatusCode.NotFound)));
+            .WithImage(FakeGCSServerImage)
+            .WithPortBinding(FakeGCSServerPort, true)
+            .WithEntrypoint("/bin/sh", "-c")
+            .WithCommand($"while [ ! -f {StartupScriptFilePath} ]; do sleep 0.1; done; sh {StartupScriptFilePath}")
+            .WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(new Regex("server started at.*", RegexOptions.IgnoreCase)))
+            .WithStartupCallback((container, ct) =>
+            {
+                const char lf = '\n';
+                var startupScript = new StringBuilder();
+                startupScript.Append("#!/bin/bash");
+                startupScript.Append(lf);
+                startupScript.Append($"fake-gcs-server -backend memory -scheme http -port {FakeGCSServerPort} -external-url \"http://localhost:{container.GetMappedPublicPort(FakeGCSServerPort)}\"");
+                startupScript.Append(lf);
+                return container.CopyAsync(Encoding.Default.GetBytes(startupScript.ToString()), StartupScriptFilePath, Unix.FileMode755, ct);
+            });
     }
 
     /// <inheritdoc />

TestcontainersGCS/GCSContainer.cs

@@ -20,7 +20,7 @@ public GCSContainer(GCSConfiguration configuration, ILogger logger)
     /// <returns>The GCS connection string.</returns>
     public string GetConnectionString()
     {
-        var builder = new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(GCSBuilder.GCSPort), "storage/v1/");
+        var builder = new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(GCSBuilder.FakeGCSServerPort), "storage/v1/");
         return builder.ToString();
     }
 }