Skip to content

Commit 609a2f7

Browse files
neildsouthneildsouth
authored
Merge pull request #911 from Project-MONAI/IA-300
Ia 300
2 parents 449e557 + 96acd8e commit 609a2f7

File tree

44 files changed

+323
-151
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

+323
-151
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
image: rabbitmq:3.8.18-management
8383
env:
8484
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
85-
RABBITMQ_DEFAULT_USER: "admin"
86-
RABBITMQ_DEFAULT_PASS: "admin"
85+
RABBITMQ_DEFAULT_USER: "rabbitmq"
86+
RABBITMQ_DEFAULT_PASS: "rabbitmq"
8787
RABBITMQ_DEFAULT_VHOST: "monaideploy"
8888
ports:
8989
- "15672:15672"
@@ -159,8 +159,8 @@ jobs:
159159
image: rabbitmq:3.8.18-management
160160
env:
161161
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
162-
RABBITMQ_DEFAULT_USER: "admin"
163-
RABBITMQ_DEFAULT_PASS: "admin"
162+
RABBITMQ_DEFAULT_USER: "rabbitmq"
163+
RABBITMQ_DEFAULT_PASS: "rabbitmq"
164164
RABBITMQ_DEFAULT_VHOST: "monaideploy"
165165
ports:
166166
- "15672:15672"

‎deploy/docker-compose/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version: '3.9'
1616

1717
services:
1818
minio:
19-
image: "minio/minio:latest"
19+
image: "minio/minio:RELEASE.2023-10-16T04-13-43Z"
2020
command: server --console-address ":9001" /data
2121
hostname: minio
2222
volumes:
@@ -38,8 +38,8 @@ services:
3838
hostname: "rabbit1"
3939
environment:
4040
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
41-
RABBITMQ_DEFAULT_USER: "admin"
42-
RABBITMQ_DEFAULT_PASS: "admin"
41+
RABBITMQ_DEFAULT_USER: "rabbitmq"
42+
RABBITMQ_DEFAULT_PASS: "rabbitmq"
4343
RABBITMQ_DEFAULT_VHOST: "monaideploy"
4444
ports:
4545
- "15672:15672"

‎doc/dependency_decisions.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@
763763
- 1.0.1
764764
- 1.0.3
765765
- 1.0.4
766+
- 1.0.5-rc0006
766767
:when: 2023-24-10 11:43:10.781625468 Z
767768
- - :approve
768769
- Monai.Deploy.Messaging.RabbitMQ
@@ -772,6 +773,7 @@
772773
- 1.0.1
773774
- 1.0.3
774775
- 1.0.4
776+
- 1.0.5-rc0006
775777
:when: 2023-24-10 11:43:20.975488411 Z
776778
- - :approve
777779
- Monai.Deploy.Security

‎src/Common/Configuration/MessageBrokerConfigurationKeys.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,12 @@ public class MessageBrokerConfigurationKeys
9191

9292
[ConfigurationKeyName("artifactrecieved")]
9393
public string ArtifactRecieved { get; set; } = "md.workflow.artifactrecieved";
94+
95+
/// <summary>
96+
/// Gets or sets the topic for publishing export requests.
97+
/// Defaults to `md_export_request`.
98+
/// </summary>
99+
[ConfigurationKeyName("externalAppRequest")]
100+
public string ExternalAppRequest { get; set; } = "md.externalapp.request";
94101
}
95102
}

‎src/Common/Configuration/Monai.Deploy.WorkflowManager.Common.Configuration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
34+
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
3535
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
3636
</ItemGroup>
3737

‎src/Common/Configuration/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net6.0": {
55
"Monai.Deploy.Messaging": {
66
"type": "Direct",
7-
"requested": "[1.0.4, )",
8-
"resolved": "1.0.4",
9-
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
7+
"requested": "[1.0.5-rc0006, )",
8+
"resolved": "1.0.5-rc0006",
9+
"contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
1010
"dependencies": {
1111
"Ardalis.GuardClauses": "4.1.1",
1212
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/Common/Miscellaneous/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
},
147147
"Monai.Deploy.Messaging": {
148148
"type": "Transitive",
149-
"resolved": "1.0.4",
150-
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
149+
"resolved": "1.0.5-rc0006",
150+
"contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
151151
"dependencies": {
152152
"Ardalis.GuardClauses": "4.1.1",
153153
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -236,7 +236,7 @@
236236
"monai.deploy.workflowmanager.common.configuration": {
237237
"type": "Project",
238238
"dependencies": {
239-
"Monai.Deploy.Messaging": "[1.0.4, )",
239+
"Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
240240
"Monai.Deploy.Storage": "[0.2.18, )"
241241
}
242242
}

‎src/TaskManager/API/Monai.Deploy.WorkflowManager.TaskManager.API.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939

4040

4141
<ItemGroup>
42-
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.4" />
42+
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5-rc0006" />
4343
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
4444
<PackageReference Include="MongoDB.Bson" Version="2.21.0" />
4545
</ItemGroup>
46-
4746
</Project>

‎src/TaskManager/API/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net6.0": {
55
"Monai.Deploy.Messaging": {
66
"type": "Direct",
7-
"requested": "[1.0.4, )",
8-
"resolved": "1.0.4",
9-
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
7+
"requested": "[1.0.5-rc0006, )",
8+
"resolved": "1.0.5-rc0006",
9+
"contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
1010
"dependencies": {
1111
"Ardalis.GuardClauses": "4.1.1",
1212
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",

‎src/TaskManager/Database/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@
247247
},
248248
"Monai.Deploy.Messaging": {
249249
"type": "Transitive",
250-
"resolved": "1.0.4",
251-
"contentHash": "K6RrbDh7upokvt+sKuKEhQ+B1Xj46DF4sHxqwE6ymZazwmRULzsD0u/1IeDDJCGuRs3iG64QWwCt32j30PSZLg==",
250+
"resolved": "1.0.5-rc0006",
251+
"contentHash": "Yr6Ix8AeKdciz7t9aeteYuDAiNpmv3FmpF9bvdvjVh46gBazf+HBdvXdbWWXgzNTd3yevsQGBKazQXN9ecqwog==",
252252
"dependencies": {
253253
"Ardalis.GuardClauses": "4.1.1",
254254
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
@@ -684,7 +684,7 @@
684684
"monai.deploy.workflowmanager.taskmanager.api": {
685685
"type": "Project",
686686
"dependencies": {
687-
"Monai.Deploy.Messaging": "[1.0.4, )",
687+
"Monai.Deploy.Messaging": "[1.0.5-rc0006, )",
688688
"Mongo.Migration": "[3.1.4, )",
689689
"MongoDB.Bson": "[2.21.0, )"
690690
}

0 commit comments

Comments
 (0)