Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/minio-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,15 @@ jobs:
# Execute all functional tests in the solution
- name: Execute Functional Tests Linux
env:
CI: 1
MINT_MODE: full
SERVER_ENDPOINT: localhost:9000
ACCESS_KEY: minio
SECRET_KEY: minio123
ENABLE_HTTPS: 1
ENABLE_KMS: 1
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio123
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
MINIO_KMS_SECRET_KEY: my-minio-key:OSMM+vkKUTCvQs9YL/CVMIMt43HFhkUpqJxTmGl6rYw=
run: |
wget --quiet -O /tmp/minio https://dl.min.io/server/minio/release/linux-amd64/minio
Expand All @@ -175,6 +176,11 @@ 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 --certs-dir /tmp/minio-config/certs server /tmp/fs{1...4} &

wget --quiet -O /tmp/mc https://dl.min.io/client/mc/release/linux-amd64/mc
chmod +x /tmp/mc
MC_HOST_test=https://minio:minio123@localhost:9000 /tmp/mc --insecure ready test

dotnet Minio.Functional.Tests/bin/Release/net8.0/Minio.Functional.Tests.dll

push_to_nuget:
Expand Down
2 changes: 1 addition & 1 deletion FileUploader/FileUpload.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private static bool IsWindows()
return OperatingSystem.IsWindows();
}

private static async Task Main(string[] args)
private static async Task Main()
{
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
| SecurityProtocolType.Tls11
Expand Down
3 changes: 1 addition & 2 deletions Minio.Examples/Cases/GetBucketPolicy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ internal static class GetBucketPolicy
{
// Get bucket policy
public static async Task Run(IMinioClient minio,
string bucketName = "my-bucket-name",
string prefix = "")
string bucketName = "my-bucket-name")
{
try
{
Expand Down
3 changes: 1 addition & 2 deletions Minio.Examples/Cases/ListenBucketNotifications.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public static void Run(IMinioClient minio,
string bucketName = "my-bucket-name",
List<EventType> events = null,
string prefix = "",
string suffix = "",
bool recursive = true)
string suffix = "")
{
try
{
Expand Down
4 changes: 2 additions & 2 deletions Minio.Examples/Cases/ListenNotifications.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2024 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -40,7 +40,7 @@ public static void Run(IMinioClient minio,
() => Console.WriteLine("Stopped listening for bucket notifications\n"));

Console.WriteLine("Press any key to stop listening for notifications...");
Console.ReadLine();
_ = Console.ReadLine();
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion Minio.Examples/Cases/PresignedGetObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public static async Task Run(IMinioClient client,
.WithObject(objectName)
.WithExpiry(1000)
.WithHeaders(reqParams);
var presignedUrl = await client.PresignedGetObjectAsync(args).ConfigureAwait(false);
_ = await client.PresignedGetObjectAsync(args).ConfigureAwait(false);
}
}
7 changes: 1 addition & 6 deletions Minio.Examples/Cases/PresignedPostPolicy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

using Minio.DataModel;
using Minio.DataModel.Args;

namespace Minio.Examples.Cases;

Expand All @@ -34,14 +33,10 @@ public static async Task Run(IMinioClient client,
form.SetBucket(bucketName);
form.SetExpires(expiration);

var args = new PresignedPostPolicyArgs()
.WithBucket(bucketName)
.WithObject(objectName)
.WithPolicy(form);

var tuple = await client.PresignedPostPolicyAsync(form).ConfigureAwait(false);
var curlCommand = "curl -k --insecure -X POST";
foreach (var pair in tuple.Item2) curlCommand += $" -F {pair.Key}={pair.Value}";
curlCommand = curlCommand + " -F file=@/etc/issue " + tuple.Item1 + bucketName + "/";
_ = curlCommand;
}
}
3 changes: 1 addition & 2 deletions Minio.Examples/Cases/SelectObjectContent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ internal static class SelectObjectContent
// Get object in a bucket
public static async Task Run(IMinioClient minio,
string bucketName = "my-bucket-name",
string objectName = "my-object-name",
string fileName = "my-file-name")
string objectName = "my-object-name")
{
if (minio is null) throw new ArgumentNullException(nameof(minio));

Expand Down
3 changes: 1 addition & 2 deletions Minio.Examples/Cases/StatObjectQuery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public static async Task Run(IMinioClient minio,
{
var objectNameInfo = $"{bucketName}-{bucketObject}";
if (!string.IsNullOrEmpty(versionID))
objectNameInfo = objectNameInfo +
$" (Version ID) {me.Response.VersionId} (Marked DEL) {me.Response.DeleteMarker}";
objectNameInfo += $" (Version ID) {me.Response.VersionId} (Marked DEL) {me.Response.DeleteMarker}";

Console.WriteLine($"[StatObject] {objectNameInfo} Exception: {me}");
}
Expand Down
2 changes: 1 addition & 1 deletion Minio.Examples/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static async Task Main()
for (var i = 0; i < 10; i++) objectsList.Add(objectName + i);

// Set app Info
minioClient.SetAppInfo("app-name", "app-version");
_ = minioClient.SetAppInfo("app-name", "app-version");

// Set HTTP Tracing On
// minioClient.SetTraceOn();
Expand Down
6 changes: 2 additions & 4 deletions Minio.Functional.Tests/FunctionalTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ internal static Task RunCoreTests(IMinioClient minioClient)
PresignedPutObject_Test1(minioClient),

// Test incomplete uploads
ListIncompleteUpload_Test1(minioClient),
RemoveIncompleteUpload_Test(minioClient),
//ListIncompleteUpload_Test1(minioClient),
//RemoveIncompleteUpload_Test(minioClient),

// Test GetBucket policy
GetBucketPolicy_Test1(minioClient)
Expand Down Expand Up @@ -5959,8 +5959,6 @@ internal static async Task ListIncompleteUpload_Test1(IMinioClient minio)
var bucketName = GetRandomName(15);
var objectName = GetRandomObjectName(10);
var contentType = "gzip";
var args = new Dictionary<string, string>
(StringComparer.Ordinal) { { "bucketName", bucketName }, { "recursive", "true" } };
try
{
await Setup_Test(minio, bucketName).ConfigureAwait(false);
Expand Down
8 changes: 4 additions & 4 deletions Minio.Functional.Tests/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ public static async Task Main(string[] args)
// FunctionalTest.PresignedPostPolicy_Test1(minioClient).Wait();

// Test incomplete uploads
functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test1(minioClient));
functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test2(minioClient));
functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test3(minioClient));
functionalTestTasks.Add(FunctionalTest.RemoveIncompleteUpload_Test(minioClient));
//functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test1(minioClient));
//functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test2(minioClient));
//functionalTestTasks.Add(FunctionalTest.ListIncompleteUpload_Test3(minioClient));
//functionalTestTasks.Add(FunctionalTest.RemoveIncompleteUpload_Test(minioClient));

// Test GetBucket policy
functionalTestTasks.Add(FunctionalTest.GetBucketPolicy_Test1(minioClient));
Expand Down
14 changes: 0 additions & 14 deletions Minio.Tests/EndpointTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ public class EndpointTest
public void TestGetEndpointURL()
{
_ = RequestUtil.GetEndpointURL("s3.amazonaws.com", true);
object[] parameterValuesArray =
{
new object[] { "s3.amazonaws.com", true, "testbucket", null, false },
new object[] { "testbucket.s3.amazonaws.com", true }
};

object[] parameterValuesArray1 = { "s3.amazonaws.com", true, "testbucket", "testobject", false };

object[][] testCases =
{
new object[]
Expand Down Expand Up @@ -165,10 +157,7 @@ public void TestIsAmazonEndpoint()
};

foreach (var testCase in testAmazonDict)
{
var value = S3utils.IsAmazonEndPoint(testCase.Key);
Assert.AreEqual(S3utils.IsAmazonEndPoint(testCase.Key), testCase.Value);
}
}

[TestMethod]
Expand All @@ -188,9 +177,6 @@ public void TestIsAmazonChinaEndpoint()
};

foreach (var testCase in testAmazonDict)
{
var value = S3utils.IsAmazonChinaEndPoint(testCase.Key);
Assert.AreEqual(S3utils.IsAmazonChinaEndPoint(testCase.Key), testCase.Value);
}
}
}
6 changes: 3 additions & 3 deletions Minio.Tests/UnitTest1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void TestSetAppInfoFailsNullApp()
using var client = new MinioClient()
.WithEndpoint("localhost", 9000)
.Build();
client.SetAppInfo(null, "1.2.2");
_ = client.SetAppInfo(null, "1.2.2");
}

[TestMethod]
Expand All @@ -113,7 +113,7 @@ public void TestSetAppInfoFailsNullVersion()
using var client = new MinioClient()
.WithEndpoint("localhost", 9000)
.Build();
client.SetAppInfo("Hello-App", null);
_ = client.SetAppInfo("Hello-App", null);
}

[TestMethod]
Expand All @@ -122,7 +122,7 @@ public void TestSetAppInfoSuccess()
using var client = new MinioClient()
.WithEndpoint("localhost", 9000)
.Build();
client.SetAppInfo("Hello-App", "1.2.1");
_ = client.SetAppInfo("Hello-App", "1.2.1");
}

[TestMethod]
Expand Down
6 changes: 3 additions & 3 deletions Minio.Tests/UnitTest2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void TestSetAppInfoFailsNullApp()
.WithEndpoint("localhost", 9000)
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo(null, "1.2.2");
_ = client.SetAppInfo(null, "1.2.2");
}

[TestMethod]
Expand All @@ -118,7 +118,7 @@ public void TestSetAppInfoFailsNullVersion()
.WithEndpoint("localhost", 9000)
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo("Hello-App", null);
_ = client.SetAppInfo("Hello-App", null);
}

[TestMethod]
Expand All @@ -128,7 +128,7 @@ public void TestSetAppInfoSuccess()
.WithEndpoint("localhost", 9000)
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo("Hello-App", "1.2.1");
_ = client.SetAppInfo("Hello-App", "1.2.1");
}

[TestMethod]
Expand Down
6 changes: 3 additions & 3 deletions Minio.Tests/UrlTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void TestSetAppInfoFailsNullApp()
.WithEndpoint("localhost:9000")
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo(null, "1.2.2");
_ = client.SetAppInfo(null, "1.2.2");
}

[TestMethod]
Expand All @@ -120,7 +120,7 @@ public void TestSetAppInfoFailsNullVersion()
.WithEndpoint("localhost:9000")
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo("Hello-App", null);
_ = client.SetAppInfo("Hello-App", null);
}

[TestMethod]
Expand All @@ -130,7 +130,7 @@ public void TestSetAppInfoSuccess()
.WithEndpoint("localhost:9000")
.WithCredentials("minio", "minio")
.Build();
client.SetAppInfo("Hello-App", "1.2.1");
_ = client.SetAppInfo("Hello-App", "1.2.1");
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion Minio/Credentials/WebIdentityProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ internal override Task<HttpRequestMessageBuilder> BuildRequest()
internal override AccessCredentials ParseResponse(HttpResponseMessage response)
{
Validate();
var credentials = base.ParseResponse(response);
_ = base.ParseResponse(response);
using var stream = Encoding.UTF8.GetBytes(Convert.ToString(response.Content, CultureInfo.InvariantCulture))
.AsMemory().AsStream();
return Utils.DeserializeXml<AccessCredentials>(stream);
Expand Down
4 changes: 1 addition & 3 deletions Minio/DataModel/ILM/RuleFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ public RuleFilter(AndOperator theAndOperator, string prefix, Tagging tag)
Prefix = null;
else
Prefix = prefix;
if (tag?.TaggingSet.Tag.Count == 0)
tag = null;
else
if (tag?.TaggingSet.Tag.Count != 0)
Tag = tag;
}

Expand Down
2 changes: 1 addition & 1 deletion Minio/DataModel/Response/GenericResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ public GenericResponse(HttpStatusCode statusCode, string responseContent)

public string ResponseContent { get; }
public HttpStatusCode ResponseStatusCode { get; }
}
}
2 changes: 1 addition & 1 deletion Minio/DataModel/Response/ListObjectVersionResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal class ListObjectVersionResponse
internal Item BucketObjectsLastItem;
internal IObserver<Item> ItemObservable;

internal ListObjectVersionResponse(ListObjectsArgs args, Tuple<ListVersionsResult, List<Item>> objectList,
internal ListObjectVersionResponse(ListObjectsArgs _, Tuple<ListVersionsResult, List<Item>> objectList,
IObserver<Item> obs)
{
ItemObservable = obs;
Expand Down
2 changes: 1 addition & 1 deletion Minio/DataModel/Response/ListObjectsItemResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal class ListObjectsItemResponse
internal Item BucketObjectsLastItem;
internal IObserver<Item> ItemObservable;

internal ListObjectsItemResponse(ListObjectsArgs args, Tuple<ListBucketResult, List<Item>> objectList,
internal ListObjectsItemResponse(ListObjectsArgs _, Tuple<ListBucketResult, List<Item>> objectList,
IObserver<Item> obs)
{
ItemObservable = obs;
Expand Down
37 changes: 0 additions & 37 deletions Minio/DataModel/Select/SelectEventType.cs

This file was deleted.

5 changes: 4 additions & 1 deletion Minio/Minio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion SimpleTest/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace SimpleTest;

public static class Program
{
private static async Task Main(string[] args)
private static async Task Main()
{
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
| SecurityProtocolType.Tls11
Expand Down
Loading