Update test branch #1538
Merged
Update test branch #1538
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
realized we couldn't actually see which schema was used. (cherry picked from commit 3e2a6dd)
Follow-up PR to remove lingering dependency on HEC-data-access. (cherry picked from commit 682930c)
(cherry picked from commit 76aeb99)
I noticed that Timeseries IT were sending the Authentication header to some of the get requests. Except for a couple places (which we should do a better job of documenting) all the GET shouldn't need auth. I pulled those changes into this "clean" PR. (cherry picked from commit f763147)
…cross 1 directory (#1306) Bumps the npm_and_yarn group with 1 update in the /cda-gui directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 7.1.3 to 7.1.5 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/vitejs/vite/releases">vite's releases</a>.</em></p> <blockquote> <h2>v7.1.5</h2> <p>Please refer to <a href="https://github.com/vitejs/vite/blob/v7.1.5/packages/vite/CHANGELOG.md">CHANGELOG.md</a> for details.</p> <h2>v7.1.4</h2> <p>Please refer to <a href="https://github.com/vitejs/vite/blob/v7.1.4/packages/vite/CHANGELOG.md">CHANGELOG.md</a> for details.</p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p> <blockquote> <h2><!-- raw HTML omitted --><a href="https://github.com/vitejs/vite/compare/v7.1.4...v7.1.5">7.1.5</a> (2025-09-08)<!-- raw HTML omitted --></h2> <h3>Bug Fixes</h3> <ul> <li>apply <code>fs.strict</code> check to HTML files (<a href="https://redirect.github.com/vitejs/vite/issues/20736">#20736</a>) (<a href="https://github.com/vitejs/vite/commit/14015d794f69accba68798bd0e15135bc51c9c1e">14015d7</a>)</li> <li><strong>deps:</strong> update all non-major dependencies (<a href="https://redirect.github.com/vitejs/vite/issues/20732">#20732</a>) (<a href="https://github.com/vitejs/vite/commit/122bfbabeb1f095ce7cabd30893e5531e9a007c4">122bfba</a>)</li> <li>upgrade sirv to 3.0.2 (<a href="https://redirect.github.com/vitejs/vite/issues/20735">#20735</a>) (<a href="https://github.com/vitejs/vite/commit/09f2b52e8d5907f26602653caf41b3a56692600d">09f2b52</a>)</li> </ul> <h2><!-- raw HTML omitted --><a href="https://github.com/vitejs/vite/compare/v7.1.3...v7.1.4">7.1.4</a> (2025-09-01)<!-- raw HTML omitted --></h2> <h3>Bug Fixes</h3> <ul> <li>add missing awaits (<a href="https://redirect.github.com/vitejs/vite/issues/20697">#20697</a>) (<a href="https://github.com/vitejs/vite/commit/79d10ed6341ba7a751d007b7ad113a9b8be9c853">79d10ed</a>)</li> <li><strong>deps:</strong> update all non-major dependencies (<a href="https://redirect.github.com/vitejs/vite/issues/20676">#20676</a>) (<a href="https://github.com/vitejs/vite/commit/5a274b29df83744cf0ce4dafd94029d2a9e01135">5a274b2</a>)</li> <li><strong>deps:</strong> update all non-major dependencies (<a href="https://redirect.github.com/vitejs/vite/issues/20709">#20709</a>) (<a href="https://github.com/vitejs/vite/commit/0401feba17e60bd7e976c5643128a0da49670a83">0401feb</a>)</li> <li>pass rollup watch options when building in watch mode (<a href="https://redirect.github.com/vitejs/vite/issues/20674">#20674</a>) (<a href="https://github.com/vitejs/vite/commit/f367453ca2825bc8a390d41c5d13b161756f2b41">f367453</a>)</li> </ul> <h3>Miscellaneous Chores</h3> <ul> <li>remove unused constants entry from rolldown.config.ts (<a href="https://redirect.github.com/vitejs/vite/issues/20710">#20710</a>) (<a href="https://github.com/vitejs/vite/commit/537fcf91862a1bf51e70ce6fe9b414319dd3a675">537fcf9</a>)</li> </ul> <h3>Code Refactoring</h3> <ul> <li>remove unnecessary <code>minify</code> parameter from <code>finalizeCss</code> (<a href="https://redirect.github.com/vitejs/vite/issues/20701">#20701</a>) (<a href="https://github.com/vitejs/vite/commit/8099582e5364f907f2bc6cb8e2d52ae0c4d937e4">8099582</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/vitejs/vite/commit/564754061e9494f355370e31ee9d7ea5abef6037"><code>5647540</code></a> release: v7.1.5</li> <li><a href="https://github.com/vitejs/vite/commit/09f2b52e8d5907f26602653caf41b3a56692600d"><code>09f2b52</code></a> fix: upgrade sirv to 3.0.2 (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20735">#20735</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/14015d794f69accba68798bd0e15135bc51c9c1e"><code>14015d7</code></a> fix: apply <code>fs.strict</code> check to HTML files (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20736">#20736</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/122bfbabeb1f095ce7cabd30893e5531e9a007c4"><code>122bfba</code></a> fix(deps): update all non-major dependencies (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20732">#20732</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/bcc31449c0c4f852ccb1eedda1842bc7ded23d01"><code>bcc3144</code></a> release: v7.1.4</li> <li><a href="https://github.com/vitejs/vite/commit/0401feba17e60bd7e976c5643128a0da49670a83"><code>0401feb</code></a> fix(deps): update all non-major dependencies (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20709">#20709</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/537fcf91862a1bf51e70ce6fe9b414319dd3a675"><code>537fcf9</code></a> chore: remove unused constants entry from rolldown.config.ts (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20710">#20710</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/79d10ed6341ba7a751d007b7ad113a9b8be9c853"><code>79d10ed</code></a> fix: add missing awaits (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20697">#20697</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/8099582e5364f907f2bc6cb8e2d52ae0c4d937e4"><code>8099582</code></a> refactor: remove unnecessary <code>minify</code> parameter from <code>finalizeCss</code> (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20701">#20701</a>)</li> <li><a href="https://github.com/vitejs/vite/commit/f367453ca2825bc8a390d41c5d13b161756f2b41"><code>f367453</code></a> fix: pass rollup watch options when building in watch mode (<a href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/20674">#20674</a>)</li> <li>Additional commits viewable in <a href="https://github.com/vitejs/vite/commits/v7.1.5/packages/vite">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/USACE/cwms-data-api/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charles Graham <charles.r.graham@usace.army.mil> (cherry picked from commit 4d1d5b5)
(cherry picked from commit 40b531c)
(cherry picked from commit 69ebd32)
(cherry picked from commit b83f1ec)
Update and error messaging to handle to output from HydrologicEngineeringCenter/cwms-database#72 for LRTS time series validation. Additionally had to update test containers as I had updated docker and only the latest version of test containers properly accounted for some altered behavior. And then discovered some incorrectly imported dependencies and corrected that. Modifications were made to how the Schema version was acquired. There is some minor duplication of schema versions. Will update in further PR. This has waited long enough and is causing confusion on other work. (cherry picked from commit ace9951)
Resolves #1224 Implemented new Unsupported Parameters Exception class to warn users of unsupported parameter selections for the locations catalog. TIMESERIES_CATEGORY_LIKE, TIMESERIES_GROUP_LIKE, EXCLUDE_EMPTY, and INCLUDE_EXTENTS Updated Catalog Controller Integration tests to cover new exception. --------- Co-authored-by: Ryan Ripken <89810919+rma-rripken@users.noreply.github.com> (cherry picked from commit 3cd9bbf)
…er in the list isn't always the last user and the paging doesn't work. (cherry picked from commit e18fef8)
Phase 1 to resolve #1117 Updated existing documentation files: - Create consistent title, section, subsection .rst hierarchy. - Changed table format in authorization.rst to csv-table. This format allows for much easier editing/formatting. Created outline for Read the Docs CWMS Data API: - Structured table of contents. - Added pages for each of the 8 /timeseries endpoints for the GET method specifically. - Initial internal linking to shared parameter definitions. - Initial external linking to the CWMS Database Read the Docs. - Added API reference page to show possible capabilities of using OpenAI specs to generate a high-level output of current Swagger-UI. Implemented Gradle build task for read the docs. Pending approval, we will move on with Phase 2 and implement proper definitions for parameters and endpoints. --------- Co-authored-by: Ryan Ripken <89810919+rma-rripken@users.noreply.github.com> (cherry picked from commit 5debc10)
(cherry picked from commit b1f67bf)
Adds Husky/Prettier to `cda-gui` following behind Groundwork and Groundwork-Water's formatting setups. @jbkolze, you might see if i've missed anything? Files of interest: - cda-gui/.husky/pre-commit - cda-gui/.prettierrc - cda-gui/README.md - cda-gui/package.json Via: - a72ea0d - 7953176 - 697ae6b (cherry picked from commit 8a5ddb4)
expiration was added to virtual levels but missing from the other level types (cherry picked from commit e9e19ab)
Previous version of traefik couldn't communicate to latest version of docker. Update traefik so the compose file works again. (cherry picked from commit 73796ac)
Implemented new Entity controller that exposes all CRUD methods. Created accompanying integration tests to ensure the endpoints work correctly and return the appropriate error responses. --------- Co-authored-by: Ryan Ripken <89810919+rma-rripken@users.noreply.github.com> Co-authored-by: Bryson Spilman <bryson@rmanet.com> Co-authored-by: Mike Neilson <michael.a.neilson@usace.army.mil> Co-authored-by: Daniel Osborne <Daniel.T.Osborne@usace.army.mil> (cherry picked from commit 492bb16)
Added here to the wiki as well https://github.com/USACE/cwms-data-api/wiki And in the sidebar description (remove if not needed) (cherry picked from commit c500e48)
Refactored and cleaned Entity Controller to address clean runner build fail PR #1507. - Fixed entity controller integration tests to incorporate unique data per test - Added test utility helpers for cleanup and unique entityJson test values - Cleaned up global variables to remove hard coded param values - Fixed teardown method to ensure all test entities cleaned up after testing. - Added check in Entity Controller to fix unused documented query param errors and check for required params (cherry picked from commit 053eae0)
unsure why this wasn't blocking PR merge. Adding clean to the gradle tasks in case something is getting cached (cherry picked from commit bbc760a)
Co-authored-by: Adam Korynta <47677856+adamkorynta@users.noreply.github.com> (cherry picked from commit e82d2d4)
Add blob-id or clob-id query parameter, respectively, to all required methods, so ones with invalid path characters can be referenced. This is required for HydrologicEngineeringCenter/cwms-cli#72 (cherry picked from commit c33aca9)
Alternate considerations: - Looked into using a third-party RSS library for building up the XML. Seemed like the only somewhat maintained library is Rome, but that hasn't been updated since 2023 and contains the jdom2 dependency which has a known vulnerability (wouldn't really matter to our use-case of producing XML only, but would matter on the client). didn't seem too much a lift to just use our own DTO's and jackson serialization. If this ends up being a burden, it also wouldn't be too hard to update to something else in the future. - opted to not set the atom links for self or previous as those would be moving targets given the week lookback limit. We do need a next cursor so the fact that the URL would not be reproducible after a time period is unavoidable. We could also throw out the cursor and only use the `since` field. - don't search for messages older than a week. This could be shortened as needed. (cherry picked from commit 118933c)
Fixed seasonal data retrieval for location level getAll. Only the most recent single value was being included in the response. Added test case for coverage and updated virtual level test case to include expiration date verification. (cherry picked from commit 6ef8b2f)
(cherry picked from commit e39bad6)
(cherry picked from commit e362985)
- fix openapi for location kind endpoint return type - fix issues where parameterized connection was getting the office id session set, but then a separate configuration was used for the jOOQ call (I tried to do an audit and catch as many errors as I could) - add null checks for outlet/turbine child location retrieval objects - fix null pointers on water contract effective/expiration dates - null check and ignore "CWMS" office ids for session variables - fix time series vert datum retrieval trying to convert units to "SI" or "EN" (cherry picked from commit b9dd092)
MikeNeilson
requested review from
DanielTOsborne,
jbkolze,
krowvin,
msweier and
rma-rripken
rma-rripken
approved these changes
Jan 15, 2026
Collaborator
rma-rripken
left a comment
rma-rripken
left a comment
There was a problem hiding this comment.
I'm not sure how I'd even verify that this was everything but it looks like a plausible list.
Contributor
Author
yeah. that is a challenge in several projects. Something I'm hoping to solve with https://github.com/opendcs/branch-issue-tracker/ ... If I can ever find time to work on it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull in latest changes to develop since the last time we did this.
NOTE: I'm pretty sure this is everything, but it's a lot to keep track of so is possible I've missed something.