Skip to content

[FEATURE] fix RS0026 patch 4 #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcin-krystianc merged 1 commit into from
Feb 19, 2026
Merged

[FEATURE] fix RS0026 patch 4 #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 43 additions & 8 deletions Consul/AuthMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// limitations under the License.
// </copyright>
// -----------------------------------------------------------------------
#pragma warning disable RS0026

using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -90,11 +90,16 @@ private class AuthMethodActionResult : AuthMethodEntry
/// <param name="authMethod">The new ACL AuthMethod</param>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A write result containing the created ACL AuthMethod</returns>
public Task<WriteResult<AuthMethodEntry>> Create(AuthMethodEntry authMethod, CancellationToken ct = default)
public Task<WriteResult<AuthMethodEntry>> Create(AuthMethodEntry authMethod, CancellationToken ct)
{
return Create(authMethod, WriteOptions.Default, ct);
}

public Task<WriteResult<AuthMethodEntry>> Create(AuthMethodEntry authMethod)
{
return Create(authMethod, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Creates a new ACL AuthMethod in Consul
/// </summary>
Expand All @@ -114,11 +119,16 @@ public async Task<WriteResult<AuthMethodEntry>> Create(AuthMethodEntry authMetho
/// <param name="authMethod">The modified ACL AuthMethod</param>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A write result containing the updated ACL AuthMethod</returns>
public Task<WriteResult<AuthMethodEntry>> Update(AuthMethodEntry authMethod, CancellationToken ct = default)
public Task<WriteResult<AuthMethodEntry>> Update(AuthMethodEntry authMethod, CancellationToken ct)
{
return Update(authMethod, WriteOptions.Default, ct);
}

public Task<WriteResult<AuthMethodEntry>> Update(AuthMethodEntry authMethod)
{
return Update(authMethod, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Updates an existing ACL AuthMethod in Consul
/// </summary>
Expand All @@ -138,11 +148,16 @@ public async Task<WriteResult<AuthMethodEntry>> Update(AuthMethodEntry authMetho
/// <param name="name">The name of the ACL AuthMethod to delete</param>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>Success (true) or failure (false)</returns>
public Task<WriteResult<bool>> Delete(string name, CancellationToken ct = default)
public Task<WriteResult<bool>> Delete(string name, CancellationToken ct)
{
return Delete(name, WriteOptions.Default, ct);
}

public Task<WriteResult<bool>> Delete(string name)
{
return Delete(name, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Deletes an existing ACL AuthMethod from Consul
/// </summary>
Expand All @@ -161,11 +176,16 @@ public Task<WriteResult<bool>> Delete(string name, WriteOptions writeOptions, Ca
/// <param name="name">The Name of the ACL AuthMethod to get</param>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A query result containing the requested ACL AuthMethod</returns>
public Task<QueryResult<AuthMethodEntry>> Read(string name, CancellationToken ct = default)
public Task<QueryResult<AuthMethodEntry>> Read(string name, CancellationToken ct)
{
return Read(name, QueryOptions.Default, ct);
}

public Task<QueryResult<AuthMethodEntry>> Read(string name)
{
return Read(name, QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// Gets an existing ACL AuthMethod from Consul
/// </summary>
Expand All @@ -184,11 +204,16 @@ public async Task<QueryResult<AuthMethodEntry>> Read(string name, QueryOptions q
/// </summary>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A query result containing an array of ACL AuthMethods</returns>
public Task<QueryResult<AuthMethodEntry[]>> List(CancellationToken ct = default)
public Task<QueryResult<AuthMethodEntry[]>> List(CancellationToken ct)
{
return List(QueryOptions.Default, ct);
}

public Task<QueryResult<AuthMethodEntry[]>> List()
{
return List(QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// Lists the existing ACL AuthMethods in Consul
/// </summary>
Expand All @@ -205,11 +230,16 @@ public Task<QueryResult<AuthMethodEntry[]>> List(QueryOptions queryOptions, Canc
/// </summary>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A write result containing an ACL Token for the login</returns>
public Task<WriteResult<TokenEntry>> Login(CancellationToken ct = default)
public Task<WriteResult<TokenEntry>> Login(CancellationToken ct)
{
return Login(WriteOptions.Default, ct);
}

public Task<WriteResult<TokenEntry>> Login()
{
return Login(WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Login to ACL Auth Method
/// </summary>
Expand All @@ -227,11 +257,16 @@ public async Task<WriteResult<TokenEntry>> Login(WriteOptions writeOptions, Canc
/// </summary>
/// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
/// <returns>A write result</returns>
public Task<WriteResult> Logout(CancellationToken ct = default)
public Task<WriteResult> Logout(CancellationToken ct)
{
return Logout(WriteOptions.Default, ct);
}

public Task<WriteResult> Logout()
{
return Logout(WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Logout from ACL Auth Method
/// </summary>
Expand Down
30 changes: 25 additions & 5 deletions Consul/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// limitations under the License.
// </copyright>
// -----------------------------------------------------------------------
#pragma warning disable RS0026

using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -1663,11 +1663,16 @@ public Task<WriteResult> ApplyConfig<TConfig>(WriteOptions q, TConfig configurat
/// <param name="configurationEntry">The configuration entry</param>
/// <param name="ct">The cancellation token</param>
/// <returns>An empty write result</returns>
public Task<WriteResult> ApplyConfig<TConfig>(TConfig configurationEntry, CancellationToken ct = default) where TConfig : IConfigurationEntry
public Task<WriteResult> ApplyConfig<TConfig>(TConfig configurationEntry, CancellationToken ct) where TConfig : IConfigurationEntry
{
return ApplyConfig<TConfig>(WriteOptions.Default, configurationEntry, ct);
}

public Task<WriteResult> ApplyConfig<TConfig>(TConfig configurationEntry) where TConfig : IConfigurationEntry
{
return ApplyConfig<TConfig>(WriteOptions.Default, configurationEntry, CancellationToken.None);
}

/// <summary>
/// This Retrieves the given config entry.
/// </summary>
Expand All @@ -1691,11 +1696,16 @@ public Task<QueryResult<TConfig>> GetConfig<TConfig>(string kind, string name, Q
/// <param name="name">The name of config entry</param>
/// <param name="ct">Cancellation Token</param>
/// <returns>A config entry</returns>
public Task<QueryResult<TConfig>> GetConfig<TConfig>(string kind, string name, CancellationToken ct = default) where TConfig : IConfigurationEntry
public Task<QueryResult<TConfig>> GetConfig<TConfig>(string kind, string name, CancellationToken ct) where TConfig : IConfigurationEntry
{
return GetConfig<TConfig>(kind, name, QueryOptions.Default, ct);
}

public Task<QueryResult<TConfig>> GetConfig<TConfig>(string kind, string name) where TConfig : IConfigurationEntry
{
return GetConfig<TConfig>(kind, name, QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// This Retrieves the list of config for an entry kind.
/// </summary>
Expand All @@ -1716,11 +1726,16 @@ public Task<QueryResult<List<TConfig>>> ListConfig<TConfig>(string kind, QueryOp
/// <param name="kind">The kind of config entry</param>
/// <param name="ct">Cancellation Token</param>
/// <returns>A list of config entries</returns>
public Task<QueryResult<List<TConfig>>> ListConfig<TConfig>(string kind, CancellationToken ct = default) where TConfig : IConfigurationEntry
public Task<QueryResult<List<TConfig>>> ListConfig<TConfig>(string kind, CancellationToken ct) where TConfig : IConfigurationEntry
{
return ListConfig<TConfig>(kind, QueryOptions.Default, ct);
}

public Task<QueryResult<List<TConfig>>> ListConfig<TConfig>(string kind) where TConfig : IConfigurationEntry
{
return ListConfig<TConfig>(kind, QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// This Deletes the given config entry.
/// </summary>
Expand All @@ -1742,10 +1757,15 @@ public Task<WriteResult> DeleteConfig(string kind, string name, WriteOptions q,
/// <param name="name">The name of config entry</param>
/// <param name="ct">Cancellation Token</param>
/// <returns>A config entry</returns>
public Task<WriteResult> DeleteConfig(string kind, string name, CancellationToken ct = default)
public Task<WriteResult> DeleteConfig(string kind, string name, CancellationToken ct)
{
return DeleteConfig(kind, name, WriteOptions.Default, ct);
}

public Task<WriteResult> DeleteConfig(string kind, string name)
{
return DeleteConfig(kind, name, WriteOptions.Default, CancellationToken.None);
}
}
public partial class ConsulClient : IConsulClient
{
Expand Down
66 changes: 56 additions & 10 deletions Consul/Connect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// limitations under the License.
// </copyright>
// -----------------------------------------------------------------------
#pragma warning disable RS0026

using System;
using System.Collections.Generic;
using System.Threading;
Expand Down Expand Up @@ -235,10 +235,16 @@ internal Connect(ConsulClient c)
/// <summary>
/// CARoots queries the list of available roots.
/// </summary>
public Task<QueryResult<CARoots>> CARoots(CancellationToken ct = default)
public Task<QueryResult<CARoots>> CARoots(CancellationToken ct)
{
return CARoots(QueryOptions.Default, ct);
}

public Task<QueryResult<CARoots>> CARoots()
{
return CARoots(QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// CARoots queries the list of available roots.
/// </summary>
Expand All @@ -249,11 +255,16 @@ public Task<QueryResult<CARoots>> CARoots(QueryOptions q, CancellationToken ct =
/// <summary>
/// CAGetConfig returns the current CA configuration.
/// </summary>
public Task<QueryResult<CAConfig>> CAGetConfig(CancellationToken ct = default)
public Task<QueryResult<CAConfig>> CAGetConfig(CancellationToken ct)
{
return CAGetConfig(QueryOptions.Default, ct);
}

public Task<QueryResult<CAConfig>> CAGetConfig()
{
return CAGetConfig(QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// CAGetConfig returns the current CA configuration.
/// </summary>
Expand All @@ -265,11 +276,16 @@ public Task<QueryResult<CAConfig>> CAGetConfig(QueryOptions q, CancellationToken
/// <summary>
/// CASetConfig sets the current CA configuration.
/// </summary>
public Task<WriteResult> CASetConfig(CAConfig config, CancellationToken ct = default)
public Task<WriteResult> CASetConfig(CAConfig config, CancellationToken ct)
{
return CASetConfig(config, WriteOptions.Default, ct);
}

public Task<WriteResult> CASetConfig(CAConfig config)
{
return CASetConfig(config, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// CASetConfig sets the current CA configuration.
/// </summary>
Expand All @@ -284,11 +300,16 @@ public Task<WriteResult> CASetConfig(CAConfig config, WriteOptions q, Cancellati
/// </summary>
/// <param name="ct">Cancellation Token</param>
/// <returns>A list of service intentions</returns>
public Task<QueryResult<List<ServiceIntention>>> ListIntentions<ServiceIntention>(CancellationToken ct = default)
public Task<QueryResult<List<ServiceIntention>>> ListIntentions<ServiceIntention>(CancellationToken ct)
{
return ListIntentions<ServiceIntention>(QueryOptions.Default, ct);
}

public Task<QueryResult<List<ServiceIntention>>> ListIntentions<ServiceIntention>()
{
return ListIntentions<ServiceIntention>(QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// Retrieves a list of all configured service intentions with query options
/// </summary>
Expand Down Expand Up @@ -328,11 +349,16 @@ public Task<WriteResult<bool>> UpsertIntentionsByName(ServiceIntention intention
/// <param name="intention"></param>
/// <param name="ct"></param>
/// <returns>True if the intention was created successfully or False if not</returns>
public Task<WriteResult<bool>> UpsertIntentionsByName(ServiceIntention intention, CancellationToken ct = default)
public Task<WriteResult<bool>> UpsertIntentionsByName(ServiceIntention intention, CancellationToken ct)
{
return UpsertIntentionsByName(intention, WriteOptions.Default, ct);
}

public Task<WriteResult<bool>> UpsertIntentionsByName(ServiceIntention intention)
{
return UpsertIntentionsByName(intention, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// Deletes a specific intention by its unique source and destination.
/// </summary>
Expand All @@ -356,11 +382,16 @@ public Task<WriteResult> DeleteIntentionByName(string source, string destination
/// <param name="destination"></param>
/// <param name="ct"></param>
/// <returns>A Write Option</returns>
public Task<WriteResult> DeleteIntentionByName(string source, string destination, CancellationToken ct = default)
public Task<WriteResult> DeleteIntentionByName(string source, string destination, CancellationToken ct)
{
return DeleteIntentionByName(source, destination, WriteOptions.Default, ct);
}

public Task<WriteResult> DeleteIntentionByName(string source, string destination)
{
return DeleteIntentionByName(source, destination, WriteOptions.Default, CancellationToken.None);
}

/// <summary>
/// reads a specific intention by its unique source and destination.
/// </summary>
Expand All @@ -386,11 +417,16 @@ public Task<QueryResult<ServiceIntention>> ReadSpecificIntentionByName<ServiceIn
/// <param name="destination"></param>
/// <param name="ct"></param>
/// <returns>A service intention</returns>
public Task<QueryResult<ServiceIntention>> ReadSpecificIntentionByName<ServiceIntention>(string source, string destination, CancellationToken ct = default)
public Task<QueryResult<ServiceIntention>> ReadSpecificIntentionByName<ServiceIntention>(string source, string destination, CancellationToken ct)
{
return ReadSpecificIntentionByName<ServiceIntention>(source, destination, QueryOptions.Default, ct);
}

public Task<QueryResult<ServiceIntention>> ReadSpecificIntentionByName<ServiceIntention>(string source, string destination)
{
return ReadSpecificIntentionByName<ServiceIntention>(source, destination, QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// lists the intentions that match a given source or destination.
/// </summary>
Expand All @@ -414,11 +450,16 @@ public Task<QueryResult<Dictionary<string, List<ServiceIntention>>>> ListMatchin
/// <param name="name">Specifies a name to match according to the source or destination</param>
/// <param name="ct"></param>
/// <returns>A list of intentions that match the source of destination specified</returns>
public Task<QueryResult<Dictionary<string, List<ServiceIntention>>>> ListMatchingIntentions(string by, string name, CancellationToken ct = default)
public Task<QueryResult<Dictionary<string, List<ServiceIntention>>>> ListMatchingIntentions(string by, string name, CancellationToken ct)
{
return ListMatchingIntentions(by, name, QueryOptions.Default, ct);
}

public Task<QueryResult<Dictionary<string, List<ServiceIntention>>>> ListMatchingIntentions(string by, string name)
{
return ListMatchingIntentions(by, name, QueryOptions.Default, CancellationToken.None);
}

/// <summary>
/// Evaluates the intentions for a specific source and destination.
/// This endpoint will always evaluate matching intentions with L7 Permissions defined as deny intentions because there is no request to check against.
Expand All @@ -444,10 +485,15 @@ public Task<QueryResult<ServiceIntentionResultResponse>> CheckIntentionResult(st
/// <param name="destination"></param>
/// <param name="ct"></param>
/// <returns>Returns true or false which indicates whether the connection would be authorized or not</returns>
public Task<QueryResult<ServiceIntentionResultResponse>> CheckIntentionResult(string source, string destination, CancellationToken ct = default)
public Task<QueryResult<ServiceIntentionResultResponse>> CheckIntentionResult(string source, string destination, CancellationToken ct)
{
return CheckIntentionResult(source, destination, QueryOptions.Default, ct);
}

public Task<QueryResult<ServiceIntentionResultResponse>> CheckIntentionResult(string source, string destination)
{
return CheckIntentionResult(source, destination, QueryOptions.Default, CancellationToken.None);
}
}

public partial class ConsulClient : IConsulClient
Expand Down
Loading
Loading