Skip to content

Commit f568635

Browse files
committed
Update ci for windows
Signed-off-by: Gabriele Santomaggio <[email protected]>
1 parent 9773af3 commit f568635

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
lines changed

.ci/windows/advanced.config

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[
2+
{rabbitmq_auth_backend_oauth2, [{key_config,
3+
[{signing_keys,
4+
#{<<"token-key">> =>
5+
{map,
6+
#{<<"alg">> => <<"HS256">>,
7+
<<"k">> => <<"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGH">>,
8+
<<"kid">> => <<"token-key">>,
9+
<<"kty">> => <<"oct">>,
10+
<<"use">> => <<"sig">>,
11+
<<"value">> => <<"token-key">>}}}}]},
12+
{resource_server_id,<<"rabbitmq">>}]}
13+
].

.ci/windows/enabled_plugins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_stream,rabbitmq_stream_management,rabbitmq_top].
1+
[rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_stream,rabbitmq_stream_management,rabbitmq_top,rabbitmq_auth_backend_oauth2].

.ci/windows/gha-setup.ps1

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ New-Variable -Name ca_certificate_file -Option Constant -Value `
2020
New-Variable -Name enabled_plugins_file -Option Constant -Value `
2121
(Resolve-Path -LiteralPath (Join-Path -Path $ci_windows_dir -ChildPath 'enabled_plugins'))
2222

23+
New-Variable -Name advanced_config_file -Option Constant -Value `
24+
(Resolve-Path -LiteralPath (Join-Path -Path $ci_windows_dir -ChildPath 'advanced.config'))
25+
26+
27+
2328
Write-Host "[INFO] importing CA cert from '$ca_certificate_file'"
2429
Import-Certificate -Verbose -CertStoreLocation Cert:\LocalMachine\Root -FilePath $ca_certificate_file
2530

@@ -145,6 +150,7 @@ $rabbitmq_appdata_dir = Join-Path -Path $env:AppData -ChildPath 'RabbitMQ'
145150
New-Item -Path $rabbitmq_appdata_dir -ItemType Directory
146151
$rabbitmq_conf_file = Join-Path -Path $rabbitmq_appdata_dir -ChildPath 'rabbitmq.conf'
147152
$rabbitmq_enabled_plugins_file = Join-Path -Path $rabbitmq_appdata_dir -ChildPath 'enabled_plugins'
153+
$rabbitmq_advanced_config_file = Join-Path -Path $rabbitmq_appdata_dir -ChildPath 'advanced.config'
148154

149155
Write-Host "[INFO] Creating RabbitMQ configuration file in '$rabbitmq_appdata_dir'"
150156
Get-Content $rabbitmq_conf_in_file | %{ $_ -replace '@@CERTS_DIR@@', $certs_dir } | %{ $_ -replace '\\', '/' } | Set-Content -LiteralPath $rabbitmq_conf_file
@@ -153,6 +159,10 @@ Get-Content $rabbitmq_conf_file
153159
Write-Host "[INFO] Copying '$enabled_plugins_file' to '$rabbitmq_enabled_plugins_file'"
154160
Copy-Item -Verbose -Force -LiteralPath $enabled_plugins_file -Destination $rabbitmq_enabled_plugins_file
155161

162+
Write-Host "[INFO] Copying '$advanced_config_file' to '$rabbitmq_advanced_config_file'"
163+
Copy-Item -Verbose -Force -LiteralPath $advanced_config_file -Destination $rabbitmq_advanced_config_file
164+
165+
156166
Write-Host '[INFO] Creating Erlang cookie files...'
157167

158168
function Set-ErlangCookie

.ci/windows/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"erlang": "27.2",
3-
"rabbitmq": "4.0.5"
3+
"rabbitmq": "v4.1.0-beta.4"
44
}

Tests/OAuth2Tests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class OAuth2Tests
2525
private const string Base64Key = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGH";
2626

2727
private const string Audience = "rabbitmq";
28-
29-
[Fact]
28+
//
29+
[SkippableFact]
3030
public async Task ConnectToRabbitMqWithOAuth2TokenShouldSuccess()
3131
{
3232
IConnection connection = await AmqpConnection.CreateAsync(
@@ -40,7 +40,7 @@ public async Task ConnectToRabbitMqWithOAuth2TokenShouldSuccess()
4040
await connection.CloseAsync();
4141
}
4242

43-
[Fact]
43+
[SkippableFact]
4444
public async Task ConnectToRabbitMqWithOAuth2TokenShouldDisconnectAfterTimeout()
4545
{
4646
IConnection connection = await AmqpConnection.CreateAsync(
@@ -50,7 +50,7 @@ public async Task ConnectToRabbitMqWithOAuth2TokenShouldDisconnectAfterTimeout()
5050
.RecoveryConfiguration(new RecoveryConfiguration().Activated(false).Topology(false))
5151
.OAuth2Options(new OAuth2Options(GenerateToken(DateTime.UtcNow.AddMilliseconds(1_000))))
5252
.Build());
53-
53+
5454
Assert.NotNull(connection);
5555
Assert.Equal(State.Open, connection.State);
5656
State? stateFrom = null;

0 commit comments

Comments
 (0)