Merge remote-tracking branch 'origin' into YR/fix-playbook-validation…

…/CIAC-7105
demisto · Dec 17, 2023 · 8154c2c · 8154c2c
2 parents fa2407e + 33b3f56
commit 8154c2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -58,7 +58,8 @@ references:
           echo 'deb https://debian.neo4j.com stable 5' | sudo tee /etc/apt/sources.list.d/neo4j.list
           sudo apt-get update
           apt list -a neo4j
-          sudo apt-get install neo4j
+          # The neo4j version should be consistent with APOC version below!
+          sudo apt-get install neo4j=1:5.13.0
           sudo chown -R circleci /var/log/neo4j
           sudo chown -R circleci /var/lib/neo4j
           sudo chown -R circleci /etc/neo4j

diff --git a/demisto_sdk/commands/common/clients/__init__.py b/demisto_sdk/commands/common/clients/__init__.py
@@ -50,9 +50,9 @@ def get_client_from_config(client_config: XsoarClientConfig) -> XsoarClient:
 
 def get_client_from_marketplace(
     marketplace: MarketplaceVersions,
-    base_url: Optional[str] = os.getenv(DEMISTO_BASE_URL),
-    api_key: Optional[str] = os.getenv(DEMISTO_KEY),
-    auth_id: Optional[str] = os.getenv(AUTH_ID),
+    base_url: Optional[str] = os.getenv(DEMISTO_BASE_URL, ""),
+    api_key: Optional[str] = os.getenv(DEMISTO_KEY, ""),
+    auth_id: Optional[str] = os.getenv(AUTH_ID, ""),
     verify_ssl: bool = string_to_bool(os.getenv(DEMISTO_VERIFY_SSL, False)),
 ) -> XsoarClient:
     """
@@ -92,9 +92,9 @@ def get_client_from_marketplace(
 
 @lru_cache
 def get_client_from_server_type(
-    base_url: Optional[str] = os.getenv(DEMISTO_BASE_URL),
-    api_key: Optional[str] = os.getenv(DEMISTO_KEY),
-    auth_id: Optional[str] = os.getenv(AUTH_ID),
+    base_url: Optional[str] = os.getenv(DEMISTO_BASE_URL, ""),
+    api_key: Optional[str] = os.getenv(DEMISTO_KEY, ""),
+    auth_id: Optional[str] = os.getenv(AUTH_ID, ""),
     verify_ssl: bool = string_to_bool(os.getenv(DEMISTO_VERIFY_SSL, False)),
 ) -> XsoarClient:
     """