add json transform stuff

heyingyue · heyingyue · commit 34df7c9b2899 · 2024-01-25T11:13:36.000+08:00
diff --git a/kubesys/client.py b/kubesys/client.py
@@ -90,6 +90,8 @@ def createResource(self, jsonStr, **kwargs) -> dict:
         jsonObj = jsonStr
         if type(jsonObj) is str:
             jsonObj = json.loads(jsonObj)
+        elif type(jsonObj) is dict:
+            jsonStr=dictToJsonString(jsonStr)
 
         kind = self.getRealKind(str(jsonObj["kind"]), str(jsonObj["apiVersion"]))
 
@@ -106,6 +108,8 @@ def updateResource(self, jsonStr:Union[str,dict], **kwargs) -> dict:
         jsonObj = jsonStr
         if type(jsonObj) is str:
             jsonObj = json.loads(jsonObj)
+        elif type(jsonObj) is dict:
+            jsonStr=dictToJsonString(jsonStr)
 
         kind = self.getRealKind(str(jsonObj["kind"]), str(jsonObj["apiVersion"]))
 
@@ -303,6 +307,8 @@ def updateResourceStatus(self, jsonStr, **kwargs) -> dict:
         jsonObj = jsonStr
         if type(jsonObj) is str:
             jsonObj = json.loads(jsonObj)
+        elif type(jsonObj) is dict:
+            jsonStr=dictToJsonString(jsonStr)
 
         kind = self.getRealKind(jsonObj["kind"], jsonObj["apiVersion"])
         namespace = ""
@@ -314,7 +320,7 @@ def updateResourceStatus(self, jsonStr, **kwargs) -> dict:
         url += self.analyzer.FullKindToNameDict[kind] + "/" + jsonObj["metadata"]["name"]
         url += "/status"
 
-        return createRequest(url=url, token=self.token, method="PUT", body=jsonObj, keep_json=False,config=self.config, **kwargs)
+        return createRequest(url=url, token=self.token, method="PUT", body=jsonStr, keep_json=False,config=self.config, **kwargs)
 
     def getResourceStatus(self,kind, name, namespace="", **kwargs)->dict:
         fullKind = self.analyzer.checkAndReturnRealKind(kind)
diff --git a/kubesys/http_request.py b/kubesys/http_request.py
@@ -32,6 +32,8 @@ def createRequest(url, token, method="GET", body=None, verify=False,
         formatURL(url, getParams(kwargs)), token, method, body, config)
     try:
         result = response.json()
+        if result.get('kind') == 'Status':
+            raise HTTPError(result.get('code'),result.get('reason')+' '+result.get('message'))
         if keep_json:
             result=dictToJsonString(result)
         return result
