2026 04 01 test updates (#1669)

Simple git merge from develop, excluding any branch specific changes such as to the build files.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Zack Olson <zack@rmanet.com>
Co-authored-by: Charles Graham <charles.r.graham@usace.army.mil>
Co-authored-by: Wes Reagan <reaganwesley12@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vairav Laxman <vayiravan@gmail.com>
Co-authored-by: Ryan Ripken <89810919+rma-rripken@users.noreply.github.com>
Co-authored-by: Bryson Spilman <87150647+rma-bryson@users.noreply.github.com>
Co-authored-by: Jorge Hassan <jhassan@solidlogix.com>
Co-authored-by: rma-kayla <kayla@rmanet.com>
Co-authored-by: Bryson Spilman <bryson@rmanet.com>
Co-authored-by: Ryan Miles <ryanm@rmanet.com>
Co-authored-by: Adam Korynta <47677856+adamkorynta@users.noreply.github.com>
Co-authored-by: Daniel Osborne <Daniel.T.Osborne@usace.army.mil>
Co-authored-by: Eric Novotny <eric.v.novotny@usace.army.mil>
Co-authored-by: Eric Novotny <nov00002@umn.edu>
Co-authored-by: Vairav Laxman <vairavan.laxman@solidlogix.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 16 people

.github/actions/database-migration-image/Dockerfile

@@ -10,6 +10,8 @@ COPY cda-user.sql /after.install.d/
 ENV RDS_MODE="true"
 ENV BUILDUSER=DBAdmin
 
+# Due to the way we originally set this up it needs to always be 99.99.99-SNAPSHOT for now.
+RUN sed -i "s/<revision>.*<\/revision>/<revision>99.99.99-SNAPSHOT<\/revision>/" ../pom.xml
 
 ENTRYPOINT [ "/entry.sh" ]
 CMD ["/cwmsdb/schema/docker/install.sh"]

.github/workflows/build.yml

@@ -19,6 +19,8 @@ jobs:
             image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev"
           - env: release
             image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:25.07.01"
+          - env: next-release
+            image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:26.02.17-RC01"
     name: build and test (jdk ${{matrix.jdk}}, schema ${{matrix.schema.env}})
     runs-on: ubuntu-latest
     outputs:
@@ -32,7 +34,7 @@ jobs:
       - name: checkout code
         uses: actions/checkout@v5.0.0
       - name: setup java
-        uses: actions/setup-java@v5.0.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'temurin'
           java-version: ${{matrix.jdk}}
@@ -58,7 +60,7 @@ jobs:
       - name: checkout code
         uses: actions/checkout@v5.0.0
       - name: setup java
-        uses: actions/setup-java@v5.0.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'temurin'
           java-version: 11

.github/workflows/codeql.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           languages: 'java'
       - name: setup java
-        uses: actions/setup-java@v5.0.0
+        uses: actions/setup-java@v5.2.0
         with:
           java-version: '11'
           java-package: jdk

.github/workflows/deploy.yml

@@ -27,7 +27,7 @@ jobs:
       contents: read # This is required for actions/checkout
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           aws-region: ${{ inputs.region }}
           role-to-assume: ${{ inputs.iam_role }}

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
         with:
           ref: ${{inputs.branch}}
       - name: setup java
-        uses: actions/setup-java@v5.0.0
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -83,15 +83,15 @@ jobs:
       - name: Create GitHub Release
         id: create_release
         # Allow testing without creating a release
-        if: github.event_name != 'pull_request' && (github.event.ref == 'refs/heads/test' || startsWith(github.event.ref, 'refs/tags'))
-        uses: softprops/action-gh-release@v2.3.2
+        if: github.event_name != 'pull_request' && (github.event.ref == 'refs/heads/develop' || startsWith(github.event.ref, 'refs/tags'))
+        uses: softprops/action-gh-release@v2.6.1
         with:
           files: cwms-data-api/build/libs/cwms-data-api-${{env.VERSION}}.war
           tag_name: ${{env.VERSION}}
           generate_release_notes: true
           token: ${{ secrets.token != null && secrets.token || secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v4.0.0
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5.8.0
@@ -110,13 +110,13 @@ jobs:
             type=schedule,pattern=${{inputs.branch}}-{{date 'YYYY.MM.DD-hhmmss'}}
       - name: Log in to the Container registry
         id: login-ghcr
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.token != null && secrets.token || secrets.GITHUB_TOKEN }}
       - name: Login to HEC Public Registry
-        uses: docker/login-action@v3.5.0
+        uses: docker/login-action@v4.0.0
         id: login-hec
         with:
           registry: ${{ secrets.registry != null && secrets.registry ||secrets.HEC_PUB_REGISTRY }}

Dockerfile

@@ -56,6 +56,9 @@ ENV cwms.dataapi.access.providers="KeyAccessManager,OpenID"
 ENV cwms.dataapi.access.openid.wellKnownUrl="https://<prefix>/.well-known/openid-configuration"
 ENV cwms.dataapi.access.openid.issuer="<issuer>"
 ENV cwms.dataapi.access.openid.timeout="604800"
+# Putting default values here to easy configuration
+ENV cwms.dataapi.access.openid.clientId=cwms
+ENV cwms.dataapi.access.openid.idpHint=federation-eams
 #ENV cwms.dataapi.access.openid.altAuthUrl="https://identityc-test.cwbi.us/auth/realms/cwbi"
 
 # used to simplify redeploy in certain contexts. Update to match -<marker> in image label

cda-gui/.env.development

@@ -1 +1 @@
-CDA_API_ROOT=https://water.dev.cwbi.us/cwms-data
+VITE_CDA_API_ROOT=https://water.dev.cwbi.us/cwms-data

cda-gui/.env.production

@@ -1 +1 @@
-CDA_API_ROOT=https://cwms-data.usace.army.mil/cwms-data
+VITE_CDA_API_ROOT=https://cwms-data.usace.army.mil/cwms-data

cda-gui/.env.test

@@ -1 +1 @@
-CDA_API_ROOT=https://cwms-data-test.cwbi.us/cwms-data
+VITE_CDA_API_ROOT=https://cwms-data-test.cwbi.us/cwms-data