chore: switch Swagger client generation to Podman (#158)

Signed-off-by: Panos Vagenas <[email protected]>

CONTRIBUTING.md

@@ -142,26 +142,8 @@ poetry add NAME
 
 ## Updating the Generated Swagger Client
 
-**Note:** This requires Docker.
-
-To update the Swagger Client with the new API specifications, run:
-
-```bash
-tools/swagger-client-generator <URL to the DS>
-```
-
-Example:
-
-```bash
-tools/swagger-client-generator.sh https://DEEPSEARCH_HOST
-```
-
-If you don't want to download the Swagger Specification, and just want to use the local files in `tools/swagger-client-generator`, run:
-
-```bash
-tools/swagger-client-generator.sh .
-```
-
+To update the Swagger Client with the new API specifications, check out the
+[generator tool README](https://github.com/DS4SD/deepsearch-toolkit/blob/main/tools/swagger-client-generator/README.md).
 
 ## Coding style guidelines
 

tools/swagger-client-generator/README.md

@@ -1,6 +1,11 @@
 # Swagger client generation
 
 ## Usage
+
+**Note:** This requires Podman.
+
+To update the Swagger Client with the new API specifications, run:
+
 ```bash
 # go to repo root dir
 cd $(git rev-parse --show-toplevel)
@@ -9,3 +14,9 @@ cd $(git rev-parse --show-toplevel)
 # TODO: set base path as needed, as in "https://your-host/api/cps"
 ./tools/swagger-client-generator/generate-client.sh <BASE_PATH>
 ```
+
+If you don't want to download the Swagger Specification, and just want to use the local files in `tools/swagger-client-generator`, run:
+
+```bash
+./tools/swagger-client-generator/generate-client.sh .
+```

tools/swagger-client-generator/generate-client.sh

@@ -33,9 +33,9 @@ mkdir -p .generated/
 
 echo "Generating client for CPS"
 
-docker run --rm \
+podman run --rm \
     -v "$(pwd):/local" \
-    --user="$(id -u):$(id -g)" \
+    --userns=keep-id:uid="$(id -u)",gid="$(id -g)" \
     ${generator_image} generate \
         -i "/local/tools/swagger-client-generator/swagger-cps.json" \
         -g python \
@@ -44,9 +44,9 @@ docker run --rm \
 
 echo "Generating client for the User API"
 
-docker run --rm \
+podman run --rm \
     -v "$(pwd):/local" \
-    --user="$(id -u):$(id -g)" \
+    --userns=keep-id:uid="$(id -u)",gid="$(id -g)" \
     ${generator_image} generate \
         -i "/local/tools/swagger-client-generator/swagger-user.json" \
         -g python \
@@ -56,9 +56,9 @@ docker run --rm \
 # echo "Generating client for the CPS KG API"
 # echo "Currently disabled: TODO FIX API Specs"
 
-# # docker run --rm \
+# # podman run --rm \
 # #     -v "$(pwd):/local" \
-# #     --user="$(id -u):$(id -g)" \
+# #     --userns=keep-id:uid="$(id -u)",gid="$(id -g)" \
 # #     ${generator_image} generate \
 # #         -i "/local/tools/swagger-client-generator/swagger-cps-kg.json" \
 # #         -g python \
@@ -71,9 +71,9 @@ docker run --rm \
 # echo "Generating client for the KG Query API"
 # echo "Disabled since it generated wrong specs. It won't be updated."
 
-# # docker run --rm \
+# # podman run --rm \
 # #     -v "$(pwd):/local" \
-# #     --user="$(id -u):$(id -g)" \
+# #     --userns=keep-id:uid="$(id -u)",gid="$(id -g)" \
 # #     ${generator_image} generate \
 # #         -i "/local/tools/swagger-client-generator/swagger-kg-query.json" \
 # #         -g python \
@@ -85,9 +85,9 @@ docker run --rm \
 # echo "Generating client for the KG Create API"
 # echo "Disabled since it won't be updated."
 
-# # docker run --rm \
+# # podman run --rm \
 # #     -v "$(pwd):/local" \
-# #     --user="$(id -u):$(id -g)" \
+# #     --userns=keep-id:uid="$(id -u)",gid="$(id -g)" \
 # #     ${generator_image} generate \
 # #         -i "/local/tools/swagger-client-generator/swagger-kg-create.json" \
 # #         -g python \