Skip to content

Commit fdb4411

Browse files
ramonsmitsramonsmits
authored
Merge pull request #5350 from Particular/ibmmq
2 parents f31c61d + 104fc87 commit fdb4411

24 files changed

+698
-7
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
os: [windows-latest, ubuntu-latest]
21-
test-category: [ Default, SqlServer, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL ]
21+
test-category: [ Default, SqlServer, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL, IBMMQ ]
2222
include:
2323
- os: windows-latest
2424
os-name: Windows
@@ -27,6 +27,8 @@ jobs:
2727
exclude:
2828
- os: ubuntu-latest
2929
test-category: MSMQ
30+
- os: windows-latest
31+
test-category: IBMMQ
3032
fail-fast: false
3133
steps:
3234
- name: Check for secrets
@@ -103,6 +105,18 @@ jobs:
103105
connection-string-name: ServiceControl_TransportTests_ASQ_ConnectionString
104106
azure-credentials: ${{ secrets.AZURE_ACI_CREDENTIALS }}
105107
tag: ServiceControl
108+
- name: Setup IBM MQ
109+
if: matrix.test-category == 'IBMMQ'
110+
run: |
111+
docker run --name ibmmq -d -p 1414:1414 -p 9443:9443 `
112+
--health-cmd "dspmq" --health-interval 10s --health-timeout 5s --health-retries 10 --health-start-period 30s `
113+
-e LICENSE=accept -e MQ_QMGR_NAME=QM1 -e MQ_ADMIN_PASSWORD=passw0rd `
114+
icr.io/ibm-messaging/mq:latest
115+
# Wait for container health check to pass
116+
while ((docker inspect --format '{{.State.Health.Status}}' ibmmq) -ne 'healthy') {
117+
Start-Sleep -Seconds 2
118+
}
119+
echo "ServiceControl_TransportTests_IBMMQ_ConnectionString=mq://admin:passw0rd@localhost:1414/QM1?channel=DEV.ADMIN.SVRCONN&topicprefix=DEV" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
106120
- name: Setup SQS environment variables
107121
if: matrix.test-category == 'SQS'
108122
run: |

‎nuget.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@
1111
<packageSource key="particular packages">
1212
<package pattern="*" />
1313
</packageSource>
14-
<packageSource key="local packages">
15-
<package pattern="*" />
16-
</packageSource>
1714
</packageSourceMapping>
1815
</configuration>

‎src/Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.0" />
5353
<PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="9.0.0" />
5454
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="9.0.0" />
55+
<PackageVersion Include="NServiceBus.Transport.IBMMQ" Version="1.0.0"/>
5556
<PackageVersion Include="NuGet.Versioning" Version="7.3.0" />
5657
<PackageVersion Include="NUnit" Version="4.5.1" />
5758
<PackageVersion Include="NUnit.Analyzers" Version="4.12.0" />

‎src/ProjectReferences.Transports.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ItemGroup Label="Transports">
44
<ProjectReference Include="..\ServiceControl.Transports.ASBS\ServiceControl.Transports.ASBS.csproj" ReferenceOutputAssembly="false" Private="false" />
55
<ProjectReference Include="..\ServiceControl.Transports.ASQ\ServiceControl.Transports.ASQ.csproj" ReferenceOutputAssembly="false" Private="false" />
6+
<ProjectReference Include="..\ServiceControl.Transports.IBMMQ\ServiceControl.Transports.IBMMQ.csproj" ReferenceOutputAssembly="false" Private="false" />
67
<ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" ReferenceOutputAssembly="false" Private="false" />
78
<ProjectReference Include="..\ServiceControl.Transports.Msmq\ServiceControl.Transports.Msmq.csproj" ReferenceOutputAssembly="false" Private="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework" />
89
<ProjectReference Include="..\ServiceControl.Transports.PostgreSql\ServiceControl.Transports.PostgreSql.csproj" ReferenceOutputAssembly="false" Private="false" />

‎src/ServiceControl.Transports.IBMMQ.Tests/DeadLetterQueueCheckTests.cs‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
namespace ServiceControl.Transport.Tests;
2+
3+
using System;
4+
using System.Collections;
5+
using System.Threading.Tasks;
6+
using IBM.WMQ;
7+
using NUnit.Framework;
8+
using Transports;
9+
using Transports.IBMMQ;
10+
11+
[TestFixture]
12+
class DeadLetterQueueCheckTests
13+
{
14+
[Test]
15+
public async Task Should_pass_when_custom_checks_disabled()
16+
{
17+
var settings = new TransportSettings
18+
{
19+
ConnectionString = ConnectionString,
20+
RunCustomChecks = false
21+
};
22+
23+
var check = new DeadLetterQueueCheck(settings);
24+
var result = await check.PerformCheck().ConfigureAwait(false);
25+
26+
Assert.That(result.HasFailed, Is.False);
27+
}
28+
29+
[Test]
30+
public async Task Should_pass_when_dlq_is_empty()
31+
{
32+
DrainDeadLetterQueue();
33+
34+
var settings = new TransportSettings
35+
{
36+
ConnectionString = ConnectionString,
37+
RunCustomChecks = true
38+
};
39+
40+
var check = new DeadLetterQueueCheck(settings);
41+
var result = await check.PerformCheck().ConfigureAwait(false);
42+
43+
Assert.That(result.HasFailed, Is.False);
44+
}
45+
46+
[Test]
47+
public async Task Should_fail_when_dlq_has_messages()
48+
{
49+
DrainDeadLetterQueue();
50+
PutMessageOnDeadLetterQueue();
51+
52+
try
53+
{
54+
var settings = new TransportSettings
55+
{
56+
ConnectionString = ConnectionString,
57+
RunCustomChecks = true
58+
};
59+
60+
var check = new DeadLetterQueueCheck(settings);
61+
var result = await check.PerformCheck().ConfigureAwait(false);
62+
63+
Assert.That(result.HasFailed, Is.True);
64+
Assert.That(result.FailureReason, Does.Contain("messages in the Dead Letter Queue"));
65+
}
66+
finally
67+
{
68+
DrainDeadLetterQueue();
69+
}
70+
}
71+
72+
[Test]
73+
public async Task Should_fail_when_connection_is_invalid()
74+
{
75+
var settings = new TransportSettings
76+
{
77+
ConnectionString = "mq://admin:passw0rd@localhost:19999/BOGUS",
78+
RunCustomChecks = true
79+
};
80+
81+
var check = new DeadLetterQueueCheck(settings);
82+
var result = await check.PerformCheck().ConfigureAwait(false);
83+
84+
Assert.That(result.HasFailed, Is.True);
85+
Assert.That(result.FailureReason, Does.Contain("Unable to check Dead Letter Queue"));
86+
Assert.That(result.FailureReason, Does.Contain("RC="));
87+
}
88+
89+
static void PutMessageOnDeadLetterQueue()
90+
{
91+
var (qmName, props) = ParseConnectionString();
92+
using var qm = new MQQueueManager(qmName, props);
93+
var dlqName = qm.DeadLetterQueueName.Trim();
94+
using var dlq = qm.AccessQueue(dlqName, MQC.MQOO_OUTPUT);
95+
var msg = new MQMessage();
96+
msg.WriteString("DLQ test message");
97+
dlq.Put(msg);
98+
}
99+
100+
static void DrainDeadLetterQueue()
101+
{
102+
var (qmName, props) = ParseConnectionString();
103+
using var qm = new MQQueueManager(qmName, props);
104+
var dlqName = qm.DeadLetterQueueName.Trim();
105+
using var dlq = qm.AccessQueue(dlqName, MQC.MQOO_INPUT_SHARED | MQC.MQOO_FAIL_IF_QUIESCING);
106+
var gmo = new MQGetMessageOptions { WaitInterval = 0, Options = MQC.MQGMO_NO_WAIT };
107+
while (true)
108+
{
109+
try
110+
{
111+
dlq.Get(new MQMessage(), gmo);
112+
}
113+
catch (MQException e) when (e.ReasonCode == MQC.MQRC_NO_MSG_AVAILABLE)
114+
{
115+
break;
116+
}
117+
}
118+
}
119+
120+
static (string queueManagerName, Hashtable properties) ParseConnectionString() =>
121+
ConnectionProperties.Parse(ConnectionString);
122+
123+
static readonly string ConnectionString =
124+
Environment.GetEnvironmentVariable("ServiceControl_TransportTests_IBMMQ_ConnectionString")
125+
?? Environment.GetEnvironmentVariable("SERVICECONTROL_TRANSPORTTESTS_IBMMQ_CONNECTIONSTRING")
126+
?? "mq://admin:passw0rd@localhost:1414";
127+
}

‎src/ServiceControl.Transports.IBMMQ.Tests/ServiceControl.Transports.IBMMQ.Tests.csproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\ServiceControl.Transports.IBMMQ\ServiceControl.Transports.IBMMQ.csproj" />
9+
<!-- Needed to bring the dependencies that the transport plugin excludes -->
10+
<ProjectReference Include="..\ServiceControl.Transports\ServiceControl.Transports.csproj" />
11+
<ProjectReference Include="..\TestHelper\TestHelper.csproj" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="GitHubActionsTestLogger" />
16+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
18+
<PackageReference Include="NServiceBus.AcceptanceTesting" />
19+
<PackageReference Include="NServiceBus.Persistence.NonDurable" />
20+
<PackageReference Include="NUnit" />
21+
<PackageReference Include="NUnit.Analyzers" />
22+
<PackageReference Include="NUnit3TestAdapter" />
23+
<PackageReference Include="Particular.Approvals" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<Compile Include="..\ServiceControl.Transports.Tests\*.cs" LinkBase="Shared" />
28+
<Compile Remove="..\ServiceControl.Transports.Tests\TransportManifestLibraryTests.cs" />
29+
<Compile Remove="..\ServiceControl.Transports.Tests\TestsFilter.cs" />
30+
</ItemGroup>
31+
32+
</Project>

‎src/ServiceControl.Transports.IBMMQ.Tests/ServiceControlAuditEndpointTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace ServiceControl.Transport.Tests;
2+
3+
using System;
4+
5+
partial class ServiceControlAuditEndpointTests
6+
{
7+
private static partial int GetTransportDefaultConcurrency() => 32;
8+
}

‎src/ServiceControl.Transports.IBMMQ.Tests/ServiceControlMonitoringEndpointTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace ServiceControl.Transport.Tests;
2+
3+
using System;
4+
5+
partial class ServiceControlMonitoringEndpointTests
6+
{
7+
private static partial int GetTransportDefaultConcurrency() => 32;
8+
}

‎src/ServiceControl.Transports.IBMMQ.Tests/ServiceControlPrimaryEndpointTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace ServiceControl.Transport.Tests;
2+
3+
using System;
4+
5+
partial class ServiceControlPrimaryEndpointTests
6+
{
7+
private static partial int GetTransportDefaultConcurrency() => 10;
8+
}

‎src/ServiceControl.Transports.IBMMQ.Tests/TestsFilter.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[assembly: IncludeInIBMMQTests()]

0 commit comments

Comments
 (0)