Merge branch 'develop'

NASA-AMMOS · Feb 27, 2024 · 71dac06 · 71dac06
2 parents fbb0113 + b6b450a
commit 71dac06
Show file tree

Hide file tree

Showing 189 changed files with 164,942 additions and 75,775 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,43 @@
+---
+name: Bug Report
+about: Report a bug to help us improve
+title: '[Bug]: '
+labels: 'bug'
+assignees: ''
+
+---
+
+**Checked for duplicates**
+
+> Have you checked for duplicate issue tickets?
+
+- Ex. Yes - I've already checked
+- Ex. No - I haven't checked
+
+**Describe the bug**
+
+> A clear and concise description of what the bug is. Plain-text snippets preferred but screenshots welcome.
+
+Ex. When I did [...] action, I noticed [...]
+
+**What did you expect?**
+
+> A clear and concise description of what you expect to happen
+
+Ex. I expected [...]
+
+**Reproducible steps**
+
+> How would we reproduce this bug? Please walk us through it step by step. Plain-text snippets preferred but screenshots welcome.
+
+1.
+2.
+3.
+
+**What is your environment?**
+
+> Include any computer hardware, operating system, framework, browser, time-of-day or other contextual information related to your issue
+
+- Ex. Version of this software [e.g. vX.Y.Z]
+- Ex. Operating System: [e.g. MacOSX with Docker Desktop vX.Y]
+- ...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,34 @@
+---
+name: New Feature
+about: Suggest a new feature for us to implement
+title: '[New Feature]: '
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Checked for duplicates**
+
+> Have you checked for duplicate issue tickets?
+
+- Ex. Yes - I've already checked
+- Ex. No - I haven't checked
+
+**Alternatives considered**
+
+> Have you considered alternative solutions to your feature request?
+
+- Ex. Yes - and alternatives don't suffice
+- Ex. No - I haven't considered
+
+**Related problems**
+
+> Is your feature request related to any problems? Please help us understand if so, including linking to any other issue tickets.
+
+Ex. I'm frustrated when [...] happens as documented in issue-XYZ
+
+**Describe the feature request**
+
+> A clear and concise description of your request. 
+
+Ex. I need or want [...]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+## Purpose
+- Clear, easy-to-understand sentences outlining the purpose of the PR
+## Proposed Changes
+- [ADD] ...
+- [CHANGE] ...
+- [FIX] ...
+## Issues
+- Links to relevant issues
+- Example: issue-XYZ
+## Testing
+- Provide some proof you've tested your changes 
+- Example: test results available at ...
+- Example: tested on operating system ...
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -22,7 +22,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
 
 - [**Services**](https://docs.github.com/en/actions/using-containerized-services/about-service-containers):
   - MariaDB
-    - Image: mariadb:10.3
+    - Image: mariadb:10.6
     - Ports: 3306:3306
 - [**checkout**](https://github.com/marketplace/actions/checkout): This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
 - Set up JDK 11:
@@ -37,7 +37,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
 - **Download Logstash**:
   - [**download-file-action**](https://github.com/marketplace/actions/download-file-to-workspace): This action downloads a file from the internet into the workspace
     - Downloads Logstash using a URL
-    - Renames the file as `logstash-8.8.0.zip`
+    - Renames the file as `logstash-8.12.0.zip`
     - Stores Logstash in appropriate directory
 - **Check for Logstash**:
   - List files in the directory where Logstash is expected

diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml
@@ -21,7 +21,7 @@ jobs:
 
     services:
       mdb103:
-        image: mariadb:10.3
+        image: mariadb:10.6
         ports:
           - 3306:3306
         env:
@@ -31,12 +31,12 @@ jobs:
           --name mdb103
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 
@@ -46,11 +46,18 @@ jobs:
           chmod +x generate-certs.sh
           ./generate-certs.sh
 
+      - name: Set up Keystore storepass
+        run: |
+          mkdir ~/.cws/
+          chmod 700 ~/.cws/
+          echo ${{ secrets.KEYSTORE_PASSWORD }} > ~/.cws/creds
+          chmod 600 ~/.cws/creds
+
       - name: Download Logstash
         uses: carlosperate/download-file-action@v1
         with:
-          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
-          file-name: logstash-8.8.0.zip
+          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
+          file-name: logstash-8.12.0.zip
           location: install/logging/
 
       - name: Check for Logstash
@@ -78,7 +85,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -100,22 +107,22 @@ jobs:
         shell: bash
 
       - name: Upload Jacoco report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
           path: jacoco-reports/aggregate/index.html
 
       - name: Upload test screenshots
         if: ${{ always() && steps.build.outcome == 'success' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-screenshots
           path: test-screenshots/
 
       - name: Send custom JSON data to Slack workflow
         if: ${{ always() && contains(env.TEAM, github.actor) }}
         id: slack
-        uses: slackapi/slack-github-action@v1.19.0
+        uses: slackapi/slack-github-action@v1.25.0
         with:
           # This data can be any valid JSON from a previous step in the GitHub Action
           payload: |
@@ -144,7 +151,7 @@ jobs:
 
     services:
       mdb103:
-        image: mariadb:10.3
+        image: mariadb:10.6
         ports:
           - 3306:3306
         env:
@@ -154,12 +161,12 @@ jobs:
           --name mdb103
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 
@@ -169,11 +176,18 @@ jobs:
           chmod +x generate-certs.sh
           ./generate-certs.sh
 
+      - name: Set up Keystore storepass
+        run: |
+          mkdir ~/.cws/
+          chmod 700 ~/.cws/
+          echo ${{ secrets.KEYSTORE_PASSWORD }} > ~/.cws/creds
+          chmod 600 ~/.cws/creds
+
       - name: Download Logstash
         uses: carlosperate/download-file-action@v1
         with:
-          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
-          file-name: logstash-8.8.0.zip
+          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
+          file-name: logstash-8.12.0.zip
           location: install/logging/
 
       - name: Check for Logstash
@@ -201,7 +215,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -219,15 +233,15 @@ jobs:
 
       - name: Upload test screenshots
         if: ${{ always() && steps.build.outcome == 'success' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-screenshots-advanced
           path: test-screenshots/
 
       - name: Send custom JSON data to Slack workflow
         if: ${{ always() && contains(env.TEAM, github.actor) }}
         id: slack
-        uses: slackapi/slack-github-action@v1.19.0
+        uses: slackapi/slack-github-action@v1.25.0
         with:
           # This data can be any valid JSON from a previous step in the GitHub Action
           payload: |
@@ -255,10 +269,10 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'

diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml
@@ -21,7 +21,7 @@ jobs:
 
     services:
       mdb103:
-        image: mariadb:10.3
+        image: mariadb:10.6
         ports:
           - 3306:3306
         env:
@@ -31,12 +31,12 @@ jobs:
           --name mdb103
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
 
@@ -46,11 +46,18 @@ jobs:
           chmod +x generate-certs.sh
           ./generate-certs.sh
 
+      - name: Set up Keystore storepass
+        run: |
+          mkdir ~/.cws/
+          chmod 700 ~/.cws/
+          echo ${{ secrets.KEYSTORE_PASSWORD }} > ~/.cws/creds
+          chmod 600 ~/.cws/creds
+
       - name: Download Logstash
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
-          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.8.0-windows-x86_64.zip
-          file-name: logstash-8.8.0.zip
+          file-url: https://artifacts.elastic.co/downloads/logstash/logstash-8.12.0-windows-x86_64.zip
+          file-name: logstash-8.12.0.zip
           location: install/logging/
 
       - name: Check for Logstash
@@ -83,7 +90,7 @@ jobs:
 
       - name: Show CWS Log
         run: |
-          cd dist/console-only/cws/server/apache-tomcat-9.0.72/logs
+          cd dist/console-only/cws/server/apache-tomcat-9.0.75/logs
           ls -al
 
       - name: Set up Google Chrome
@@ -102,7 +109,7 @@ jobs:
       - name: Send custom JSON data to Slack workflow
         if: ${{ always() && contains(env.TEAM, github.actor) }}
         id: slack
-        uses: slackapi/slack-github-action@v1.19.0
+        uses: slackapi/slack-github-action@v1.25.0
         with:
           # This data can be any valid JSON from a previous step in the GitHub Action
           payload: |

diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,4 @@ install/logging/logstash-*.zip
 /jacoco-reports
 /test-screenshots
 
-*.cnf
+*.cnf
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. 
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [X.Y.Z](https://github.com/NASA-AMMOS/<repo_name>/releases/tag/X.Y.Z) - 2023-MM-DD
+
+### Added 
+
+- 
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ install/logging/logstash-*.zip @@
     /jacoco-reports
     /test-screenshots
-    *.cnf
+    *.cnf