From 5b4314770cd55bb437b4ffcd4791cad7e2026fcb Mon Sep 17 00:00:00 2001 From: tamnjongLarry Date: Wed, 6 Nov 2024 13:09:02 +0100 Subject: [PATCH 1/5] add delete network area and test (#381) --- Consul.Test/OperatorTest.cs | 17 +++++++++++++++++ Consul/Interfaces/IOperatorEndpoint.cs | 2 ++ Consul/Operator.cs | 14 ++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/Consul.Test/OperatorTest.cs b/Consul.Test/OperatorTest.cs index 346352c79..5ab20439b 100644 --- a/Consul.Test/OperatorTest.cs +++ b/Consul.Test/OperatorTest.cs @@ -158,5 +158,22 @@ public async Task Operator_AreaGet() Assert.Equal(area.RetryJoin, result.RetryJoin); Assert.Equal(area.PeerDatacenter, result.PeerDatacenter); } + + [EnterpriseOnlyFact] + public async Task Operetor_AreaDelete() + { + var peerDataCenter = KVTest.GenerateTestKeyName(); + var area = new AreaRequest { PeerDatacenter = peerDataCenter, UseTLS = true, RetryJoin = new string[] { "10.1.2.7", "10.1.2.0" } }; + var createResult = await _client.Operator.AreaCreate(area); + var areaId = createResult.Response; + + await _client.Operator.AreaDelete(areaId); + + var req = await _client.Operator.AreaGet(areaId); + var result = req.Response.Single(x => x.ID == areaId); + + Assert.Null(result); + + } } } diff --git a/Consul/Interfaces/IOperatorEndpoint.cs b/Consul/Interfaces/IOperatorEndpoint.cs index 3e1fa7215..73e5190a1 100644 --- a/Consul/Interfaces/IOperatorEndpoint.cs +++ b/Consul/Interfaces/IOperatorEndpoint.cs @@ -53,5 +53,7 @@ public interface IOperatorEndpoint Task> AreaUpdate(AreaRequest area, string areaId, WriteOptions q, CancellationToken cancellationToken = default); Task> AreaGet(string areaId, CancellationToken cancellationToken = default); Task> AreaGet(string areaId, QueryOptions q, CancellationToken cancellationToken = default); + Task AreaDelete(string areaId, CancellationToken cancellationToken = default); + Task AreaDelete(string areaId, WriteOptions q, CancellationToken cancellationToken = default); } } diff --git a/Consul/Operator.cs b/Consul/Operator.cs index e7286e892..c53eaa386 100644 --- a/Consul/Operator.cs +++ b/Consul/Operator.cs @@ -341,6 +341,20 @@ public Task> AreaGet(string areaId, QueryOptions q, Cancella { return _client.Get($"/v1/operator/area/{areaId}", q).Execute(ct); } + /// + /// AreaDelete deletes the given network area. + /// + public Task AreaDelete(string areaId, CancellationToken ct = default) + { + return AreaDelete(areaId, WriteOptions.Default, ct); + } + /// + /// AreaDelete deletes the given network area. + /// + public Task AreaDelete(string areaId, WriteOptions q, CancellationToken ct = default) + { + return _client.Delete($"/v1/operator/area/{areaId}", q).Execute(ct); + } } public class ConsulLicense From 9df561e664c919837d8e94e5c01de3fa823e5993 Mon Sep 17 00:00:00 2001 From: tamnjongLarry Date: Wed, 6 Nov 2024 13:22:02 +0100 Subject: [PATCH 2/5] update test --- Consul.Test/OperatorTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Consul.Test/OperatorTest.cs b/Consul.Test/OperatorTest.cs index 5ab20439b..9b49985d3 100644 --- a/Consul.Test/OperatorTest.cs +++ b/Consul.Test/OperatorTest.cs @@ -170,7 +170,7 @@ public async Task Operetor_AreaDelete() await _client.Operator.AreaDelete(areaId); var req = await _client.Operator.AreaGet(areaId); - var result = req.Response.Single(x => x.ID == areaId); + var result = req.Response.SingleOrDefault(x => x.ID == areaId); Assert.Null(result); From 28b15844ba6bfb8e64c0fde01d5173d72a8d97f6 Mon Sep 17 00:00:00 2001 From: tamnjongLarry Date: Wed, 6 Nov 2024 13:39:52 +0100 Subject: [PATCH 3/5] update to use FirstOrDefault instead of Single in test --- Consul.Test/OperatorTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Consul.Test/OperatorTest.cs b/Consul.Test/OperatorTest.cs index 9b49985d3..c16fdaf04 100644 --- a/Consul.Test/OperatorTest.cs +++ b/Consul.Test/OperatorTest.cs @@ -170,7 +170,7 @@ public async Task Operetor_AreaDelete() await _client.Operator.AreaDelete(areaId); var req = await _client.Operator.AreaGet(areaId); - var result = req.Response.SingleOrDefault(x => x.ID == areaId); + var result = req.Response.FirstOrDefault(x => x.ID == areaId); Assert.Null(result); From 0dbe803da55dd8c9dd37cb7296abe2096ecde348 Mon Sep 17 00:00:00 2001 From: tamnjongLarry Date: Wed, 6 Nov 2024 13:47:43 +0100 Subject: [PATCH 4/5] update test --- Consul.Test/OperatorTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Consul.Test/OperatorTest.cs b/Consul.Test/OperatorTest.cs index c16fdaf04..89fb077ff 100644 --- a/Consul.Test/OperatorTest.cs +++ b/Consul.Test/OperatorTest.cs @@ -170,9 +170,8 @@ public async Task Operetor_AreaDelete() await _client.Operator.AreaDelete(areaId); var req = await _client.Operator.AreaGet(areaId); - var result = req.Response.FirstOrDefault(x => x.ID == areaId); - Assert.Null(result); + Assert.Null(req); } } From 30871243741b8aee920f26a8e98faeb6c64a1ba6 Mon Sep 17 00:00:00 2001 From: tamnjongLarry Date: Wed, 6 Nov 2024 14:03:28 +0100 Subject: [PATCH 5/5] update test --- Consul.Test/OperatorTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Consul.Test/OperatorTest.cs b/Consul.Test/OperatorTest.cs index 89fb077ff..60402d2bb 100644 --- a/Consul.Test/OperatorTest.cs +++ b/Consul.Test/OperatorTest.cs @@ -171,8 +171,7 @@ public async Task Operetor_AreaDelete() var req = await _client.Operator.AreaGet(areaId); - Assert.Null(req); - + Assert.Null(req.Response); } } }