Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AWS deployment resources for version 1.2.0 #331

Merged
merged 3 commits into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/stable-cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
name: 🫙 Jar and Tag Determination
id: jartag
run: |
echo "jar_file=$(ls ./service/target/*.jar)" >> $GITHUB_OUTPUT
echo "image_tag=$(echo ${{github.ref}} | awk -F/ '{print $NF}')" >> $GITHUB_OUTPUT
echo "::set-output name=jar_file::$(ls ./service/target/*.jar)"
echo "::set-output name=image_tag::$(echo ${{github.ref}} | awk -F/ '{print $NF}')"
-
name: 💳 Docker Hub Identification
uses: docker/login-action@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Follow instructions in README.txt in the decompressed folder

To build and run the application you need:

- jdk 11
- jdk 17
- maven

Additionally, harvested data will only be picked up correctly by the API if all of the following are true:
Expand Down
2 changes: 1 addition & 1 deletion model/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: 3.0.0
info:
description: |
Registry API enabling advanced search on PDS data and metadata. The API provides end-points to search for bundles, collections and any PDS products with advanced search queries. It also enables to browse the archive hierarchically downward (e.g. collection/s products) or upward (e.g. bundles containing a product).
version: 1.1.0
version: 1.2.0
title: PDS Registry Search API
termsOfService: 'http://pds.nasa.gov'
contact:
Expand Down
2 changes: 1 addition & 1 deletion service/docker/Dockerfile.aws
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# Normally we'd prefer Alpine Linux, but JDK 11 isn't available with it, so
# we go with a slim Debian. Debian's good too.

FROM openjdk:11-slim
FROM openjdk:17-slim


# API JAR file
Expand Down
16 changes: 13 additions & 3 deletions service/src/main/resources/application.properties.aws
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
springfox.documentation.swagger.v2.path=/api-docs
server.contextPath=/
server.port=80
server.forward-headers-strategy=framework
server.use-forward-headers=true

springdoc.swagger-ui.enabled=true
springdoc.swagger-ui.path=index.html
springdoc.swagger-ui.tagsSorter=alpha

springdoc.api-docs.path=/api-docs
springdoc.api-docs.enabled=true

springdoc.packagesToScan=gov.nasa.pds.api.registry.controller
springdoc.pathsToMatch=/**
server.forward-headers-strategy=framework
management.endpoints.web.exposure.include=*
spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
springfox.documentation.enabled=false


debug=true
logging.level.root = DEBUG
Expand Down
17 changes: 17 additions & 0 deletions support/provenance/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@


Build the docker image:

docker build -t nasapds/registry-sweepers .

Push it to docker hub (for integration tests):

docker push nasapds/registry-sweepers

Run it:

docker run -e PROV_ENDPOINT='https://elasticsearch:9200/' -e PROV_CREDENTIALS='{"admin": "admin"}' nasapds/registry-sweepers

With:
- PROV_ENDPOINT: the URL to the OpenSearch web server
- PROV_CREDENTIALS: the credentials for the OpenSearch connection as a JSO string, for example `{"username1": "secret_password"}`