Partial implementation with Opensearch serverless

.github/workflows/branch-cicd.yaml

@@ -17,6 +17,7 @@ on:
         branches:
             -   '**'
             -   '!main'
+            -   '!develop'
 
     workflow_dispatch:
 

.github/workflows/unstable-cicd.yaml

@@ -32,7 +32,7 @@ name: 🤪 Unstable integration & delivery
 on:
     push:
         branches:
-             - main
+             - develop
     workflow_dispatch:
 concurrency: roundup
 

.gitignore

@@ -83,6 +83,7 @@ target/
 lexer/target
 service/target
 model/target
+application-*.properties
 
 # macOS specific stuff
 .DS_Store

docker/Dockerfile

@@ -76,14 +76,14 @@ RUN : &&\
 #
 # External context.
 
+ARG SERVER_PORT=80
+ARG SPRING_BOOT_APP_ARGS=" "
+ARG JAVA_OPTS="-Xmx6144m -Xms512Mb"
+
 WORKDIR /usr/local/registry-api-service
-EXPOSE  80
-CMD     [ \
-    "java",  "-Xmx6144m", \
-    "-Xms", "512Mb", \
-    "-jar", "/usr/local/registry-api-service/registry-api-service.jar", \
-    "gov.nasa.pds.api.registry.SpringBootMain" \
-]
+EXPOSE  ${SERVER_PORT}
+CMD java $JAVA_OPT -jar /usr/local/registry-api-service/registry-api-service.jar \
+    gov.nasa.pds.api.registry.SpringBootMain --server.port=${SERVER_PORT} ${SPRING_BOOT_APP_ARGS}
 
 
 # Labels

docker/README.md

@@ -2,18 +2,22 @@
 
 There's one Dockerfile here that can be used to make images for development and production.
 
-👉 **Note:** It's a security risk to include private keys in images. As a result, we've removed the old `Dockerfile.https` and `Dockerfile.https.dev`. We've also removed all the other `Dockerfile.*` files to eliminate confusion, except for `Dockerfile.local`; see below.
+
+## Build the image 
 
 To build an image, run:
 
+
+    cd ./service
     docker image build --build-arg api_jar=URL --tag [OWNER/]registry-api-service:TAG .
+
 
 Replace `URL` with the URL (or relative file path) to a `registry-api-service.jar` and `TAG` with the desired version tag. You can add `OWNER/` to tag the image for a specific owner, such as `nasapds/`.
 
 The GitHub Actions configured in this repository automatically make images after each `stable-cicd.yaml` workflow (with a `:X.Y.Z` tag) and `unstable-cicd.yaml` workflow (with a `:latest` tag) and publishes them to the Docker Hub.
 
 
-## 🧱 Example Builds
+## 🧱 Examples
 
 Building a local image:
 ```console
@@ -28,9 +32,25 @@ Building an image from a released jar file:
 $ docker image build --build-arg api_jar=https://github.com/NASA-PDS/registry-api/releases/download/v1.0.0/registry-api-service-1.0.0.jar --tag nasapds/registry-api-service:1.0.0 --file docker/Dockerfile .
 ```
 
-## 📍 Dockerfile.aws
+## Run the image
+
+
+For a local deployment simply do:
+
+docker run -t -i -e SERVER_PORT=8082 -p 8082:8082 [OWNER/]registry-api-service:TAG 
+
+
+The same image can be used to run in multiple environments by passing arguments at the service start up, through environment variables. The provided options can override the `application.properties` configuration of the application. The server port needs to define a specific environment variable and match -p option of the docker run.
+
+For example on AWS, with OpenSearch serverless as a back-end:
+
+    SPRING_BOOT_APP_ARGS=--openSearch.host=<your opensearch serverless URL> --openSearch.CCSEnabled=true --openSearch.username="" --openSearch.disciplineNodes=atm-delta,en-delta --registry.service.version=1.5.0-SNAPSHOT
+    SERVER_PORT=80
+
+
+
+
 
-This Dockerfile is used to make images for AWS deployments of the registry manager. It copies in an AWS-specific application.properties file which has been setup to inform the service to obtain certain properties as environment variable values that have been injected by the Elastic Container Service (ECS) runtime. An example of this is the Opensearch credentials from the Secrets Manager.
 
 ## 📍 Dockerfile.local
 

lexer/src/main/antlr4/gov/nasa/pds/api/registry/lexer/Search.g4

@@ -7,7 +7,7 @@ expression : andStatement | orStatement | queryTerm ;
 andStatement : queryTerm (AND queryTerm)+ ;
 orStatement : queryTerm (OR queryTerm)+ ;
 comparison : FIELD operator ( NUMBER | STRINGVAL ) ;
-likeComparison : FIELD NOT? LIKE STRINGVAL ;
+likeComparison : FIELD LIKE STRINGVAL ;
 operator : EQ | NE | GT | GE | LT | LE ;
 
 NOT : 'not' ;