Merge branch 'dev' into main

AAFC-BICoE · Oct 2, 2024 · 2c5d9f7 · 2c5d9f7
2 parents bea9183 + 2551707
commit 2c5d9f7
Show file tree

Hide file tree

Showing 12 changed files with 464 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
           mvn help:evaluate -Dexpression=project.version -q -DforceStdout > version.txt
       - name: Store artifacts
         if: ${{ github.ref == 'refs/heads/main' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: |
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Download artifacts from build job
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
 

diff --git a/...l/elastic-configurator-settings/collection-index/dina_material_sample_index_settings.json b/...l/elastic-configurator-settings/collection-index/dina_material_sample_index_settings.json
@@ -325,6 +325,30 @@
                     }
                   }
                 }
+              },
+              "preparedBy": {
+                "properties": {
+                  "data": {
+                    "properties": {
+                      "type": {
+                        "type": "constant_keyword",
+                        "value": "person"
+                      }
+                    }
+                  }
+                }
+              },
+              "parentMaterialSample": {
+                "properties": {
+                  "data": {
+                    "properties": {
+                      "type": {
+                        "type": "constant_keyword",
+                        "value": "material-sample"
+                      }
+                    }
+                  }
+                }
               }
             }
           }

diff --git a/owasp-suppression.xml b/owasp-suppression.xml
@@ -10,7 +10,7 @@
     </suppress>
     <suppress>
         <notes>CVE about Keycloak Server</notes>
-        <cve>CVE-2021-3827</cve>
+        <cve>CVE-2024-7341</cve>
     </suppress>
     <suppress>
         <notes>no untrusted source</notes>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.aafc-bicoe</groupId>
   <artifactId>search-api-parent</artifactId>
-  <version>0.35</version>
+  <version>0.36</version>
 
   <packaging>pom</packaging>
 

diff --git a/search-cli/pom.xml b/search-cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>search-api-parent</artifactId>
     <groupId>io.github.aafc-bicoe</groupId>
-    <version>0.35</version>
+    <version>0.36</version>
   </parent>
 
   <artifactId>search-cli</artifactId>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.github.aafc-bicoe</groupId>
       <artifactId>search-messaging</artifactId>
-      <version>0.35</version>
+      <version>0.36</version>
     </dependency>
 
     <dependency>

diff --git a/search-cli/src/main/resources/endpoints.yml b/search-cli/src/main/resources/endpoints.yml
@@ -28,7 +28,9 @@ endpoints:
       - projects
       - hierarchy
       - storageUnitUsage
+      - parentMaterialSample
     relationshipsType:
+      - person
       - collecting-event
   metadata:
     indexName: dina_object_store_index

diff --git a/search-cli/src/test/java/ca/gc/aafc/dina/search/cli/TestConstants.java b/search-cli/src/test/java/ca/gc/aafc/dina/search/cli/TestConstants.java
@@ -8,9 +8,12 @@ public interface TestConstants {
 
   String AGENT_INDEX_MAPPING_FILE = "es-mapping/dina_agent_index_settings.json";
   String OBJECT_STORE_INDEX_MAPPING_FILE = "es-mapping/dina_object_store_index_settings.json";
+  String MATERIAL_SAMPLE_INDEX_MAPPING_FILE = "es-mapping/dina_material_sample_index_settings.json";
 
   String AGENT_INDEX = "dina_agent_index";
   String OBJECT_STORE_INDEX = "dina_object_store_index";
+  String MATERIAL_SAMPLE_INDEX = "dina_material_sample_index";
+
   String PERSON_TYPE = "person";
   String ORGANIZATION_TYPE = "organization";
 

diff --git a/search-cli/src/test/java/ca/gc/aafc/dina/search/cli/messaging/DocumentProcessorIT.java b/search-cli/src/test/java/ca/gc/aafc/dina/search/cli/messaging/DocumentProcessorIT.java
@@ -86,9 +86,10 @@ public void reIndexRelatedDocuments() {
         TestConstants.PERSON_DOCUMENT_TYPE, TestConstants.PERSON_DOCUMENT_ID,
         List.of(Pair.of("include", "organizations")), TestConstants.PERSON_RESPONSE_PATH);
 
-    // Create the agent index
+    // Create the indices
     ca.gc.aafc.dina.testsupport.elasticsearch.ElasticSearchTestUtils.createIndex(elasticSearchClient, TestConstants.AGENT_INDEX, TestConstants.AGENT_INDEX_MAPPING_FILE);
     ca.gc.aafc.dina.testsupport.elasticsearch.ElasticSearchTestUtils.createIndex(elasticSearchClient, TestConstants.OBJECT_STORE_INDEX, TestConstants.OBJECT_STORE_INDEX_MAPPING_FILE);
+    ca.gc.aafc.dina.testsupport.elasticsearch.ElasticSearchTestUtils.createIndex(elasticSearchClient, TestConstants.MATERIAL_SAMPLE_INDEX, TestConstants.MATERIAL_SAMPLE_INDEX_MAPPING_FILE);
 
     // index a metadata to trigger dynamic mapping
     ca.gc.aafc.dina.testsupport.elasticsearch.ElasticSearchTestUtils.indexDocument(elasticSearchClient, TestConstants.OBJECT_STORE_INDEX, "2",