Skip to content

[PM-17562] Update documentation for event integrations #5924

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.

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
Show file tree
Hide file tree
Changes from 9 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Core;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Models.Data.Integrations;
using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
using Bit.Core.Context;
using Bit.Core.Enums;
using Bit.Core.Exceptions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
๏ปฟusing System.ComponentModel.DataAnnotations;
using System.Text.Json;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Models.Data.Integrations;
using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
using Bit.Core.Enums;

#nullable enable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using Bit.Core.Enums;

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public interface IIntegrationMessage
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public class IntegrationHandlerResult
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text.Json;
using Bit.Core.Enums;

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public class IntegrationMessage : IIntegrationMessage
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Bit.Core.Enums;
using Bit.Core.Models.Data;

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public class IntegrationTemplateContext(EventMessage eventMessage)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public record SlackIntegration(string token);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public record SlackIntegrationConfiguration(string channelId);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public record SlackIntegrationConfigurationDetails(string channelId, string token);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public record WebhookIntegrationConfiguration(string url);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟ#nullable enable

namespace Bit.Core.AdminConsole.Models.Data.Integrations;
namespace Bit.Core.AdminConsole.Models.Data.EventIntegrations;

public record WebhookIntegrationConfigurationDetails(string url);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟusing Azure.Messaging.ServiceBus;
using Bit.Core.AdminConsole.Models.Data.Integrations;
using Bit.Core.AdminConsole.Models.Data.EventIntegrations;

namespace Bit.Core.Services;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
๏ปฟusing Bit.Core.AdminConsole.Models.Data.Integrations;
๏ปฟusing Bit.Core.AdminConsole.Models.Data.EventIntegrations;

namespace Bit.Core.Services;

Expand Down
2 changes: 1 addition & 1 deletion src/Core/AdminConsole/Services/IIntegrationHandler.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
๏ปฟusing Bit.Core.AdminConsole.Models.Data.Integrations;
๏ปฟusing Bit.Core.AdminConsole.Models.Data.EventIntegrations;

namespace Bit.Core.Services;

Expand Down
2 changes: 1 addition & 1 deletion src/Core/AdminConsole/Services/IRabbitMqService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
๏ปฟusing Bit.Core.AdminConsole.Models.Data.Integrations;
๏ปฟusing Bit.Core.AdminConsole.Models.Data.EventIntegrations;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
await _processor.StartProcessingAsync(cancellationToken);
}

public override async Task StopAsync(CancellationToken cancellationToken)
{
await _processor.StopProcessingAsync(cancellationToken);
await _processor.DisposeAsync();
await base.StopAsync(cancellationToken);
}

Check warning on line 41 in src/Core/AdminConsole/Services/Implementations/EventIntegrations/AzureServiceBusEventListenerService.cs

View check run for this annotation

Codecov / codecov/patch

src/Core/AdminConsole/Services/Implementations/EventIntegrations/AzureServiceBusEventListenerService.cs#L37-L41

Added lines #L37 - L41 were not covered by tests

internal Task ProcessErrorAsync(ProcessErrorEventArgs args)
{
_logger.LogError(
Expand All @@ -49,16 +56,4 @@
await ProcessReceivedMessageAsync(Encoding.UTF8.GetString(args.Message.Body), args.Message.MessageId);
await args.CompleteMessageAsync(args.Message);
}

public override async Task StopAsync(CancellationToken cancellationToken)
{
await _processor.StopProcessingAsync(cancellationToken);
await base.StopAsync(cancellationToken);
}

public override void Dispose()
{
_processor.DisposeAsync().GetAwaiter().GetResult();
base.Dispose();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
๏ปฟusing Azure.Messaging.ServiceBus;
using Bit.Core.AdminConsole.Models.Data.Integrations;
using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
using Bit.Core.Enums;
using Bit.Core.Settings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
๏ปฟ#nullable enable

using System.Text.Json;
using Bit.Core.AdminConsole.Models.Data.Integrations;
using Bit.Core.AdminConsole.Models.Data.EventIntegrations;
using Bit.Core.AdminConsole.Utilities;
using Bit.Core.Enums;
using Bit.Core.Models.Data;
Expand Down
Loading
Loading