From f316309e2692a450c5f294d3e3d977e3f65ebf5f Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Tue, 3 Feb 2026 10:23:39 +0530 Subject: [PATCH 1/6] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 83 +++++++++++++++++++ pom.xml | 5 ++ .../resources/application-swagger.properties | 18 ++++ 3 files changed, 106 insertions(+) create mode 100644 .github/workflows/swagger-json.yml create mode 100644 src/main/resources/application-swagger.properties diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml new file mode 100644 index 0000000..846006d --- /dev/null +++ b/.github/workflows/swagger-json.yml @@ -0,0 +1,83 @@ +name: Sync Swagger to AMRIT-Docs + +on: + push: + branches: [ main ] + workflow_dispatch: + +jobs: + swagger-sync: + runs-on: ubuntu-latest + + steps: + - name: Checkout API repo + uses: actions/checkout@v4 + + - name: Set up Java 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: maven + + - name: Build API (skip tests) + run: mvn clean package -DskipTests + + - name: Install jq + run: sudo apt-get update && sudo apt-get install -y jq + + - name: Run API in swagger profile + run: | + mvn spring-boot:run \ + -Dspring-boot.run.profiles=swagger \ + -Dspring-boot.run.arguments=--server.port=9090 \ + > app.log 2>&1 & + echo $! > api_pid.txt + + - name: Wait for API & fetch Swagger + run: | + for i in {1..30}; do + CODE=$(curl -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) + if [ "$CODE" = "200" ]; then + jq . swagger_raw.json > common-api.json + echo "Swagger generated successfully" + exit 0 + fi + echo "Waiting for API... ($i)" + sleep 5 + done + + echo "Swagger not generated" + cat app.log || true + exit 1 + + - name: Stop API + if: always() + run: | + if [ -f api_pid.txt ]; then + kill $(cat api_pid.txt) || true + fi + + - name: Checkout AMRIT-Docs + uses: actions/checkout@v4 + with: + repository: PSMRI/AMRIT-Docs + token: ${{ secrets.DOCS_REPO_TOKEN }} + path: amrit-docs + + - name: Copy Swagger JSON + run: | + cp admin-api.json amrit-docs/docs/swagger/admin-api.json + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.DOCS_REPO_TOKEN }} + path: amrit-docs + branch: auto/swagger-update-${{ github.run_id }} + base: main + commit-message: Auto-update Common-API swagger + title: Auto-update Common-API swagger + body: | + This PR automatically updates the Common-API Swagger JSON + from the latest main branch build. diff --git a/pom.xml b/pom.xml index 712140d..f0f714e 100644 --- a/pom.xml +++ b/pom.xml @@ -271,6 +271,11 @@ 0.12.6 runtime + + com.h2database + h2 + runtime + diff --git a/src/main/resources/application-swagger.properties b/src/main/resources/application-swagger.properties new file mode 100644 index 0000000..92ca6d0 --- /dev/null +++ b/src/main/resources/application-swagger.properties @@ -0,0 +1,18 @@ +spring.datasource.url=jdbc:h2:mem:swaggerdb +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password= +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=none + +# Disable Redis if not needed for docs (optional) +spring.redis.host=localhost +spring.redis.port=6379 + +# CORS for Swagger UI +cors.allowed-origins=* + +# Logging +logging.level.root=INFO + +jwt.secret=dummy-secret From 38f51d62304748a83eadf7f0615d97ff723bda40 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Tue, 3 Feb 2026 10:35:14 +0530 Subject: [PATCH 2/6] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml index 846006d..28aaac4 100644 --- a/.github/workflows/swagger-json.yml +++ b/.github/workflows/swagger-json.yml @@ -39,7 +39,7 @@ jobs: for i in {1..30}; do CODE=$(curl -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) if [ "$CODE" = "200" ]; then - jq . swagger_raw.json > common-api.json + jq . swagger_raw.json > admin-api.json echo "Swagger generated successfully" exit 0 fi @@ -76,8 +76,8 @@ jobs: path: amrit-docs branch: auto/swagger-update-${{ github.run_id }} base: main - commit-message: Auto-update Common-API swagger - title: Auto-update Common-API swagger + commit-message: Auto-update ADMIN-API swagger + title: Auto-update ADMIN-API swagger body: | - This PR automatically updates the Common-API Swagger JSON + This PR automatically updates the ADMIN-API Swagger JSON from the latest main branch build. From 8e2bbbe0015685e6b65287df29c5ab09de297ed1 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Tue, 3 Feb 2026 11:14:28 +0530 Subject: [PATCH 3/6] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml index 28aaac4..e5f706a 100644 --- a/.github/workflows/swagger-json.yml +++ b/.github/workflows/swagger-json.yml @@ -37,7 +37,7 @@ jobs: - name: Wait for API & fetch Swagger run: | for i in {1..30}; do - CODE=$(curl -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) + CODE=$(curl --connect-timeout 2 --max-time 5 -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) if [ "$CODE" = "200" ]; then jq . swagger_raw.json > admin-api.json echo "Swagger generated successfully" From 377410b2285e35f72aeaa9b5dfc50474d6a46662 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Tue, 3 Feb 2026 11:14:40 +0530 Subject: [PATCH 4/6] chore(swagger): automate swagger sync to amrit-docs --- src/main/resources/application-swagger.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-swagger.properties b/src/main/resources/application-swagger.properties index 92ca6d0..e9b44a9 100644 --- a/src/main/resources/application-swagger.properties +++ b/src/main/resources/application-swagger.properties @@ -10,9 +10,9 @@ spring.redis.host=localhost spring.redis.port=6379 # CORS for Swagger UI -cors.allowed-origins=* +cors.allowed-origins=${CORS_ALLOWED_ORIGINS:http://localhost:9090,http://localhost:8080} # Logging logging.level.root=INFO -jwt.secret=dummy-secret +jwt.secret=JWT_SECRET From 127e021ad3207f0bfaa7033bcd7a077f98037e79 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Tue, 3 Feb 2026 11:23:58 +0530 Subject: [PATCH 5/6] chore(swagger): automate swagger sync to amrit-docs --- .github/workflows/swagger-json.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml index e5f706a..9cf1e49 100644 --- a/.github/workflows/swagger-json.yml +++ b/.github/workflows/swagger-json.yml @@ -39,9 +39,13 @@ jobs: for i in {1..30}; do CODE=$(curl --connect-timeout 2 --max-time 5 -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) if [ "$CODE" = "200" ]; then - jq . swagger_raw.json > admin-api.json - echo "Swagger generated successfully" - exit 0 + if jq . swagger_raw.json > admin-api.json; then + echo "Swagger generated successfully" + exit 0 + else + echo "Failed to parse swagger_raw.json with jq" + exit 1 + fi fi echo "Waiting for API... ($i)" sleep 5 @@ -67,6 +71,7 @@ jobs: - name: Copy Swagger JSON run: | + mkdir -p amrit-docs/docs/swagger cp admin-api.json amrit-docs/docs/swagger/admin-api.json - name: Create Pull Request From 5453c2af309266d5f32369101ae681d4c087a707 Mon Sep 17 00:00:00 2001 From: DurgaPrasad-54 Date: Wed, 11 Feb 2026 10:51:06 +0530 Subject: [PATCH 6/6] chore(swagger): update github swagger workflow --- .github/workflows/swagger-json.yml | 51 ++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/.github/workflows/swagger-json.yml b/.github/workflows/swagger-json.yml index 9cf1e49..9b2bf65 100644 --- a/.github/workflows/swagger-json.yml +++ b/.github/workflows/swagger-json.yml @@ -8,6 +8,7 @@ on: jobs: swagger-sync: runs-on: ubuntu-latest + timeout-minutes: 20 steps: - name: Checkout API repo @@ -21,8 +22,8 @@ jobs: cache: maven - name: Build API (skip tests) - run: mvn clean package -DskipTests - + run: mvn -B clean package -DskipTests + - name: Install jq run: sudo apt-get update && sudo apt-get install -y jq @@ -36,19 +37,27 @@ jobs: - name: Wait for API & fetch Swagger run: | - for i in {1..30}; do + for i in {1..40}; do CODE=$(curl --connect-timeout 2 --max-time 5 -s -o swagger_raw.json -w "%{http_code}" http://localhost:9090/v3/api-docs || true) + if [ "$CODE" = "200" ]; then - if jq . swagger_raw.json > admin-api.json; then - echo "Swagger generated successfully" - exit 0 - else - echo "Failed to parse swagger_raw.json with jq" + jq . swagger_raw.json > admin-api.json || { + echo "Swagger JSON invalid" + cat swagger_raw.json + exit 1 + } + + if [ "$(jq '.paths | length' admin-api.json)" -eq 0 ]; then + echo "Swagger paths empty – failing" exit 1 fi + + echo "Swagger generated successfully" + exit 0 fi + echo "Waiting for API... ($i)" - sleep 5 + sleep 4 done echo "Swagger not generated" @@ -58,9 +67,17 @@ jobs: - name: Stop API if: always() run: | + # Graceful shutdown of the process group + sleep 5 + # Force kill the process group if still running if [ -f api_pid.txt ]; then - kill $(cat api_pid.txt) || true - fi + PID=$(cat api_pid.txt) + kill -TERM -- -"$PID" 2>/dev/null || true + sleep 2 + kill -9 -- -"$PID" 2>/dev/null || true + fi + # Fallback: kill any remaining java process on port 9090 + fuser -k 9090/tcp 2>/dev/null || true - name: Checkout AMRIT-Docs uses: actions/checkout@v4 @@ -68,6 +85,7 @@ jobs: repository: PSMRI/AMRIT-Docs token: ${{ secrets.DOCS_REPO_TOKEN }} path: amrit-docs + fetch-depth: 0 - name: Copy Swagger JSON run: | @@ -75,14 +93,15 @@ jobs: cp admin-api.json amrit-docs/docs/swagger/admin-api.json - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v8 with: token: ${{ secrets.DOCS_REPO_TOKEN }} path: amrit-docs - branch: auto/swagger-update-${{ github.run_id }} + branch: auto/swagger-update-${{ github.run_id }}-${{ github.run_attempt }} base: main - commit-message: Auto-update ADMIN-API swagger - title: Auto-update ADMIN-API swagger + commit-message: "chore(docs): auto-update Admin-API swagger" + title: "chore(docs): auto-update Admin-API swagger" + delete-branch: true body: | - This PR automatically updates the ADMIN-API Swagger JSON + This PR automatically updates Admin-API Swagger JSON from the latest main branch build.