Skip to content

Commit c7844b2

Browse files
authored
Reverses the wrong condition when a new bucket cache is needed (#832)
1 parent fe3928a commit c7844b2

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

.github/workflows/minio-dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
sudo cp /tmp/minio-config/certs/public.crt /etc/ssl/certs/
176176
sudo cp /tmp/minio-config/certs/private.key /etc/ssl/private/
177177
/tmp/minio -C /tmp/minio-config server /tmp/fs{1...4} &
178-
dotnet Minio.Functional.Tests/bin/Release/net6.0/Minio.Functional.Tests.dll
178+
dotnet Minio.Functional.Tests/bin/Release/net7.0/Minio.Functional.Tests.dll
179179
180180
push_to_nuget:
181181
needs: [build, unit_tests, functional_tests, format-check]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
bld/
2323
[Bb]in/
2424
[Oo]bj/
25+
.history
2526

2627
# Visual Studio 2015 cache/options directory
2728
.vs/

Minio.Functional.Tests/Minio.Functional.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<IsPackable>False</IsPackable>
66
</PropertyGroup>

Minio.Tests/DateTimeTests.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using System.Globalization;
2+
using Microsoft.VisualStudio.TestTools.UnitTesting;
23
using Minio.DataModel;
34
using Minio.DataModel.Args;
45
using Minio.Helper;
@@ -55,7 +56,10 @@ public void TestNewMultipartUploadArgsRetentionUntilDate()
5556
public void TestObjectStatExpires()
5657
{
5758
var d = TruncateMilliseconds(DateTime.Now);
58-
var headers = new Dictionary<string, string> { ["x-amz-expiration"] = d.ToUniversalTime().ToString("r") };
59+
var headers = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
60+
{
61+
["x-amz-expiration"] = d.ToUniversalTime().ToString("r", CultureInfo.InvariantCulture)
62+
};
5963
var stat = ObjectStat.FromResponseHeaders("test", headers);
6064
Assert.AreEqual(d.ToUniversalTime(), stat.Expires?.ToUniversalTime());
6165
}
@@ -64,7 +68,7 @@ public void TestObjectStatExpires()
6468
public void TestObjectStatObjectLockRetainUntilDate()
6569
{
6670
var d = TruncateMilliseconds(DateTime.Now);
67-
var headers = new Dictionary<string, string>
71+
var headers = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
6872
{
6973
["x-amz-object-lock-retain-until-date"] = d.ToUniversalTime().ToString("O")
7074
};
@@ -77,7 +81,7 @@ public void TestUtilsTo8601String()
7781
{
7882
var d = TruncateMilliseconds(DateTime.Now);
7983
var converted = Utils.To8601String(d);
80-
var parsed = DateTime.Parse(converted);
84+
var parsed = DateTime.Parse(converted, CultureInfo.InvariantCulture);
8185
Assert.AreEqual(d, parsed);
8286
Assert.AreEqual(d.Kind, parsed.Kind);
8387
}

Minio/MinioClient.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,9 @@ private async Task<string> GetRegion(string bucketName)
190190

191191
// Pick region from location HEAD request
192192
if (rgn?.Length == 0)
193-
{
194-
if (!BucketRegionCache.Instance.Exists(bucketName))
195-
rgn = await BucketRegionCache.Update(this, bucketName).ConfigureAwait(false);
196-
else
197-
rgn = BucketRegionCache.Instance.Region(bucketName);
198-
}
193+
rgn = BucketRegionCache.Instance.Exists(bucketName)
194+
? await BucketRegionCache.Update(this, bucketName).ConfigureAwait(false)
195+
: BucketRegionCache.Instance.Region(bucketName);
199196

200197
// Defaults to us-east-1 if region could not be found
201198
return rgn?.Length == 0 ? "us-east-1" : rgn;

0 commit comments

Comments
 (0)