added loose files test

Author: fgsfds

.github/workflows/dotnet.yml

@@ -5,9 +5,6 @@ name: Build and Test
 
 on:
   push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
   Build_and_Test:
@@ -29,6 +26,9 @@ jobs:
       run: dotnet build --no-restore
 
     - name: Test
+      env:
+        MINIO_ACCESS_KEY: ${{ secrets.MINIO_ACCESS_KEY }}
+        MINIO_SECRET_KEY: ${{ secrets.MINIO_SECRET_KEY }}
       run: dotnet test --no-build --verbosity normal
 
   Build_and_Test_Linux:

Directory.Packages.props

@@ -26,6 +26,7 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
+    <PackageVersion Include="Minio" Version="6.0.4" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
@@ -36,7 +37,6 @@
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
-    <PackageVersion Include="AWSSDK.S3" Version="4.0.0.3" />
     <PackageVersion Include="ConfigureAwaitAnalyzer" Version="1.1.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.5" />

Web.Blazor/Helpers/S3Client.cs

@@ -1,47 +1,19 @@
-using Amazon.Runtime;
-using Amazon.S3;
-using Amazon.S3.Model;
-
-namespace Web.Blazor.Helpers;
+namespace Web.Blazor.Helpers;
 
 public sealed class S3Client : IDisposable
 {
-    private readonly string _key = Environment.GetEnvironmentVariable("S3Key")!;
-    private readonly string _secretKey = Environment.GetEnvironmentVariable("S3SKey")!;
-
-    private readonly AmazonS3Client _s3client;
-
-    public S3Client()
-    {
-        AmazonS3Config config = new()
-        {
-            ServiceURL = "https://s3.timeweb.cloud",
-            UseHttp = false
-        };
-
-        AWSCredentials creds = new BasicAWSCredentials(_key, _secretKey);
-        _s3client = new(creds, config);
-    }
-
     /// <summary>
     /// Get signed URL for file uploading
     /// </summary>
     /// <param name="file">File name</param>
     /// <returns>Signed URL</returns>
     public string GetSignedUrl(string file)
     {
-        GetPreSignedUrlRequest request = new()
-        {
-            //BucketName = Consts.Bucket,
-            Key = file,
-            Expires = DateTime.Now.AddHours(1),
-            Verb = HttpVerb.PUT
-        };
+        return string.Empty;
+    }
 
-        var url = _s3client.GetPreSignedURL(request);
+    public void Dispose()
+    {
 
-        return url;
     }
-
-    public void Dispose() => _s3client?.Dispose();
 }

Web.Blazor/Web.Blazor.csproj

@@ -13,7 +13,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Markdig" />
-    <PackageReference Include="AWSSDK.S3" />
     <PackageReference Include="MediatR" />
     <PackageReference Include="Roslynator.Analyzers" PrivateAssets="all" />
   </ItemGroup>

src/Tests/AddonsDatabaseTests.cs

@@ -1,4 +1,6 @@
 using Common.Entities;
+using Minio;
+using Minio.DataModel.Args;
 using System.Text;
 using System.Text.Json;
 using Xunit.Abstractions;
@@ -23,6 +25,7 @@ public async Task DatabaseFilesIntegrityTest()
         }
 
         using HttpClient httpClient = new();
+
         httpClient.DefaultRequestHeaders.Add("User-Agent", "BuildLauncher");
         httpClient.Timeout = TimeSpan.FromSeconds(30);
 
@@ -58,4 +61,67 @@ public async Task DatabaseFilesIntegrityTest()
         _output.WriteLine(sb.ToString());
         Assert.True(sb.Length < 1);
     }
+
+    [Fact]
+    public async Task LooseFilesTest()
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            return;
+        }
+
+        var addonsJsonString = File.ReadAllText("../../../../db/addons.json");
+        var addonsJson = JsonSerializer.Deserialize(addonsJsonString, DownloadableAddonsDictionaryContext.Default.DictionaryGameEnumListDownloadableAddonEntity);
+
+        Assert.NotNull(addonsJson);
+
+
+        List<string>? addonsUrls = new List<string>();
+
+        foreach (var a in addonsJson.Values)
+        {
+            foreach (var b in a)
+            {
+                addonsUrls.Add(b.DownloadUrl.ToString());
+            }
+        }
+
+        var access = Environment.GetEnvironmentVariable("MINIO_ACCESS_KEY");
+        var secret = Environment.GetEnvironmentVariable("MINIO_SECRET_KEY");
+
+        Assert.NotNull(access);
+        Assert.NotNull(secret);
+
+        using var minio = new MinioClient()
+            .WithEndpoint("s3.fgsfds.link:9000")
+            .WithCredentials(access, secretKey: secret)
+            .Build();
+
+        var args = new ListObjectsArgs()
+            .WithBucket("buildlauncher")
+            .WithRecursive(true);
+
+        var files = new List<string>();
+        await foreach (var item in minio.ListObjectsEnumAsync(args))
+        {
+            if (item.Key.EndsWith('/'))
+            {
+                continue;
+            }
+
+            files.Add("http://s3.fgsfds.link/buildlauncher/" + item.Key);
+        }
+
+        var loose = files.Except(addonsUrls);
+
+        StringBuilder sb = new();
+
+        foreach (var item in loose)
+        {
+            _ = sb.AppendLine($"File {item} is loose.");
+        }
+
+        _output.WriteLine(sb.ToString());
+        Assert.True(sb.Length < 1);
+    }
 }

src/Tests/Tests.csproj

@@ -23,6 +23,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Minio" />
     <PackageReference Include="Moq" />
     <PackageReference Include="Roslynator.Analyzers" PrivateAssets="all" />
     <PackageReference Include="xunit" />