OpenAPI pre-processing (#32)

Author: fopina

Makefile

@@ -25,7 +25,7 @@ testpub:
 	twine upload --repository testpypi dist/*
 
 schema:
-	./support/fetch_openapi.py
+	./support/openapi/fetch_openapi.py
 
 templates:
 	./support/api_generation/dump_templates.sh

support/api_generation/generate.sh

@@ -2,16 +2,16 @@
 
 set -eo pipefail
 
-OPENAPI_PATH=${OPENAPI_PATH:-"support/openapi.json"}
-
 # make sure we're on root dir
 cd $(dirname $0)
 cd ..
 cd ..
 
+./support/openapi/tweak_openapi.py
+
 ./support/api_generation/openapi-generator-cli.sh \
                            generate \
-                           -i "${OPENAPI_PATH}" \
+                           -i support/openapi/build/openapi.json \
                            -c support/api_generation/config.yaml \
                            -o .
 

support/fetch_openapi.py support/openapi/fetch_openapi.pysupport/fetch_openapi.py renamed to support/openapi/fetch_openapi.py

@@ -9,6 +9,7 @@
 
 DEMO_HOST = 'https://demo.defectdojo.org'
 FILE = Path(__file__).parent / 'openapi.json'
+SCRIPTS = Path(__file__).parent.parent / 'integration'
 
 
 def main():
@@ -18,7 +19,7 @@ def main():
     if args.demo:
         host = DEMO_HOST
     else:
-        subprocess.check_call([Path(__file__).parent / 'integration' / 'run_dojo.sh'])
+        subprocess.check_call([SCRIPTS / 'run_dojo.sh'])
         host = 'http://localhost:8080'
 
     try:
@@ -28,7 +29,7 @@ def main():
             json.dump(r.json(), f, indent=4)
     finally:
         if not args.demo:
-            subprocess.check_call([Path(__file__).parent / 'integration' / 'stop_dojo.sh'])
+            subprocess.check_call([SCRIPTS / 'stop_dojo.sh'])
 
 
 if __name__ == '__main__':

support/openapi.json support/openapi/openapi.jsonsupport/openapi.json renamed to support/openapi/openapi.json

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import json
+from pathlib import Path
+
+FILE = Path(__file__).parent / 'openapi.json'
+BUILD = Path(__file__).parent / 'build' / 'openapi.json'
+
+
+def main():
+    BUILD.parent.mkdir(exist_ok=True)
+    with FILE.open('r') as inp:
+        data = json.load(inp)
+
+    # nothing done for now...
+
+    with BUILD.open('w') as out:
+        json.dump(data, out, indent=4)
+
+
+if __name__ == '__main__':
+    main()