fix(config): apply new configuration in saas yaml file (#3854) (#3855)

* fix(config): apply new configuration in saas yaml file
camunda · Jan 16, 2025 · bd6fa3a · bd6fa3a
1 parent 0baf14f
commit bd6fa3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/bundle/camunda-saas-bundle/src/main/resources/application.properties b/bundle/camunda-saas-bundle/src/main/resources/application.properties
@@ -12,19 +12,13 @@ camunda.connector.secret-provider.discovery.enabled=false
 camunda.connector.secret-provider.environment.enabled=false
 camunda.connector.secret-provider.console.enabled=false
 
-zeebe.client.worker.threads=10
-zeebe.client.worker.max-jobs-active=32
+camunda.client.zeebe.execution-threads=10
+camunda.client.zeebe.defaults.max-jobs-active=32
 camunda.client.zeebe.defaults.stream-enabled=true
-
-# Enforce local connection, even if cluster-id set
-zeebe.client.connection-mode=ADDRESS
-camunda.client.zeebe.grpc-address=http://${zeebe.client.broker.gateway-address}
-camunda.client.zeebe.base-url=http://${zeebe.client.broker.gateway-address}
 camunda.client.mode=saas
-camunda.client.region=${zeebe.client.cloud.region}
-camunda.client.cluster-id=${zeebe.client.cloud.cluster-id}
-operate.client.region=${zeebe.client.cloud.region}
-operate.client.cluster-id=${zeebe.client.cloud.cluster-id}
+# to be provided in the deployment:
+# camunda.client.zeebe.grpc-address
+# camunda.client.zeebe.rest-address
 
 connectors.log.appender=stackdriver
 

diff --git a/...aas-bundle/src/test/java/io/camunda/connector/runtime/saas/SecurityConfigurationTest.java b/...aas-bundle/src/test/java/io/camunda/connector/runtime/saas/SecurityConfigurationTest.java
@@ -51,10 +51,6 @@
     properties = {
       "camunda.saas.secrets.projectId=42",
       "camunda.client.zeebe.enabled=true",
-      "zeebe.client.cloud.cluster-id=42",
-      "zeebe.client.security.plaintext=true",
-      "zeebe.client.broker.gateway-address=zeebe-service:26500",
-      "zeebe.client.cloud.region=bru-1",
       "camunda.connector.auth.audience=connectors.dev.ultrawombat.com",
       "camunda.connector.auth.issuer=https://weblogin.cloud.dev.ultrawombat.com/",
       "camunda.connector.secretprovider.discovery.enabled=false",

diff --git a/...saas-bundle/src/test/java/io/camunda/connector/runtime/saas/TestSpringContextStartup.java b/...saas-bundle/src/test/java/io/camunda/connector/runtime/saas/TestSpringContextStartup.java
@@ -24,10 +24,6 @@
     classes = {SaaSConnectorRuntimeApplication.class},
     properties = {
       "camunda.saas.secrets.projectId=42",
-      "zeebe.client.cloud.clusterId=42",
-      "zeebe.client.cloud.region=bru-1",
-      "zeebe.client.broker.gateway-address=zeebe-service:26500",
-      "zeebe.client.security.plaintext=true",
       "camunda.connector.auth.audience=connectors.dev.ultrawombat.com",
       "camunda.connector.auth.issuer=https://weblogin.cloud.dev.ultrawombat.com/",
       "camunda.connector.secretprovider.discovery.enabled=false"