From 7ad563ca76524e4d65c6640675b79e843606ccaa Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Thu, 5 Sep 2024 16:42:08 -0700 Subject: [PATCH 1/9] Update unstable-cicd.yaml --- .github/workflows/unstable-cicd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unstable-cicd.yaml b/.github/workflows/unstable-cicd.yaml index 17df25ed..47805208 100644 --- a/.github/workflows/unstable-cicd.yaml +++ b/.github/workflows/unstable-cicd.yaml @@ -111,7 +111,8 @@ jobs: cd registry/docker/certs ./generate-certs.sh cd .. - docker image inspect nasapds/registry-api-service:latest >/dev/null + docker image inspect ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest + docker image inspect ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest >/dev/null docker compose \ --ansi never --profile int-registry-batch-loader --project-name registry \ up --detach --quiet-pull From fcf5b8ec822ac4b3a234eb97ad8c08d26932998f Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Thu, 5 Sep 2024 16:42:54 -0700 Subject: [PATCH 2/9] Update unstable-cicd.yaml --- .github/workflows/unstable-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unstable-cicd.yaml b/.github/workflows/unstable-cicd.yaml index 47805208..e0a98aa5 100644 --- a/.github/workflows/unstable-cicd.yaml +++ b/.github/workflows/unstable-cicd.yaml @@ -111,7 +111,7 @@ jobs: cd registry/docker/certs ./generate-certs.sh cd .. - docker image inspect ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest + docker image pull ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest docker image inspect ${{secrets.DOCKERHUB_USERNAME}}/registry-api-service:latest >/dev/null docker compose \ --ansi never --profile int-registry-batch-loader --project-name registry \ From 9d00341a1c3b2d1a8536322678fb016487811324 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Thu, 5 Sep 2024 17:27:26 -0700 Subject: [PATCH 3/9] Update unstable-cicd.yaml --- .github/workflows/unstable-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unstable-cicd.yaml b/.github/workflows/unstable-cicd.yaml index e0a98aa5..6e79727e 100644 --- a/.github/workflows/unstable-cicd.yaml +++ b/.github/workflows/unstable-cicd.yaml @@ -69,7 +69,7 @@ jobs: restore-keys: pds-${{runner.os}}-mvn- - name: 🤠 Roundup - uses: NASA-PDS/roundup-action@stable + uses: NASA-PDS/roundup-action@ff-only with: assembly: unstable packages: openjdk17-jdk From fae80d7ef880872f27c9eab7d153bbeb91a10902 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Thu, 5 Sep 2024 17:41:19 -0700 Subject: [PATCH 4/9] disable roundup in unstable-cicd.yaml --- .github/workflows/unstable-cicd.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/unstable-cicd.yaml b/.github/workflows/unstable-cicd.yaml index 6e79727e..d92ed1fc 100644 --- a/.github/workflows/unstable-cicd.yaml +++ b/.github/workflows/unstable-cicd.yaml @@ -67,17 +67,17 @@ jobs: key: pds-${{runner.os}}-mvn-${{hashFiles('**/pom.xml')}} # To restore a set of files, we only need to match a prefix of the saved key. restore-keys: pds-${{runner.os}}-mvn- - - - name: 🤠 Roundup - uses: NASA-PDS/roundup-action@ff-only - with: - assembly: unstable - packages: openjdk17-jdk - env: - ossrh_username: ${{secrets.OSSRH_USERNAME}} - ossrh_password: ${{secrets.OSSRH_PASSWORD}} - CODE_SIGNING_KEY: ${{secrets.CODE_SIGNING_KEY}} - ADMIN_GITHUB_TOKEN: ${{secrets.ADMIN_GITHUB_TOKEN}} + # - + # name: 🤠 Roundup + # uses: NASA-PDS/roundup-action@ff-only + # with: + # assembly: unstable + # packages: openjdk17-jdk + # env: + # ossrh_username: ${{secrets.OSSRH_USERNAME}} + # ossrh_password: ${{secrets.OSSRH_PASSWORD}} + # CODE_SIGNING_KEY: ${{secrets.CODE_SIGNING_KEY}} + # ADMIN_GITHUB_TOKEN: ${{secrets.ADMIN_GITHUB_TOKEN}} - name: 🫙 Jar File Determination id: jarrer From b521cfeb79c83838a080930f05ab806329baefdc Mon Sep 17 00:00:00 2001 From: edunn Date: Wed, 11 Sep 2024 10:21:01 -0700 Subject: [PATCH 5/9] whitespace-sanitize user-provided query string value --- .../pds/api/registry/search/RegistrySearchRequestBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java index ab1ed850..a5815b12 100644 --- a/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java @@ -14,6 +14,7 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.misc.ParseCancellationException; +import org.apache.commons.lang3.StringUtils; import org.opensearch.client.opensearch._types.FieldSort; import org.opensearch.client.opensearch._types.FieldValue; import org.opensearch.client.opensearch._types.SortOptions; @@ -339,7 +340,7 @@ public RegistrySearchRequestBuilder constrainByQueryString(String q) throws Unpa } return this; } catch (RecognitionException | ParseCancellationException e) { - log.info("Unable to parse q " + q + "error message is " + e); + log.info("Unable to parse q " + StringUtils.normalizeSpace(q) + "error message is " + e); throw new UnparsableQParamException( "q string value:" + q + " Error message " + e.getMessage()); } From 2184d9a11277fd8bd78494d11a3f45d42d15882c Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Tue, 17 Sep 2024 14:17:32 -0700 Subject: [PATCH 6/9] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index f15f5f17..8f25cfd5 100644 --- a/README.md +++ b/README.md @@ -127,5 +127,3 @@ Launch the test in command line: newman run docker/postman/postman_collection.json --env-var baseUrl=http://localhost:8080 - - From 3953710aa3747bda39f81e0e1ca9da9fa79cb967 Mon Sep 17 00:00:00 2001 From: Jordan Padams <33492486+jordanpadams@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:11:12 -0800 Subject: [PATCH 7/9] Update dependabot.yml to maven, not java --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 68f45f44..cb7efc54 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,7 @@ version: 2 updates: - - package-ecosystem: "java" + - package-ecosystem: "maven" directory: "/" schedule: interval: "monthly" From 5d8057fa4320395cbb15f185fe845dc3758aa353 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:11:53 +0000 Subject: [PATCH 8/9] Bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/branch-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-cicd.yaml b/.github/workflows/branch-cicd.yaml index 48d1e28c..19151f28 100644 --- a/.github/workflows/branch-cicd.yaml +++ b/.github/workflows/branch-cicd.yaml @@ -106,7 +106,7 @@ jobs: - name: Set up Python 3 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' From c6f4487d1bea092e14e5c5d5d03b56741525a46b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:12:01 +0000 Subject: [PATCH 9/9] Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dbb11ed7..3ab5f5a4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: security-and-quality, security-extended @@ -70,7 +70,7 @@ jobs: mvn clean install - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 - run: | pip install nasa-scrub