Merge branch 'master' into Support-35726-Exclude-seqdb-legacy-fields-…

…from-the-index
AAFC-BICoE · Feb 25, 2025 · 43e72b8 · 43e72b8
2 parents e61ba36 + 836e999
commit 43e72b8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 28 deletions.
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
@@ -81,7 +81,7 @@ services:
         condition: service_completed_successfully 
 
   collection-api:
-    image: aafcbicoe/natural-history-collection-api:0.100
+    image: aafcbicoe/natural-history-collection-api:0.101
     environment:
       keycloak.enabled: "true"
       keycloak.auth-server-url: ${KEYCLOAK_INTERNAL_URL}
@@ -134,7 +134,7 @@ services:
         condition: service_completed_successfully 
 
   dina-user-api:
-    image: aafcbicoe/dina-user-api:0.19
+    image: aafcbicoe/dina-user-api:0.20
     profiles: ["user_api"]
     mem_limit: 512m
     environment:
@@ -193,7 +193,7 @@ services:
         condition: service_completed_successfully 
 
   dina-export-api:
-    image: aafcbicoe/dina-export-api:0.14
+    image: aafcbicoe/dina-export-api:0.15
     profiles: ["export_api"]
     mem_limit: 512m
     environment:

diff --git a/elastic-configurator-settings/collection-index/dina_material_sample_index_settings.json b/elastic-configurator-settings/collection-index/dina_material_sample_index_settings.json
@@ -2,7 +2,8 @@
   "settings": {
     "index": {
       "number_of_shards": "1",
-      "number_of_replicas": "1"
+      "number_of_replicas": "1",
+      "mapping.total_fields.limit": 1500
     }
   },
   "mappings": {

diff --git a/elastic-configurator-settings/collection-index/dina_material_sample_update_index.json b/elastic-configurator-settings/collection-index/dina_material_sample_update_index.json
@@ -21,6 +21,14 @@
     "data.attributes.managedAttributes.seq_db_legacy": {
       "type": "text",
       "enabled": false
+    "data.attributes.managedAttributes.sample_version": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
     },
     "included": {
       "type": "nested",

diff --git a/helm/config/elastic-configurator/collection-index/dina_material_sample_index_settings.json b/helm/config/elastic-configurator/collection-index/dina_material_sample_index_settings.json
@@ -2,7 +2,8 @@
   "settings": {
     "index": {
       "number_of_shards": "1",
-      "number_of_replicas": "1"
+      "number_of_replicas": "1",
+      "mapping.total_fields.limit": 1500
     }
   },
   "mappings": {

diff --git a/helm/config/elastic-configurator/collection-index/dina_material_sample_update_index.json b/helm/config/elastic-configurator/collection-index/dina_material_sample_update_index.json
@@ -21,6 +21,14 @@
     "data.attributes.managedAttributes.seq_db_legacy": {
       "type": "text",
       "enabled": false
+    "data.attributes.managedAttributes.sample_version": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
     },
     "included": {
       "type": "nested",

diff --git a/helm/config/keycloak/keycloak-dina-starter-realm.json b/helm/config/keycloak/keycloak-dina-starter-realm.json
@@ -427,17 +427,6 @@
           "clientRoles": {},
           "subGroups": []
         },
-        {
-          "id": "4ad80118-6317-4a3d-af07-a83a3edef5b3",
-          "name": "dina-admin",
-          "path": "/aafc/dina-admin",
-          "attributes": {},
-          "realmRoles": [
-            "dina-admin"
-          ],
-          "clientRoles": {},
-          "subGroups": []
-        },
         {
           "id": "a2597c35-e44d-44a5-82ca-07146675d7cf",
           "name": "user",

diff --git a/keycloak/keycloak-dina-starter-realm.json b/keycloak/keycloak-dina-starter-realm.json
@@ -427,17 +427,6 @@
           "clientRoles": {},
           "subGroups": []
         },
-        {
-          "id": "4ad80118-6317-4a3d-af07-a83a3edef5b3",
-          "name": "dina-admin",
-          "path": "/aafc/dina-admin",
-          "attributes": {},
-          "realmRoles": [
-            "dina-admin"
-          ],
-          "clientRoles": {},
-          "subGroups": []
-        },
         {
           "id": "a2597c35-e44d-44a5-82ca-07146675d7cf",
           "name": "user",
@@ -1314,7 +1303,7 @@
       "username": "dina-admin",
       "enabled": true,
       "realmRoles": ["dina-realm-user", "dina-admin"],
-      "groups": ["aafc/dina-admin"],
+      "groups": [],
       "credentials": [{ "type": "password", "value": "dina-admin" }],
       "attributes": {
         "agentId": "3c47203f-9833-4945-b673-ece4e3bd4f9a"