Merge pull request #133 from sap-contributions/fix-null-relationship-data

Fix relationships with no data/guid

Author: antechrestos

main/cloudfoundry_client/v3/entities.py

@@ -149,8 +149,7 @@ def _delete(self, url: str) -> Optional[str]:
             return None
 
     def _list(self, requested_path: str, entity_type: Optional[ENTITY_TYPE] = None, **kwargs) -> PaginateEntities:
-        url_requested = EntityManager._get_url_with_encoded_params("%s%s" % (self.target_endpoint, requested_path),
-                                                                   **kwargs)
+        url_requested = EntityManager._get_url_with_encoded_params("%s%s" % (self.target_endpoint, requested_path), **kwargs)
         for element in self._paginate(url_requested, entity_type):
             yield element
 
@@ -244,11 +243,10 @@ def _mixin_included_resources(self, result: JsonObject) -> JsonObject:
 
     def _include_resources(self, resource: JsonObject, result: JsonObject) -> None:
         for relationship_name, relationship in resource.get("relationships", {}).items():
-            relationship_guid = relationship.get("data", {}).get("guid", None)
+            relationship_guid = (relationship.get("data") or {}).get("guid")
             included_resources = result["included"].get(plural(relationship_name), None)
             if relationship_guid is not None and included_resources is not None:
-                included_resource = next((r for r in included_resources if relationship_guid == r.get("guid", None)),
-                                         None)
+                included_resource = next((r for r in included_resources if relationship_guid == r.get("guid", None)), None)
                 if included_resource is not None:
                     self._include_resources(included_resource, result)
                     included = resource.setdefault("_included", {})

test/fixtures/v3/apps/GET_response_include_space.json

@@ -151,6 +151,9 @@
             "data": {
               "guid": "e00705b9-7b42-4561-ae97-2520399d2133"
             }
+          },
+          "quota": {
+            "data": null
           }
         },
         "links": {
@@ -167,4 +170,4 @@
       }
     ]
   }
-}
+}