diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64baa9247..f82df339f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: jdk: [11] schema: - env: latest - image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev" + image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:main" - env: release image: "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:25.07.01" name: build and test (jdk ${{matrix.jdk}}, schema ${{matrix.schema.env}}) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da9256ff0..b6691acd8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,12 @@ jobs: api_image: ${{steps.set_image.outputs.api_image}} migration_image: ${{steps.migration-publish.outputs.image}} steps: + - name: Clean up disk space, so we don't run out. + if: matrix.platform == 'ubuntu-latest' + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android + sudo rm -rf /opt/ghc - name: checkout code uses: actions/checkout@v5.0.0 with: diff --git a/cwms-data-api/src/main/java/cwms/cda/api/BlobController.java b/cwms-data-api/src/main/java/cwms/cda/api/BlobController.java index 2764fe1b5..f203713b5 100644 --- a/cwms-data-api/src/main/java/cwms/cda/api/BlobController.java +++ b/cwms-data-api/src/main/java/cwms/cda/api/BlobController.java @@ -151,7 +151,7 @@ public void getAll(@NotNull Context ctx) { public void getOne(@NotNull Context ctx, @NotNull String blobId) { try (final Timer.Context ignored = markAndTime(GET_ONE)) { - String idQueryParam = ctx.queryParam(CLOB_ID); + String idQueryParam = ctx.queryParam(BLOB_ID); if (idQueryParam != null) { blobId = idQueryParam; } @@ -235,7 +235,7 @@ public void create(@NotNull Context ctx) { @Override public void update(@NotNull Context ctx, @NotNull String blobId) { try (final Timer.Context ignored = markAndTime(UPDATE)) { - String idQueryParam = ctx.queryParam(CLOB_ID); + String idQueryParam = ctx.queryParam(BLOB_ID); if (idQueryParam != null) { blobId = idQueryParam; } @@ -287,7 +287,7 @@ public void update(@NotNull Context ctx, @NotNull String blobId) { @Override public void delete(@NotNull Context ctx, @NotNull String blobId) { try (Timer.Context ignored = markAndTime(DELETE)) { - String idQueryParam = ctx.queryParam(CLOB_ID); + String idQueryParam = ctx.queryParam(BLOB_ID); if (idQueryParam != null) { blobId = idQueryParam; }