From 0f3d58fe961713930abd1711c2dcbca668bde2b3 Mon Sep 17 00:00:00 2001
From: Marcus Aspin <maspin@unilink.com>
Date: Fri, 15 Dec 2023 15:35:10 +0000
Subject: [PATCH] PI-1648 Disable vizjs in SchemaSpy report (#2925)

---
 .github/workflows/schema-spy.yml |  4 ++--
 tools/schema-spy/run.sh          | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/schema-spy.yml b/.github/workflows/schema-spy.yml
index 71900692af..28cb0bfe51 100644
--- a/.github/workflows/schema-spy.yml
+++ b/.github/workflows/schema-spy.yml
@@ -30,8 +30,8 @@ jobs:
           HOST: ${{ secrets.SCHEMA_SPY_HOST }}
           PORT: ${{ secrets.SCHEMA_SPY_PORT }}
           SCHEMA: ${{ secrets.SCHEMA_SPY_SCHEMA }}
-          USERNAME: ${{ secrets.SCHEMA_SPY_USERNAME }}
-          PASSWORD: ${{ secrets.SCHEMA_SPY_PASSWORD }}
+          DB_USERNAME: ${{ secrets.SCHEMA_SPY_USERNAME }}
+          DB_PASSWORD: ${{ secrets.SCHEMA_SPY_PASSWORD }}
 
       - name: Publish HTML report
         uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e # v4.5.0
diff --git a/tools/schema-spy/run.sh b/tools/schema-spy/run.sh
index b04cb3375c..89cdcc0bc6 100755
--- a/tools/schema-spy/run.sh
+++ b/tools/schema-spy/run.sh
@@ -21,8 +21,8 @@ kubectl run "$pod_name" \
           "stdin": true,
           "tty": true,
           "securityContext": { "runAsNonRoot": true, "runAsUser": 1000 },
-          "resources": { "limits": { "cpu": "2000m", "memory": "8000Mi" } },
-          "env": [ { "name": "JAVA_TOOL_OPTIONS", "value": "-Xss1g -XX:MaxRAMPercentage=75" } ]
+          "resources": { "limits": { "cpu": "2000m", "memory": "2000Mi" } },
+          "env": [ { "name": "JAVA_TOOL_OPTIONS", "value": "-XX:MaxRAMPercentage=75" } ]
         }
       ]
     }
@@ -34,7 +34,17 @@ kubectl cp ./tools/schema-spy/ojdbc10.jar "$pod_name:/drivers_inc/ojdbc10.jar"
 
 # Generate report
 excludes='^(^Z.*$|^.*[0-9]$|^PRF_.*$|^PERF_.*$|^MIS_.*$|^.*_MV$|^.*\\$.*$|^.*TRAINING.*$|^PDT_THREAD$|^CHANGE_CAPTURE$)$'
-kubectl exec "$pod_name" -- /usr/local/bin/schemaspy -db "${DB}" -host "${HOST}" -port "${PORT}" -s "${SCHEMA}" -u "${USERNAME}" -p "${PASSWORD}" -cat "${SCHEMA}" -t orathin-service -I "$excludes" -vizjs -norows -noviews
+kubectl exec "$pod_name" -- /usr/local/bin/schemaspy \
+  -host "${HOST}" \
+  -port "${PORT}" \
+  -db "${DB}" \
+  -s "${SCHEMA}" \
+  -cat "${SCHEMA}" \
+  -u "${DB_USERNAME}" \
+  -p "${DB_PASSWORD}" \
+  -t orathin-service \
+  -I "$excludes" \
+  -norows -noviews -degree 1
 
 # Download report
 kubectl cp "$pod_name:/output" schema-spy-report