Update tests to use latest storage-server from github

Author: acupofjose

.github/workflows/build-and-test.yml

@@ -30,7 +30,7 @@ jobs:
         run: dotnet build --configuration Release --no-restore
 
       - name: Initialize Testing Stack
-        run: docker-compose up -d
+        run: chmod +x ./prepare-infra.sh && ./prepare-infra.sh && sleep 5
 
       - name: Test
         run: dotnet test --no-restore

.gitignore

@@ -11,6 +11,7 @@ autom4te.cache/
 tarballs/
 test-results/
 
+.storage-server
 .env
 
 # Mac bundle stuff

Storage/Exceptions/FailureHint.cs

@@ -22,13 +22,13 @@ public static Reason DetectReason(SupabaseStorageException storageException)
 
     			return storageException.StatusCode switch
     			{
-	                400 when storageException.Content.Contains("Invalid") => InvalidInput,
-    				400 when storageException.Content.Contains("authorization") => NotAuthorized,
-                    400 when storageException.Content.Contains("malformed") => NotAuthorized,
-                    400 when storageException.Content.Contains("invalid signature") => NotAuthorized,
+    				400 when storageException.Content.ToLower().Contains("authorization") => NotAuthorized,
+                    400 when storageException.Content.ToLower().Contains("malformed") => NotAuthorized,
+                    400 when storageException.Content.ToLower().Contains("invalid signature") => NotAuthorized,
+	                400 when storageException.Content.ToLower().Contains("invalid") => InvalidInput,
     				401 => NotAuthorized,
-                    404 when storageException.Content.Contains("Not found") => NotFound,
-	                409 when storageException.Content.Contains("exists") => AlreadyExists,
+                    404 when storageException.Content.ToLower().Contains("not found") => NotFound,
+	                409 when storageException.Content.ToLower().Contains("exists") => AlreadyExists,
     				500 => Internal,
     				_ => Unknown
     			};

StorageTests/Helpers.cs

@@ -5,13 +5,13 @@ namespace StorageTests
 {
     public static class Helpers
     {
-        public static string SupabaseUrl => Environment.GetEnvironmentVariable("SUPABASE_URL") ?? "http://localhost:3000";
-        public static string ServiceKey => Environment.GetEnvironmentVariable("SUPABASE_SERVICE_KEY");
-        public static string PublicKey => Environment.GetEnvironmentVariable("SUPABASE_PUBLIC_KEY");
+        public static string SupabaseUrl => "http://localhost:5000";
+        public static string ServiceKey => "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoic2VydmljZV9yb2xlIiwiaWF0IjoxNjEzNTMxOTg1LCJleHAiOjE5MjkxMDc5ODV9.th84OKK0Iz8QchDyXZRrojmKSEZ-OuitQm_5DvLiSIc";
+        public static string PublicKey => "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJhdXRoZW50aWNhdGVkIiwic3ViIjoiMzE3ZWFkY2UtNjMxYS00NDI5LWEwYmItZjE5YTdhNTE3YjRhIiwiZW1haWwiOiJpbmlhbit0ZXN0MUBzdXBhYmFzZS5pbyIsImV4cCI6MTkzOTEwNzk4NSwiYXBwX21ldGFkYXRhIjp7InByb3ZpZGVyIjoiZW1haWwifSwidXNlcl9tZXRhZGF0YSI6e30sInJvbGUiOiJhdXRoZW50aWNhdGVkIn0.E-x3oYcHIjFCdUO1M3wKDl1Ln32mik0xdHT2PjrvN70";
 
-        public static string StorageUrl => $"{SupabaseUrl}/storage/v1";
+        public static string StorageUrl => $"{SupabaseUrl}";
 
-        public static Supabase.Storage.Client GetClient()
+        public static Supabase.Storage.Client GetServiceClient()
         {
             return new Supabase.Storage.Client(StorageUrl, new Dictionary<string, string>
             {

StorageTests/StorageBucketAnonTests.cs

@@ -11,7 +11,7 @@ namespace StorageTests;
 [TestClass]
 public class StorageBucketAnonTests
 {
-    private Client AdminStorage => Helpers.GetClient();
+    private Client AdminStorage => Helpers.GetServiceClient();
     private Client Storage => Helpers.GetPublicClient();
 
     [TestMethod("Bucket: Returns empty when attempting to List")]

StorageTests/StorageBucketTests.cs

@@ -11,7 +11,7 @@ namespace StorageTests;
 [TestClass]
 public class StorageBucketTests
 {
-    Client Storage => Helpers.GetClient();
+    Client Storage => Helpers.GetServiceClient();
 
     [TestMethod("Bucket: List")]
     public async Task List()

StorageTests/StorageFileAnonTests.cs

@@ -14,7 +14,7 @@ namespace StorageTests;
 [TestClass]
 public class StorageFileAnonTests
 {
-    Client AdminStorage => Helpers.GetClient();
+    Client AdminStorage => Helpers.GetServiceClient();
     private Client Storage => Helpers.GetPublicClient();
 
     private string _bucketId = string.Empty;

StorageTests/StorageFileTests.cs

@@ -13,7 +13,7 @@ namespace StorageTests;
 [TestClass]
 public class StorageFileTests
 {
-    Client Storage => Helpers.GetClient();
+    Client Storage => Helpers.GetServiceClient();
 
     private string _bucketId = string.Empty;
     private IStorageFileApi<FileObject> _bucket = null!;
@@ -23,7 +23,8 @@ public async Task InitializeTest()
     {
         _bucketId = Guid.NewGuid().ToString();
 
-        if (_bucket == null && await Storage.GetBucket(_bucketId) == null)
+        var exists = await Storage.GetBucket(_bucketId);
+        if (exists == null)
         {
             await Storage.CreateBucket(_bucketId, new BucketUpsertOptions { Public = true });
         }
@@ -34,20 +35,17 @@ public async Task InitializeTest()
     [TestCleanup]
     public async Task TestCleanup()
     {
-        if (_bucket != null)
-        {
-            var files = await _bucket.List();
-
-            Assert.IsNotNull(files);
+        var files = await _bucket.List();
 
-            foreach (var file in files)
-            {
-                if (file.Name is not null)
-                    await _bucket.Remove(new List<string> { file.Name });
-            }
+        Assert.IsNotNull(files);
 
-            await Storage.DeleteBucket(_bucketId);
+        foreach (var file in files)
+        {
+            if (file.Name is not null)
+                await _bucket.Remove(new List<string> { file.Name });
         }
+
+        await Storage.DeleteBucket(_bucketId);
     }
 
     [TestMethod("File: Upload File")]

docker-compose.yml

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+git clone https://github.com/supabase/storage .storage-server
+cd .storage-server
+
+git fetch --all --tags
+git checkout tags/v1.0.10 -b v1.0.10-branch
+
+cp .env.sample .env && cp .env.test.sample .env.test
+
+npm install
+npm run infra:restart
+npm run build
+
+cmd="npm run start";
+eval "${cmd}" &>/dev/null & disown;