Added first pass at Content-Type processing from openapi data

CloudFlare/api_decode_from_openapi.py

@@ -34,7 +34,26 @@ def do_path(cmd, values):
             deprecated = False
             deprecated_date = ''
             deprecated_already = False
-        v = {'action': action.upper(), 'cmd': cmd, 'deprecated': deprecated, 'deprecated_date': deprecated_date, 'deprecated_already': deprecated_already}
+
+        # The requestBody/content could be one of the following:
+        # "requestBody": {
+        #   "content": {
+        #     "application/javascript" {
+        #     "application/json" {
+        #     "application/octet-stream" {
+        #     "application/x-ndjson" {
+        #     "multipart/form-data" {
+
+        content_type = None
+        if 'requestBody' in values[action] and values[action]['requestBody']:
+            request_body = values[action]['requestBody']
+            if 'content' in request_body and request_body['content']:
+                content_type = ','.join(list(request_body['content'].keys()))
+
+        if content_type:
+            v = {'action': action.upper(), 'cmd': cmd, 'deprecated': deprecated, 'deprecated_date': deprecated_date, 'deprecated_already': deprecated_already, 'content_type': content_type}
+        else:
+            v = {'action': action.upper(), 'cmd': cmd, 'deprecated': deprecated, 'deprecated_date': deprecated_date, 'deprecated_already': deprecated_already}
         cmds.append(v)
     return cmds
 

Makefile

@@ -96,8 +96,8 @@ lint:
 openapi:
 	@tmp=/tmp/_$$$$_ ; \
 	$(PYTHON) -m cli4 --dump | sort > $$tmp.1 ; \
-	$(PYTHON) -m cli4 --openapi $(OPENAPI_URL) | sed -e 's/^[A-Z][A-Z]*  *//' -e 's/?.*//' -e 's/\/:[a-z][A-Za-z_]*/\/:id/g' -e 's/\/:[a-z][A-Za-z_]*}/\/:id/g' -e 's/:id\/:id/:id/' -e 's/\/:id$$//' -e 's/\/:id$$//' -e 's/\/:id ;/ ;/' -e 's/\/$$//' | sort -u > $$tmp.2 ; \
-	egrep -v '; deprecated' < $$tmp.2 | diff $$tmp.1 - > $$tmp.3 ; \
+	$(PYTHON) -m cli4 --openapi $(OPENAPI_URL) | sed -e 's/^[A-Z][A-Z]*  *//' -e 's/?.*//' -e 's/\/:[a-z][A-Za-z_]*/\/:id/g' -e 's/\/:[a-z][A-Za-z_]*}/\/:id/g' -e 's/:id\/:id/:id/' -e 's/\/:id$$//' -e 's/\/:id$$//' -e 's/\/:id ;/ ;/' -e 's/ ; Content-Type: .*//' -e 's/\/$$//' | sort -u > $$tmp.2 ; \
+	egrep -v '; deprecated' < $$tmp.2 | sed -e 's/ ; .*//' | diff $$tmp.1 - > $$tmp.3 ; \
 	echo "In code:" ; \
 	egrep '< ' < $$tmp.3 | sed -e 's/< /    /' | sort | tee $$tmp.4 ; \
 	echo "In docs:" ; \

cli4/dump.py

@@ -17,7 +17,10 @@ def dump_commands_from_web(cf, url):
             else:
                 a.append('%-6s %s ; deprecated %s' % (r['action'], r['cmd'], r['deprecated_date']))
         else:
-            a.append('%-6s %s' % (r['action'], r['cmd']))
+            if 'content_type' in r and r['content_type']:
+                a.append('%-6s %s ; Content-Type: %s' % (r['action'], r['cmd'], r['content_type']))
+            else:
+                a.append('%-6s %s' % (r['action'], r['cmd']))
     return '\n'.join(a) + '\n'