Rework fixing api spec

.github/workflows/ci.yml

@@ -1,9 +1,3 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_file' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
 ---
 name: pulp-openapi-generator PR CI
 on: pull_request
@@ -66,7 +60,7 @@ jobs:
         run: |
           echo ::group::HTTPIE
           sudo apt-get update -yq
-          sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie
+          sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie jq
           echo ::endgroup::
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
 

.gitignore

@@ -63,8 +63,8 @@ target/
 #Ipython Notebook
 .ipynb_checkpoints
 
-# written in generate.sh
-.openapi-generator-ignore
-
-# generated client packages
+# generated stuff
+/api.json
+/patched-api.json
 /*-client/
+.openapi-generator-ignore

gen-client.sh

@@ -61,15 +61,23 @@ else
   VOLUME_DIR="${PWD}"
 fi
 
+REMOVE_COOKIE_AUTH_FILTER='del(.paths[][].security|select(.)[]|select(.cookieAuth))|del(.components.securitySchemes.cookieAuth)'
+
+# These two may be needed when upgrading the generator image
+FIX_TASK_CREATED_RESOURCES_FILTER='(.components.schemas.TaskResponse|select(.)|.properties.created_resources.items) |= {"$oneOf":[{type:"null"},.]}'
+FIX_TASK_ERROR_FILTER='(.components.schemas.TaskResponse|select(.)|.properties.error) |= (del(.readOnly) | .additionalProperties.type = "string")'
+
 if [ "$LANGUAGE" = "python" ]
 then
+  cat "${API_SPEC}" | jq "." > patched-api.json
+
   $CONTAINER_EXEC run \
     "${ULIMIT_COMMAND[@]}" \
     "${USER_COMMAND[@]}" \
     --rm \
     "${VOLUME_OPTION[@]}" \
     "$OPENAPI_PYTHON_IMAGE" generate \
-    -i "${VOLUME_DIR}/${API_SPEC}" \
+    -i "${VOLUME_DIR}/patched-api.json" \
     -g python \
     -o "${VOLUME_DIR}/${PACKAGE}-client" \
     "--additional-properties=packageName=pulpcore.client.${PACKAGE},projectName=${PACKAGE}-client,packageVersion=${VERSION},domainEnabled=${DOMAIN_ENABLED}" \
@@ -86,14 +94,15 @@ then
   mkdir -p "${PACKAGE}-client"
   echo git_push.sh > "${PACKAGE}-client/.openapi-generator-ignore"
 
-  python3 remove-cookie-auth.py
+  cat "${API_SPEC}" | jq "${REMOVE_COOKIE_AUTH_FILTER}" > patched-api.json
+
   $CONTAINER_EXEC run \
     "${ULIMIT_COMMAND[@]}" \
     "${USER_COMMAND[@]}" \
     --rm \
     "${VOLUME_OPTION[@]}" \
     "$OPENAPI_RUBY_IMAGE" generate \
-    -i "${VOLUME_DIR}/${API_SPEC}" \
+    -i "${VOLUME_DIR}/patched-api.json" \
     -g ruby \
     -o "${VOLUME_DIR}/${PACKAGE}-client" \
     "--additional-properties=gemName=${PACKAGE}_client,gemLicense="GPLv2+",gemVersion=${VERSION},gemHomepage=https://github.com/pulp/${PACKAGE}" \
@@ -105,13 +114,15 @@ fi
 
 if [ "$LANGUAGE" = "typescript" ]
 then
+  cat "${API_SPEC}" | jq "." > patched-api.json
+
   $CONTAINER_EXEC run \
     "${ULIMIT_COMMAND[@]}" \
     "${USER_COMMAND[@]}" \
     --rm \
     "${VOLUME_OPTION[@]}" \
     "$OPENAPI_TYPESCRIPT_IMAGE" generate \
-    -i "${VOLUME_DIR}/${API_SPEC}" \
+    -i "${VOLUME_DIR}/patched-api.json" \
     -g typescript-axios \
     -o "${VOLUME_DIR}/${PACKAGE}-client" \
     -t "${VOLUME_DIR}/templates/typescript-axios" \