Skip to content

fix: Require broker.enabled for Expert central broker default #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andypalmi merged 2 commits into from
Aug 4, 2026
Merged

fix: Require broker.enabled for Expert central broker default #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b65932
Require broker.enabled for Expert central broker default
Aug 4, 2026
f532005
Update central broker tests for broker.enabled requirement
Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helm/flowfuse/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,11 @@ data:
url: {{ ((.Values.forge.expert).service).url }}
requestTimeout: {{ .Values.forge.expert.requestTimeout | default 60000 }}
{{- $expertBrokerAddress := (((.Values.forge.expert).broker).address) }}
{{- if ((.Values.forge.broker.teamBroker).enabled) }}
{{- if (and .Values.forge.broker.enabled ((.Values.forge.broker.teamBroker).enabled)) }}
centralBroker:
server: {{ printf "%s:%v" ($expertBrokerAddress | default "expert-broker.flowfuse.com") (((.Values.forge.expert).broker).port | default 8883) }}
{{- else if $expertBrokerAddress }}
{{- fail "forge.expert.broker requires the Team Broker to be enabled (forge.broker.teamBroker.enabled=true)" -}}
{{- fail "forge.expert.broker requires the Team Broker to be enabled (forge.broker.enabled=true and forge.broker.teamBroker.enabled=true)" -}}
{{- end }}
{{- end }}
{{- end }}
Expand Down
40 changes: 38 additions & 2 deletions helm/flowfuse/tests/expert_central_broker_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ tests:
- it: should render central broker server when expert is enabled with broker address and port
template: configmap.yaml
set:
forge.broker.enabled: true
forge.broker.teamBroker.enabled: true
forge.expert:
enabled: true
Expand All @@ -61,6 +62,7 @@ tests:
- it: should render central broker server with custom port
template: configmap.yaml
set:
forge.broker.enabled: true
forge.broker.teamBroker.enabled: true
forge.expert:
enabled: true
Expand All @@ -78,6 +80,7 @@ tests:
- it: should default the central broker port to 8883 when not provided
template: configmap.yaml
set:
forge.broker.enabled: true
forge.broker.teamBroker.enabled: true
forge.expert:
enabled: true
Expand All @@ -104,7 +107,7 @@ tests:
port: 1883
asserts:
- failedTemplate:
errorMessage: "forge.expert.broker requires the Team Broker to be enabled (forge.broker.teamBroker.enabled=true)"
errorMessage: "forge.expert.broker requires the Team Broker to be enabled (forge.broker.enabled=true and forge.broker.teamBroker.enabled=true)"

- it: should fail when expert broker address is set and team broker is explicitly disabled
template: configmap.yaml
Expand All @@ -120,4 +123,37 @@ tests:
port: 1883
asserts:
- failedTemplate:
errorMessage: "forge.expert.broker requires the Team Broker to be enabled (forge.broker.teamBroker.enabled=true)"
errorMessage: "forge.expert.broker requires the Team Broker to be enabled (forge.broker.enabled=true and forge.broker.teamBroker.enabled=true)"

- it: should default the central broker server when team broker is enabled and no address is set
template: configmap.yaml
set:
forge.broker.enabled: true
forge.broker.teamBroker.enabled: true
forge.expert:
enabled: true
service:
url: "https://expert.example.com"
token: "expert-token"
asserts:
- matchRegex:
path: data["flowforge.yml"]
pattern: "server: expert-broker\\.flowfuse\\.com:8883"

- it: should not render central broker when team broker is enabled but broker is disabled
template: configmap.yaml
set:
forge.broker.enabled: false
forge.broker.teamBroker.enabled: true
forge.expert:
enabled: true
service:
url: "https://expert.example.com"
token: "expert-token"
asserts:
- matchRegex:
path: data["flowforge.yml"]
pattern: "expert:"
- notMatchRegex:
path: data["flowforge.yml"]
pattern: "centralBroker:"
Loading