support scripts simplified

Author: fopina

Makefile

@@ -23,7 +23,9 @@ testpub:
 schema:
 	curl "https://demo.defectdojo.org/api/v2/oa3/schema/?format=json" -o support/openapi.json
 
-generate:
+templates:
 	./support/api_generation/dump_templates.sh
+
+generate:
 	./support/api_generation/generate.sh
 	$(MAKE) lint

support/api_generation/config.yaml

@@ -1,8 +1,10 @@
 generatorName: python
-templateDir: local/support/api_generation/templates.spec
+templateDir: support/api_generation/custom_templates
 additionalProperties:
   generateSourceCodeOnly: true
   packageName: defectdojo_api_generated
+  packageUrl: https://github.com/fopina/defectdojo-api-generated
+  projectName: defectdojo-api-generated
 globalProperties:
   modelDocs: false
   apiDocs: false

support/api_generation/dump_templates.sh

@@ -13,4 +13,4 @@ rm -fr $TEMPDIR
 
 ./support/api_generation/openapi-generator-cli.sh author template \
                            -g python \
-                           --output /local/$TEMPDIR
+                           --output $TEMPDIR

support/api_generation/generate.sh

@@ -2,20 +2,18 @@
 
 set -eo pipefail
 
-OPENAPI_PATH=${OPENAPI_PATH:-"/local/support/openapi.json"}
+OPENAPI_PATH=${OPENAPI_PATH:-"support/openapi.json"}
 
 # make sure we're on root dir
 cd $(dirname $0)
 cd ..
 cd ..
 
-# add custom templates to full templates
-cp -r ./support/api_generation/custom_templates/ ./support/api_generation/templates.spec/
 ./support/api_generation/openapi-generator-cli.sh \
                            generate \
                            -i "${OPENAPI_PATH}" \
-                           -c /local/support/api_generation/config.yaml \
-                           -o /local/
+                           -c support/api_generation/config.yaml \
+                           -o .
 
 rm -fr tests/generated
 mv defectdojo_api_generated/test tests/generated

support/api_generation/openapi-generator-cli.sh

@@ -4,4 +4,4 @@ IMAGE=${OPENAPITOOLS_IMAGE:-openapitools/openapi-generator-cli:v7.13.0}
 
 VOL=$(cd $(dirname $0); cd ..; cd ..; pwd)
 
-docker run --rm -e https_proxy -e http_proxy -e no_proxy -v $VOL:/local $IMAGE "$@"
+docker run --rm -e https_proxy -e http_proxy -e no_proxy -v $VOL:$VOL -w $PWD $IMAGE "$@"