Merge pull request #210 from camunda-community-hub/development

v2.4.0
camunda-community-hub · Sep 6, 2021 · d567ef2 · d567ef2
2 parents 8fc8c07 + c5c21c3
commit d567ef2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/docs/client_quickstart.rst b/docs/client_quickstart.rst
@@ -60,7 +60,7 @@ To create a client for a Camunda Cloud instance:
 
     credentials = CamundaCloudCredentials(client_id="client_id", client_secret="client_secret",
                                           cluster_id="cluster_id")
-    client = ZeebeClient()
+    client = ZeebeClient(credentials=credentials)
 
 
 Run a workflow

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 author = 'Jonatan Martens'
 
 # The full version, including alpha/beta/rc tags
-release = '2.3.2'
+release = '2.4.0'
 
 # -- General configuration ---------------------------------------------------
 
@@ -59,6 +59,6 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-version = "2.3.2"
+version = "2.4.0"
 
 master_doc = 'index'
diff --git a/docs/worker_quickstart.rst b/docs/worker_quickstart.rst
@@ -74,7 +74,7 @@ To create a worker for a Camunda Cloud instance:
 
     credentials = CamundaCloudCredentials(client_id="client_id", client_secret="client_secret",
                                           cluster_id="cluster_id")
-    worker = ZeebeWorker()
+    worker = ZeebeWorker(credentials=credentials)
 
 
 Add a task

diff --git a/pyzeebe/__init__.py b/pyzeebe/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.3.2"
+__version__ = "2.4.0"
 
 from pyzeebe import exceptions
 from pyzeebe.client.client import ZeebeClient

diff --git a/pyzeebe/credentials/camunda_cloud_credentials.py b/pyzeebe/credentials/camunda_cloud_credentials.py
@@ -3,10 +3,10 @@
 
 
 class CamundaCloudCredentials(OAuthCredentials):
-    def __init__(self, client_id: str, client_secret: str, cluster_id: str):
+    def __init__(self, client_id: str, client_secret: str, cluster_id: str, region: str="bru-2"):
         try:
             super().__init__(url="https://login.cloud.camunda.io/oauth/token", client_id=client_id,
-                             client_secret=client_secret, audience=f"{cluster_id}.zeebe.camunda.io")
+                             client_secret=client_secret, audience=f"{cluster_id}.{region}.zeebe.camunda.io")
         except InvalidOAuthCredentials:
             raise InvalidCamundaCloudCredentials(client_id=client_id, cluster_id=cluster_id)
 

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pyzeebe",
-    version="2.3.2",
+    version="2.4.0",
     author="Jonatan Martens",
     author_email="[email protected]",
     description="Zeebe client api",

diff --git a/tests/unit/credentials/camunda_cloud_credentials_test.py b/tests/unit/credentials/camunda_cloud_credentials_test.py
@@ -15,7 +15,7 @@ def test_init():
     with patch("pyzeebe.credentials.oauth_credentials.OAuthCredentials.__init__") as init:
         CamundaCloudCredentials(client_id, client_secret, cluster_id)
         init.assert_called_with(url=f"https://login.cloud.camunda.io/oauth/token", client_id=client_id,
-                                client_secret=client_secret, audience=f"{cluster_id}.zeebe.camunda.io")
+                                client_secret=client_secret, audience=f"{cluster_id}.bru-2.zeebe.camunda.io")
 
 
 def test_invalid_credentials():

diff --git a/tests/unit/grpc_internals/zeebe_adapter_base_test.py b/tests/unit/grpc_internals/zeebe_adapter_base_test.py
@@ -116,7 +116,7 @@ def test_credentials_connection_uri_gotten(zeebe_adapter):
     CamundaCloudCredentials.get_access_token = MagicMock(return_value=str(uuid4()))
     credentials = CamundaCloudCredentials(client_id, client_secret, cluster_id)
     zeebe_adapter = ZeebeAdapterBase(credentials=credentials)
-    assert zeebe_adapter.connection_uri == f"{cluster_id}.zeebe.camunda.io:443"
+    assert zeebe_adapter.connection_uri == f"{cluster_id}.bru-2.zeebe.camunda.io:443"
 
 
 def test_credentials_no_connection_uri(zeebe_adapter):