Skip to content

Commit ac8ab53

Browse files
mauroservientimauroservienti
authored
Merge branch 'master' into allow-setting-shutdown-timeout
2 parents ead918f + 76d9bb7 commit ac8ab53

File tree

44 files changed

+893
-497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+893
-497
lines changed

‎.github/workflows/build-containers.yml‎

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ jobs:
1212
include:
1313
- name: servicecontrol
1414
project: ServiceControl
15-
description: ServiceControl error instance
15+
title: ServiceControl
16+
description: Gather status, performance and monitoring data for multiple endpoints from a single location.
1617
- name: servicecontrol-audit
1718
project: ServiceControl.Audit
18-
description: ServiceControl audit instance
19+
title: ServiceControl Audit Instance
20+
description: Provide valuable information about the message flow through a system.
1921
- name: servicecontrol-monitoring
2022
project: ServiceControl.Monitoring
21-
description: ServiceControl monitoring instance
23+
title: ServiceControl Monitoring Instance
24+
description: Track the health of a distributed system.
2225
fail-fast: false
2326
steps:
2427
- name: Check for secrets
@@ -40,24 +43,44 @@ jobs:
4043
- name: Set up Docker Buildx
4144
uses: docker/[email protected]
4245
- name: Log in to GitHub container registry
43-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
44-
- name: Build & inspect image
45-
env:
46-
TAG_NAME: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}
47-
run: |
48-
docker buildx build --push --tag ghcr.io/particular/${{ matrix.name }}:${{ env.TAG_NAME }} \
49-
--file src/${{ matrix.project }}/Dockerfile \
50-
--build-arg VERSION=${{ env.MinVerVersion }} \
51-
--annotation "index:org.opencontainers.image.title=${{ matrix.name }}" \
52-
--annotation "index:org.opencontainers.image.description=${{ matrix.description }}" \
53-
--annotation "index:org.opencontainers.image.created=$(date '+%FT%TZ')" \
54-
--annotation "index:org.opencontainers.image.revision=${{ github.sha }}" \
55-
--annotation "index:org.opencontainers.image.authors=Particular Software" \
56-
--annotation "index:org.opencontainers.image.vendor=Particular Software" \
57-
--annotation "index:org.opencontainers.image.version=${{ env.MinVerVersion }}" \
58-
--annotation "index:org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ github.sha }}" \
59-
--annotation "index:org.opencontainers.image.url=https://hub.docker.com/r/particular/${{ matrix.name }}" \
60-
--annotation "index:org.opencontainers.image.documentation=https://docs.particular.net/servicecontrol/" \
61-
--annotation "index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-composite-extra" \
62-
--platform linux/arm64,linux/amd64 .
63-
docker buildx imagetools inspect ghcr.io/particular/${{ matrix.name }}:${{ env.TAG_NAME }}
46+
uses: docker/[email protected]
47+
with:
48+
registry: ghcr.io
49+
username: ${{ github.actor }}
50+
password: ${{ secrets.GITHUB_TOKEN }}
51+
- name: Get current date
52+
id: date
53+
run: echo "date=$(date '+%FT%TZ')" >> $GITHUB_OUTPUT
54+
- name: Build and push image to GitHub container registry
55+
uses: docker/[email protected]
56+
with:
57+
context: .
58+
push: true
59+
platforms: linux/amd64,linux/arm64
60+
sbom: true
61+
labels: |
62+
org.opencontainers.image.source=https://github.com/Particular/ServiceControl/tree/${{ github.sha }}
63+
org.opencontainers.image.authors="Particular Software"
64+
org.opencontainers.image.vendor="Particular Software"
65+
org.opencontainers.image.url=https://hub.docker.com/r/particular/${{ matrix.name }}
66+
org.opencontainers.image.documentation=https://docs.particular.net/servicecontrol/
67+
org.opencontainers.image.version=${{ env.MinVerVersion }}
68+
org.opencontainers.image.revision=${{ github.sha }}
69+
org.opencontainers.image.created=${{ steps.date.outputs.date }}
70+
org.opencontainers.image.title=${{ matrix.title }}
71+
org.opencontainers.image.description=${{ matrix.description }}
72+
org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-composite-extra
73+
annotations: |
74+
index:org.opencontainers.image.source=https://github.com/Particular/ServiceControl/tree/${{ github.sha }}
75+
index:org.opencontainers.image.authors="Particular Software"
76+
index:org.opencontainers.image.vendor="Particular Software"
77+
index:org.opencontainers.image.url=https://hub.docker.com/r/particular/${{ matrix.name }}
78+
index:org.opencontainers.image.documentation=https://docs.particular.net/servicecontrol/
79+
index:org.opencontainers.image.version=${{ env.MinVerVersion }}
80+
index:org.opencontainers.image.revision=${{ github.sha }}
81+
index:org.opencontainers.image.created=${{ steps.date.outputs.date }}
82+
index:org.opencontainers.image.title=${{ matrix.title }}
83+
index:org.opencontainers.image.description=${{ matrix.description }}
84+
index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-composite-extra
85+
file: src/${{ matrix.project }}/Dockerfile
86+
tags: ghcr.io/particular/${{ matrix.name }}:${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}

‎.github/workflows/build-db-container.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@ jobs:
2424
uses: ./.github/actions/validate-version
2525
with:
2626
version: ${{ env.MinVerVersion }}
27+
- name: Set up Docker Buildx
28+
uses: docker/[email protected]
2729
- name: Log in to GitHub container registry
28-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
30+
uses: docker/[email protected]
31+
with:
32+
registry: ghcr.io
33+
username: ${{ github.actor }}
34+
password: ${{ secrets.GITHUB_TOKEN }}
2935
- name: Install Docker arm64 emulation
3036
run: docker run --privileged --rm tonistiigi/binfmt --install arm64
3137
- name: Build images

‎.github/workflows/build-windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
New-Item assets\PowerShellModules -ItemType Directory
6565
Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
6666
- name: Publish assets
67-
uses: actions/[email protected].0
67+
uses: actions/[email protected].1
6868
with:
6969
name: assets
7070
path: assets/*
7171
retention-days: 1
7272
- name: Publish zips
73-
uses: actions/[email protected].0
73+
uses: actions/[email protected].1
7474
with:
7575
name: zips
7676
path: zip/*
@@ -88,7 +88,7 @@ jobs:
8888
client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
8989
certificate-name: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}
9090
- name: Publish NuGet packages
91-
uses: actions/[email protected].0
91+
uses: actions/[email protected].1
9292
with:
9393
name: nugets
9494
path: nugets/*

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
New-Item assets\PowerShellModules -ItemType Directory
5151
Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
5252
- name: Upload assets
53-
uses: actions/[email protected].0
53+
uses: actions/[email protected].1
5454
if: matrix.test-category == 'Default'
5555
with:
5656
name: ${{ matrix.os-name }}-assets

‎.github/workflows/container-integration-test.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ jobs:
5656
- name: Run MinVer
5757
uses: Particular/[email protected]
5858
- name: Log in to GitHub container registry
59-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
59+
uses: docker/login-action@v3
60+
with:
61+
registry: ghcr.io
62+
username: ${{ github.actor }}
63+
password: ${{ secrets.GITHUB_TOKEN }}
6064
- name: Log in to Docker Hub
6165
uses: docker/[email protected]
6266
with:

‎.github/workflows/push-container-images.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,32 @@ jobs:
2222
with:
2323
version: ${{ inputs.version }}
2424
- name: Log in to GitHub container registry
25-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
25+
uses: docker/[email protected]
26+
with:
27+
registry: ghcr.io
28+
username: ${{ github.actor }}
29+
password: ${{ secrets.GITHUB_TOKEN }}
2630
- name: Login to Docker Hub
2731
uses: docker/[email protected]
2832
with:
2933
username: ${{ secrets.DOCKERHUB_USERNAME }}
3034
password: ${{ secrets.DOCKERHUB_TOKEN }}
35+
- name: Set up Docker Buildx
36+
uses: docker/[email protected]
3137
- name: Publish to Docker Hub
3238
run: |
3339
$containers = @('servicecontrol', 'servicecontrol-audit', 'servicecontrol-monitoring', 'servicecontrol-ravendb')
3440
$tags = "${{ steps.validate.outputs.container-tags }}" -Split ','
3541
$sourceTag = "${{ inputs.version }}"
3642
37-
foreach ($tag in $tags)
43+
foreach($name in $containers)
3844
{
39-
foreach($name in $containers)
40-
{
41-
Write-Output "::group::Pushing $($name):$($tag)"
42-
$cmd = "docker buildx imagetools create --tag particular/$($name):$($tag) ghcr.io/particular/$($name):$($sourceTag)"
43-
Write-Output "Command: $cmd"
44-
Invoke-Expression $cmd
45-
Write-Output "::endgroup::"
46-
}
45+
Write-Output "::group::Pushing $name with $tags tags"
46+
$tagsCLI = $tags -replace "^", "--tag particular/${name}:"
47+
$cmd = "docker buildx imagetools create $tagsCLI ghcr.io/particular/${name}:$sourceTag"
48+
Write-Output "Command: $cmd"
49+
Invoke-Expression $cmd
50+
Write-Output "::endgroup::"
4751
}
4852
- name: Update Docker Hub Description - ServiceControl
4953
if: ${{ steps.validate.outputs.latest == 'true' }}

‎src/Directory.Packages.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66
<ItemGroup Label="Versions for direct package references">
77
<PackageVersion Include="Autofac" Version="8.2.0" />
8-
<PackageVersion Include="AWSSDK.CloudWatch" Version="3.7.402.41" />
9-
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.42" />
8+
<PackageVersion Include="AWSSDK.CloudWatch" Version="3.7.402.48" />
9+
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.49" />
1010
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
1111
<PackageVersion Include="Azure.Monitor.Query" Version="1.6.0" />
1212
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
@@ -28,8 +28,8 @@
2828
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
2929
<PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.1" />
3030
<PackageVersion Include="NLog.Extensions.Logging" Version="5.4.0" />
31-
<PackageVersion Include="NServiceBus" Version="9.2.4" />
32-
<PackageVersion Include="NServiceBus.AcceptanceTesting" Version="9.2.4" />
31+
<PackageVersion Include="NServiceBus" Version="9.2.6" />
32+
<PackageVersion Include="NServiceBus.AcceptanceTesting" Version="9.2.6" />
3333
<PackageVersion Include="NServiceBus.AmazonSQS" Version="7.1.1" />
3434
<PackageVersion Include="NServiceBus.CustomChecks" Version="5.0.1" />
3535
<PackageVersion Include="NServiceBus.Extensions.Hosting" Version="3.0.1" />
@@ -41,12 +41,12 @@
4141
<PackageVersion Include="NServiceBus.RabbitMQ" Version="9.2.0" />
4242
<PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.2" />
4343
<PackageVersion Include="NServiceBus.Testing" Version="9.0.1" />
44-
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.4" />
44+
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="5.0.0" />
4545
<PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.2" />
4646
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.2" />
4747
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.7" />
4848
<PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.7" />
49-
<PackageVersion Include="NuGet.Versioning" Version="6.13.1" />
49+
<PackageVersion Include="NuGet.Versioning" Version="6.13.2" />
5050
<PackageVersion Include="NUnit" Version="4.3.2" />
5151
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
5252
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
@@ -58,7 +58,7 @@
5858
<PackageVersion Include="Polly.Core" Version="8.5.2" />
5959
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
6060
<PackageVersion Include="PropertyChanging.Fody" Version="1.30.3" />
61-
<PackageVersion Include="PublicApiGenerator" Version="11.4.2" />
61+
<PackageVersion Include="PublicApiGenerator" Version="11.4.5" />
6262
<PackageVersion Include="RavenDB.Embedded" Version="6.2.3" />
6363
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
6464
<PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />

‎src/ServiceControl.AcceptanceTesting/HttpExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static async Task<ManyResult<T>> TryGetMany<T>(this IAcceptanceTestInfras
4747
return ManyResult<T>.Empty;
4848
}
4949

50-
return ManyResult<T>.New(true, response);
50+
return ManyResult<T>.New(true, response.Where(m => condition(m)).ToList());
5151
}
5252

5353
public static async Task<HttpStatusCode> Patch<T>(this IAcceptanceTestInfrastructureProvider provider, string url, T payload = null) where T : class

0 commit comments

Comments
 (0)