Browse Source

Renamed

pull/468/head
Sebastian 7 years ago
parent
commit
a6b38bd7b2
  1. 4
      backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs
  2. 4
      backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3Options.cs
  3. 2
      backend/src/Squidex/Config/Domain/AssetServices.cs
  4. 10
      backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs
  5. 2
      backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs

4
backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs

@ -19,11 +19,11 @@ namespace Squidex.Infrastructure.Assets
public sealed class AmazonS3AssetStore : DisposableObjectBase, IAssetStore, IInitializable public sealed class AmazonS3AssetStore : DisposableObjectBase, IAssetStore, IInitializable
{ {
private const int BufferSize = 81920; private const int BufferSize = 81920;
private readonly MyAmazonS3Options options; private readonly AmazonS3Options options;
private TransferUtility transferUtility; private TransferUtility transferUtility;
private IAmazonS3 s3Client; private IAmazonS3 s3Client;
public AmazonS3AssetStore(MyAmazonS3Options options) public AmazonS3AssetStore(AmazonS3Options options)
{ {
Guard.NotNullOrEmpty(options.Bucket); Guard.NotNullOrEmpty(options.Bucket);
Guard.NotNullOrEmpty(options.AccessKey); Guard.NotNullOrEmpty(options.AccessKey);

4
backend/src/Squidex.Infrastructure.Amazon/MyAmazonS3Options.cs → backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3Options.cs

@ -5,9 +5,9 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
namespace Squidex.Infrastructure namespace Squidex.Infrastructure.Assets
{ {
public class MyAmazonS3Options public sealed class AmazonS3Options
{ {
public string? ServiceUrl { get; set; } public string? ServiceUrl { get; set; }

2
backend/src/Squidex/Config/Domain/AssetServices.cs

@ -88,7 +88,7 @@ namespace Squidex.Config.Domain
}, },
["AmazonS3"] = () => ["AmazonS3"] = () =>
{ {
var amazonS3Options = config.GetOptionalValue<MyAmazonS3Options>("assetStore:amazonS3"); var amazonS3Options = config.GetOptionalValue<AmazonS3Options>("assetStore:amazonS3");
services.AddSingletonAs(c => new AmazonS3AssetStore(amazonS3Options)) services.AddSingletonAs(c => new AmazonS3AssetStore(amazonS3Options))
.As<IAssetStore>(); .As<IAssetStore>();

10
backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs

@ -13,15 +13,15 @@ namespace Squidex.Infrastructure.Assets
public AmazonS3AssetStoreFixture() public AmazonS3AssetStoreFixture()
{ {
AssetStore = new AmazonS3AssetStore(new MyAmazonS3Options AssetStore = new AmazonS3AssetStore(new AmazonS3Options
{ {
ServiceUrl = null, AccessKey = "secret",
RegionName = "eu-central-1",
Bucket = "squidex-test", Bucket = "squidex-test",
BucketFolder = "squidex-assets", BucketFolder = "squidex-assets",
AccessKey = "secret", ForcePathStyle = false,
RegionName = "eu-central-1",
SecretKey = "secret", SecretKey = "secret",
ForcePathStyle = false ServiceUrl = null
}); });
AssetStore.InitializeAsync().Wait(); AssetStore.InitializeAsync().Wait();
} }

2
backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs

@ -28,7 +28,7 @@ namespace Squidex.Infrastructure.Assets
[Fact] [Fact]
public async Task Should_throw_exception_for_invalid_config() public async Task Should_throw_exception_for_invalid_config()
{ {
var sut = new AmazonS3AssetStore(new MyAmazonS3Options var sut = new AmazonS3AssetStore(new AmazonS3Options
{ {
ServiceUrl = null, ServiceUrl = null,
RegionName = "invalid", RegionName = "invalid",

Loading…
Cancel
Save