rename

KSemenenko · KSemenenko · commit 8a654720d46f · 2023-10-13T22:48:18.000+02:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -27,20 +27,15 @@ jobs:
     
     - name: Restore dependencies
       run: dotnet restore
+      
     - name: Build
       run: dotnet build --no-restore
+      
     - name: Test
       run: dotnet test --no-build --logger 'trx;LogFileName=test-results.trx'
-      env:
-        DEFAULT_REGION: eu-west-1
-        AWS_ACCESS_KEY_ID: localkey
-        AWS_SECRET_ACCESS_KEY: localsecret  
+      
     - name: Collect Code Coverage
       run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=ManagedCode.Storage.Tests/lcov.info
-      env:
-        DEFAULT_REGION: eu-west-1
-        AWS_ACCESS_KEY_ID: localkey
-        AWS_SECRET_ACCESS_KEY: localsecret
         
 #    - name: test-reports
 #      uses: dorny/test-reporter@v1.5.0
diff --git a/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs b/ManagedCode.Storage.Google/Extensions/ServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
 ﻿using System;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Exceptions;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google.Options;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace ManagedCode.Storage.Gcp.Extensions;
+namespace ManagedCode.Storage.Google.Extensions;
 
 public static class ServiceCollectionExtensions
 {
diff --git a/ManagedCode.Storage.Google/GCPStorage.cs b/ManagedCode.Storage.Google/GCPStorage.cs
@@ -11,10 +11,10 @@
 using ManagedCode.Communication;
 using ManagedCode.Storage.Core;
 using ManagedCode.Storage.Core.Models;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google.Options;
 using Microsoft.Extensions.Logging;
 
-namespace ManagedCode.Storage.Gcp;
+namespace ManagedCode.Storage.Google;
 
 public class GCPStorage : BaseStorage<StorageClient, GCPStorageOptions>, IGCPStorage
 {
diff --git a/ManagedCode.Storage.Google/IGCPStorage.cs b/ManagedCode.Storage.Google/IGCPStorage.cs
@@ -1,8 +1,8 @@
 using Google.Cloud.Storage.V1;
 using ManagedCode.Storage.Core;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google.Options;
 
-namespace ManagedCode.Storage.Gcp;
+namespace ManagedCode.Storage.Google;
 
 public interface IGCPStorage : IStorage<StorageClient, GCPStorageOptions>
 {
diff --git a/ManagedCode.Storage.Google/ManagedCode.Storage.Google.csproj b/ManagedCode.Storage.Google/ManagedCode.Storage.Google.csproj
@@ -12,9 +12,9 @@
     <!--NuGet-->
     <PropertyGroup>
         <Title>ManagedCode.Storage.Gcp</Title>
-        <PackageId>ManagedCode.Storage.Gcp</PackageId>
-        <Description>Storage for GCP</Description>
-        <PackageTags>managedcode, gcp, storage, cloud, blob</PackageTags>
+        <PackageId>ManagedCode.Storage.Google</PackageId>
+        <Description>Storage for Google Cloud Storage</Description>
+        <PackageTags>managedcode, gcs, storage, cloud, blob</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>
@@ -25,8 +25,8 @@
         <PackageReference Include="Google.Api.Gax" Version="4.4.0" />
         <PackageReference Include="Google.Api.Gax.Rest" Version="4.4.0" />
         <PackageReference Include="Google.Apis.Storage.v1" Version="1.62.1.3190" />
-        <PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
         <PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0" />
+        <PackageReference Include="ManagedCode.Communication" Version="2.0.26" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
diff --git a/ManagedCode.Storage.Google/Options/BucketOptions.cs b/ManagedCode.Storage.Google/Options/BucketOptions.cs
@@ -1,4 +1,4 @@
-﻿namespace ManagedCode.Storage.Gcp.Options;
+﻿namespace ManagedCode.Storage.Google.Options;
 
 public class BucketOptions
 {
diff --git a/ManagedCode.Storage.Google/Options/GCPStorageOptions.cs b/ManagedCode.Storage.Google/Options/GCPStorageOptions.cs
@@ -2,7 +2,7 @@
 using Google.Cloud.Storage.V1;
 using ManagedCode.Storage.Core;
 
-namespace ManagedCode.Storage.Gcp.Options;
+namespace ManagedCode.Storage.Google.Options;
 
 public class GCPStorageOptions : IStorageOptions
 {
diff --git a/ManagedCode.Storage.TestFakes/FakeGCPStorage.cs b/ManagedCode.Storage.TestFakes/FakeGCPStorage.cs
@@ -2,14 +2,14 @@
 using ManagedCode.Communication;
 using ManagedCode.Storage.FileSystem;
 using ManagedCode.Storage.FileSystem.Options;
-using ManagedCode.Storage.Gcp;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google;
+using ManagedCode.Storage.Google.Options;
 
 namespace ManagedCode.Storage.TestFakes;
 
-public class FakeGCPStorage : FileSystemStorage, IGCPStorage
+public class FakeGoogleStorage : FileSystemStorage, IGCPStorage
 {
-    public FakeGCPStorage() : base(new FileSystemStorageOptions())
+    public FakeGoogleStorage() : base(new FileSystemStorageOptions())
     {
     }
 
diff --git a/ManagedCode.Storage.TestFakes/ManagedCode.Storage.TestFakes.csproj b/ManagedCode.Storage.TestFakes/ManagedCode.Storage.TestFakes.csproj
@@ -20,7 +20,7 @@
         <ProjectReference Include="..\ManagedCode.Storage.Azure\ManagedCode.Storage.Azure.csproj"/>
         <ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj"/>
         <ProjectReference Include="..\ManagedCode.Storage.FileSystem\ManagedCode.Storage.FileSystem.csproj"/>
-        <ProjectReference Include="..\ManagedCode.Storage.Gcp\ManagedCode.Storage.Gcp.csproj"/>
+        <ProjectReference Include="..\ManagedCode.Storage.Google\ManagedCode.Storage.Google.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/ManagedCode.Storage.TestFakes/MockCollectionExtensions.cs b/ManagedCode.Storage.TestFakes/MockCollectionExtensions.cs
@@ -2,7 +2,7 @@
 using ManagedCode.Storage.Azure;
 using ManagedCode.Storage.AzureDataLake;
 using ManagedCode.Storage.Core;
-using ManagedCode.Storage.Gcp;
+using ManagedCode.Storage.Google;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -55,18 +55,18 @@ public static IServiceCollection ReplaceAzureStorageAsDefault(this IServiceColle
         return serviceCollection;
     }
 
-    public static IServiceCollection ReplaceGCPStorageAsDefault(this IServiceCollection serviceCollection)
+    public static IServiceCollection ReplaceGoogleStorageAsDefault(this IServiceCollection serviceCollection)
     {
-        serviceCollection.ReplaceGCPStorage();
+        serviceCollection.ReplaceGoogleStorage();
         serviceCollection.AddTransient<IStorage, FakeAzureStorage>();
         return serviceCollection;
     }
 
-    public static IServiceCollection ReplaceGCPStorage(this IServiceCollection serviceCollection)
+    public static IServiceCollection ReplaceGoogleStorage(this IServiceCollection serviceCollection)
     {
         serviceCollection.RemoveAll<IGCPStorage>();
         serviceCollection.RemoveAll<GCPStorage>();
-        serviceCollection.AddTransient<IGCPStorage, FakeGCPStorage>();
+        serviceCollection.AddTransient<IGCPStorage, FakeGoogleStorage>();
         return serviceCollection;
     }
 }
diff --git a/ManagedCode.Storage.Tests/GCP/GoogleStorageTests.cs b/ManagedCode.Storage.Tests/GCP/GoogleStorageTests.cs
@@ -3,9 +3,9 @@
 // using Google.Cloud.Storage.V1;
 // using ManagedCode.Storage.Core;
 // using ManagedCode.Storage.Core.Exceptions;
-// using ManagedCode.Storage.Gcp;
-// using ManagedCode.Storage.Gcp.Extensions;
-// using ManagedCode.Storage.Gcp.Options;
+// using ManagedCode.Storage.Google;
+// using ManagedCode.Storage.Google.Extensions;
+// using ManagedCode.Storage.Google.Options;
 // using Microsoft.Extensions.DependencyInjection;
 // using Xunit;
 //
@@ -118,4 +118,4 @@
 //         var defaultStorage = ServiceProvider.GetService<IStorage>();
 //         storage?.GetType().FullName.Should().Be(defaultStorage?.GetType().FullName);
 //     }
-// }
+// }
diff --git a/ManagedCode.Storage.Tests/ManagedCode.Storage.Tests.csproj b/ManagedCode.Storage.Tests/ManagedCode.Storage.Tests.csproj
@@ -53,7 +53,7 @@
         <ProjectReference Include="..\ManagedCode.Storage.Azure\ManagedCode.Storage.Azure.csproj" />
         <ProjectReference Include="..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
         <ProjectReference Include="..\ManagedCode.Storage.FileSystem\ManagedCode.Storage.FileSystem.csproj" />
-        <ProjectReference Include="..\ManagedCode.Storage.Gcp\ManagedCode.Storage.Gcp.csproj" />
+        <ProjectReference Include="..\ManagedCode.Storage.Google\ManagedCode.Storage.Google.csproj" />
         <ProjectReference Include="..\ManagedCode.Storage.TestFakes\ManagedCode.Storage.TestFakes.csproj" />
         <ProjectReference Include="..\Testcontainers.GCS\Testcontainers.GCS.csproj" />
     </ItemGroup>
diff --git a/ManagedCode.Storage.Tests/TestContainers/TestContainers.cs b/ManagedCode.Storage.Tests/TestContainers/TestContainers.cs
@@ -11,8 +11,8 @@
 using ManagedCode.Storage.Azure.Extensions;
 using ManagedCode.Storage.Azure.Options;
 using ManagedCode.Storage.Core;
-using ManagedCode.Storage.Gcp.Extensions;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google.Extensions;
+using ManagedCode.Storage.Google.Options;
 using Microsoft.Extensions.DependencyInjection;
 using Testcontainers.Azurite;
 using Testcontainers.GCS;
diff --git a/ManagedCode.Storage.sln b/ManagedCode.Storage.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCode.Storage.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCode.Storage.Aws", "ManagedCode.Storage.Aws\ManagedCode.Storage.Aws.csproj", "{0AFE156D-0DA5-4B23-8262-CA98E4C0FB5F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCode.Storage.Gcp", "ManagedCode.Storage.Gcp\ManagedCode.Storage.Gcp.csproj", "{C3B4FF9C-1C6A-4EA0-9291-E7E0C0EF2BA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCode.Storage.Google", "ManagedCode.Storage.Google\ManagedCode.Storage.Google.csproj", "{C3B4FF9C-1C6A-4EA0-9291-E7E0C0EF2BA3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCode.Storage.FileSystem", "ManagedCode.Storage.FileSystem\ManagedCode.Storage.FileSystem.csproj", "{EDFA1CB7-1721-4447-9C25-AE110821717C}"
 EndProject
diff --git a/Samples/WebApiSample/Controllers/GCPStorageController.cs b/Samples/WebApiSample/Controllers/GCPStorageController.cs
@@ -1,4 +1,4 @@
-using ManagedCode.Storage.Gcp;
+using ManagedCode.Storage.Google;
 using Microsoft.AspNetCore.Mvc;
 
 namespace WebApiSample.Controllers;
diff --git a/Samples/WebApiSample/Program.cs b/Samples/WebApiSample/Program.cs
@@ -5,8 +5,8 @@
 using ManagedCode.Storage.Azure.Options;
 using ManagedCode.Storage.FileSystem.Extensions;
 using ManagedCode.Storage.FileSystem.Options;
-using ManagedCode.Storage.Gcp.Extensions;
-using ManagedCode.Storage.Gcp.Options;
+using ManagedCode.Storage.Google.Extensions;
+using ManagedCode.Storage.Google.Options;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/Samples/WebApiSample/WebApiSample.csproj b/Samples/WebApiSample/WebApiSample.csproj
@@ -18,7 +18,7 @@
         <ProjectReference Include="..\..\ManagedCode.Storage.Azure\ManagedCode.Storage.Azure.csproj" />
         <ProjectReference Include="..\..\ManagedCode.Storage.Core\ManagedCode.Storage.Core.csproj" />
         <ProjectReference Include="..\..\ManagedCode.Storage.FileSystem\ManagedCode.Storage.FileSystem.csproj" />
-        <ProjectReference Include="..\..\ManagedCode.Storage.Gcp\ManagedCode.Storage.Gcp.csproj" />
+        <ProjectReference Include="..\..\ManagedCode.Storage.Google\ManagedCode.Storage.Google.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Testcontainers.GCS/.editorconfig b/Testcontainers.GCS/.editorconfig
diff --git a/Testcontainers.GCS/GCSBuilder.cs b/Testcontainers.GCS/GCSBuilder.cs
@@ -42,8 +42,9 @@ protected override GCSBuilder Init()
         return base.Init()
             .WithImage(GCSImage)
             .WithPortBinding(GCSPort, true)
+            .WithCommand("-scheme", "http")
             .WithWaitStrategy(Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(request =>
-                request.ForPath("/").ForPort(GCSPort).ForStatusCode(HttpStatusCode.BadRequest)));
+                request.ForPath("/").ForPort(GCSPort).ForStatusCode(HttpStatusCode.NotFound)));
     }
 
     /// <inheritdoc />

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using Google.Cloud.Storage.V1;`
`2`	`2`	`using ManagedCode.Storage.Core;`
`3`		`-using ManagedCode.Storage.Gcp.Options;`
	`3`	`+using ManagedCode.Storage.Google.Options;`
`4`	`4`
`5`		`-namespace ManagedCode.Storage.Gcp;`
	`5`	`+namespace ManagedCode.Storage.Google;`
`6`	`6`
`7`	`7`	`public interface IGCPStorage : IStorage<StorageClient, GCPStorageOptions>`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace ManagedCode.Storage.Gcp.Options;`
	`1`	`+namespace ManagedCode.Storage.Google.Options;`
`2`	`2`
`3`	`3`	`public class BucketOptions`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Google.Cloud.Storage.V1;`
`3`	`3`	`using ManagedCode.Storage.Core;`
`4`	`4`
`5`		`-namespace ManagedCode.Storage.Gcp.Options;`
	`5`	`+namespace ManagedCode.Storage.Google.Options;`
`6`	`6`
`7`	`7`	`public class GCPStorageOptions : IStorageOptions`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`	`using ManagedCode.Communication;`
`3`	`3`	`using ManagedCode.Storage.FileSystem;`
`4`	`4`	`using ManagedCode.Storage.FileSystem.Options;`
`5`		`-using ManagedCode.Storage.Gcp;`
`6`		`-using ManagedCode.Storage.Gcp.Options;`
	`5`	`+using ManagedCode.Storage.Google;`
	`6`	`+using ManagedCode.Storage.Google.Options;`
`7`	`7`
`8`	`8`	`namespace ManagedCode.Storage.TestFakes;`
`9`	`9`
`10`		`-public class FakeGCPStorage : FileSystemStorage, IGCPStorage`
	`10`	`+public class FakeGoogleStorage : FileSystemStorage, IGCPStorage`
`11`	`11`	`{`
`12`		`- public FakeGCPStorage() : base(new FileSystemStorageOptions())`
	`12`	`+ public FakeGoogleStorage() : base(new FileSystemStorageOptions())`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using ManagedCode.Storage.Azure;`
`3`	`3`	`using ManagedCode.Storage.AzureDataLake;`
`4`	`4`	`using ManagedCode.Storage.Core;`
`5`		`-using ManagedCode.Storage.Gcp;`
	`5`	`+using ManagedCode.Storage.Google;`
`6`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`7`	`7`	`using Microsoft.Extensions.DependencyInjection.Extensions;`
`8`	`8`
`@@ -55,18 +55,18 @@ public static IServiceCollection ReplaceAzureStorageAsDefault(this IServiceColle`
`55`	`55`	`return serviceCollection;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static IServiceCollection ReplaceGCPStorageAsDefault(this IServiceCollection serviceCollection)`
	`58`	`+ public static IServiceCollection ReplaceGoogleStorageAsDefault(this IServiceCollection serviceCollection)`
`59`	`59`	`{`
`60`		`- serviceCollection.ReplaceGCPStorage();`
	`60`	`+ serviceCollection.ReplaceGoogleStorage();`
`61`	`61`	`serviceCollection.AddTransient<IStorage, FakeAzureStorage>();`
`62`	`62`	`return serviceCollection;`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static IServiceCollection ReplaceGCPStorage(this IServiceCollection serviceCollection)`
	`65`	`+ public static IServiceCollection ReplaceGoogleStorage(this IServiceCollection serviceCollection)`
`66`	`66`	`{`
`67`	`67`	`serviceCollection.RemoveAll<IGCPStorage>();`
`68`	`68`	`serviceCollection.RemoveAll<GCPStorage>();`
`69`		`- serviceCollection.AddTransient<IGCPStorage, FakeGCPStorage>();`
	`69`	`+ serviceCollection.AddTransient<IGCPStorage, FakeGoogleStorage>();`
`70`	`70`	`return serviceCollection;`
`71`	`71`	`}`
`72`	`72`	`}`