Skip to content

Commit

Permalink
Reverses the wrong condition when a new bucket cache is needed (#832)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebozduman authored Aug 10, 2023
1 parent fe3928a commit c7844b2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/minio-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
sudo cp /tmp/minio-config/certs/public.crt /etc/ssl/certs/
sudo cp /tmp/minio-config/certs/private.key /etc/ssl/private/
/tmp/minio -C /tmp/minio-config server /tmp/fs{1...4} &
dotnet Minio.Functional.Tests/bin/Release/net6.0/Minio.Functional.Tests.dll
dotnet Minio.Functional.Tests/bin/Release/net7.0/Minio.Functional.Tests.dll
push_to_nuget:
needs: [build, unit_tests, functional_tests, format-check]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
bld/
[Bb]in/
[Oo]bj/
.history

# Visual Studio 2015 cache/options directory
.vs/
Expand Down
2 changes: 1 addition & 1 deletion Minio.Functional.Tests/Minio.Functional.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<IsPackable>False</IsPackable>
</PropertyGroup>
Expand Down
12 changes: 8 additions & 4 deletions Minio.Tests/DateTimeTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Globalization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Minio.DataModel;
using Minio.DataModel.Args;
using Minio.Helper;
Expand Down Expand Up @@ -55,7 +56,10 @@ public void TestNewMultipartUploadArgsRetentionUntilDate()
public void TestObjectStatExpires()
{
var d = TruncateMilliseconds(DateTime.Now);
var headers = new Dictionary<string, string> { ["x-amz-expiration"] = d.ToUniversalTime().ToString("r") };
var headers = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
{
["x-amz-expiration"] = d.ToUniversalTime().ToString("r", CultureInfo.InvariantCulture)
};
var stat = ObjectStat.FromResponseHeaders("test", headers);
Assert.AreEqual(d.ToUniversalTime(), stat.Expires?.ToUniversalTime());
}
Expand All @@ -64,7 +68,7 @@ public void TestObjectStatExpires()
public void TestObjectStatObjectLockRetainUntilDate()
{
var d = TruncateMilliseconds(DateTime.Now);
var headers = new Dictionary<string, string>
var headers = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
{
["x-amz-object-lock-retain-until-date"] = d.ToUniversalTime().ToString("O")
};
Expand All @@ -77,7 +81,7 @@ public void TestUtilsTo8601String()
{
var d = TruncateMilliseconds(DateTime.Now);
var converted = Utils.To8601String(d);
var parsed = DateTime.Parse(converted);
var parsed = DateTime.Parse(converted, CultureInfo.InvariantCulture);
Assert.AreEqual(d, parsed);
Assert.AreEqual(d.Kind, parsed.Kind);
}
Expand Down
9 changes: 3 additions & 6 deletions Minio/MinioClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,9 @@ private async Task<string> GetRegion(string bucketName)

// Pick region from location HEAD request
if (rgn?.Length == 0)
{
if (!BucketRegionCache.Instance.Exists(bucketName))
rgn = await BucketRegionCache.Update(this, bucketName).ConfigureAwait(false);
else
rgn = BucketRegionCache.Instance.Region(bucketName);
}
rgn = BucketRegionCache.Instance.Exists(bucketName)
? await BucketRegionCache.Update(this, bucketName).ConfigureAwait(false)
: BucketRegionCache.Instance.Region(bucketName);

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

0 comments on commit c7844b2

Please sign in to comment.