Browse Source

Fixed null reference issue in minio expiration actions

pull/1357/head
ruanbl 5 months ago
parent
commit
f3c22cc6bb
  1. 23
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs

23
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Minio/LINGYUN/Abp/OssManagement/Minio/MinioOssContainer.cs

@ -40,8 +40,8 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
IClock clock, IClock clock,
ICurrentTenant currentTenant, ICurrentTenant currentTenant,
ILogger<MinioOssContainer> logger, ILogger<MinioOssContainer> logger,
IMinioBlobNameCalculator minioBlobNameCalculator, IMinioBlobNameCalculator minioBlobNameCalculator,
IBlobNormalizeNamingService blobNormalizeNamingService, IBlobNormalizeNamingService blobNormalizeNamingService,
IBlobContainerConfigurationProvider configurationProvider, IBlobContainerConfigurationProvider configurationProvider,
IServiceScopeFactory serviceScopeFactory, IServiceScopeFactory serviceScopeFactory,
IHttpClientFactory httpClientFactory, IHttpClientFactory httpClientFactory,
@ -151,7 +151,7 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
.WithObject(isDir ? $"{objectName}/_dir" : objectName) .WithObject(isDir ? $"{objectName}/_dir" : objectName)
.WithStreamData(request.Content) .WithStreamData(request.Content)
.WithObjectSize(request.Content.Length)); .WithObjectSize(request.Content.Length));
if (request.ExpirationTime.HasValue) if (request.ExpirationTime.HasValue)
{ {
var lifecycleRule = new LifecycleRule var lifecycleRule = new LifecycleRule
@ -270,14 +270,15 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
await foreach (var item in expiredObjects) await foreach (var item in expiredObjects)
{ {
var lifecycleRule = new LifecycleRule var lifecycleConfiguration = new LifecycleConfiguration(new List<LifecycleRule>
{ {
Status = LifecycleRule.LifecycleRuleStatusEnabled, new LifecycleRule
ID = item.Key, {
Expiration = new Expiration(Clock.Normalize(request.ExpirationTime.DateTime)) ID = item.Key,
}; Status = LifecycleRule.LifecycleRuleStatusEnabled,
var lifecycleConfiguration = new LifecycleConfiguration(); Expiration = new Expiration(Clock.Normalize(request.ExpirationTime.DateTime))
lifecycleConfiguration.Rules.Add(lifecycleRule); }
});
var lifecycleArgs = new SetBucketLifecycleArgs() var lifecycleArgs = new SetBucketLifecycleArgs()
.WithBucket(bucket) .WithBucket(bucket)
@ -542,7 +543,7 @@ public class MinioOssContainer : OssContainerBase, IOssObjectExpireor
{ {
return bucket; return bucket;
} }
return bucket; return bucket;
} }

Loading…
Cancel
Save