Merge remote-tracking branch 'origin/master' into feat/nb35

# Conflicts: # CHANGES.md # pack.yaml
StackStorm-Exchange · Jan 22, 2024 · d1d694c · d1d694c
2 parents 8b6524f + f9ee248
commit d1d694c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,7 +2,11 @@
 
 ## 3.1.0
 
-- Updated spec as per v3.5.0
+- Updated spec as per v3.5.9
+
+## 3.0.6
+
+- Add exceptions on action.py
 
 ## 3.0.5
 

diff --git a/actions/lib/action.py b/actions/lib/action.py
@@ -73,5 +73,9 @@ def make_request(self, endpoint_uri, http_action, **kwargs):
             )
 
         if r:
-            return {"raw": r.json(), "status": r.status_code}
+            try:
+                raw = r.json()
+            except ValueError:
+                raw = r.text
+            return {"raw": raw, "status": r.status_code}
         return {"raw": {}, "status": 404}