Skip to content

Commit 0b22b2f

Browse files
committed
fix: add extra steps to github workflow
1 parent 5a33b3f commit 0b22b2f

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
RABBITMQ_DEFAULT_PASS: "test-password"
2828
ports:
2929
- 5552:5552
30+
- 5551:5551
3031
- 5672:5672
3132
- 15672:15672
3233
- 1883:1883
@@ -42,7 +43,7 @@ jobs:
4243
node-version: ${{ matrix.node-version }}
4344
cache: "npm"
4445
- name: Enable RabbitMQ Plugins
45-
run: docker exec $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q) rabbitmq-plugins enable rabbitmq_stream rabbitmq_stream_management
46+
run: docker exec $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q) rabbitmq-plugins enable rabbitmq_stream rabbitmq_stream_management rabbitmq_auth_mechanism_ssl
4647
- name: Restart RabbitMQ
4748
run: docker restart $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q)
4849
- name: Wait for rabbit instance restart
@@ -52,6 +53,12 @@ jobs:
5253
- run: npm ci
5354
- run: npm run check
5455
- run: npm run build --if-present
56+
- run: git clone https://github.com/rabbitmq/tls-gen tls-gen && cd tls-gen/basic && make
57+
env:
58+
CN: test-node
59+
- run: docker exec $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q) rabbitmqctl add_user 'O=client,CN=test-node' ''
60+
- run: docker exec $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q) rabbitmqctl clear_password 'O=client,CN=test-node'
61+
- run: docker exec $(docker ps --filter ancestor=rabbitmq:3.13-rc-management -q) rabbitmqctl set_permissions 'O=client,CN=test-node' '.*' '.*' '.*'
5562
- run: npm test
5663
env:
5764
RABBITMQ_USER: "test-user"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ Test:
401401

402402
```shell
403403
make rabbitmq-test
404-
npm run test
404+
RABBIT_MQ_TEST_NODES=rabbitmq:5552 npm run test
405405
```
406406

407407
Check everything:

test/e2e/connect.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ async function createTlsClient(): Promise<Client> {
1515
mechanism: "EXTERNAL",
1616
ssl: {
1717
ca: await readFile("./tls-gen/basic/result/ca_certificate.pem", "utf8"),
18-
cert: await readFile("./tls-gen/basic/result/client_rabbitmq_certificate.pem", "utf8"),
19-
key: await readFile("./tls-gen/basic/result/client_rabbitmq_key.pem", "utf8"),
18+
cert: await readFile(`./tls-gen/basic/result/client_${firstNode.host}_certificate.pem`, "utf8"),
19+
key: await readFile(`./tls-gen/basic/result/client_${firstNode.host}_key.pem`, "utf8"),
2020
},
2121
username: "",
2222
password: "",

0 commit comments

Comments
 (0)