Merge branch 'feature/global-search' into 'main'

OpenSlides · Aug 31, 2023 · 1362993 · 1362993
2 parents 33c76ee + b993d18
commit 1362993
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,6 +25,3 @@ jobs:
 
     - name: go test
       run: go test -timeout 10s -race ./...
-
-    - name: go test for special system tests
-      run: OPENSLIDES_MANAGE_SERVICE_SYSTEM_TEST=true go test -timeout 300s -v pkg/client/system_test.go
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -239,6 +239,7 @@ func NewYmlConfig(configFiles [][]byte) (*YmlConfig, error) {
 		"autoupdate",
 		"auth",
 		"vote",
+		"search",
 		"redis",
 		"media",
 		"icc",

diff --git a/pkg/config/default-config.yml b/pkg/config/default-config.yml
@@ -36,6 +36,10 @@ defaultEnvironment:
   AUTH_HOST: auth
   AUTH_PORT: 9004
 
+  SEARCH_HOST: search
+  SEARCH_PORT: 9050
+  RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate
+
   VOTE_HOST: vote
   VOTE_PORT: 9013
 

diff --git a/pkg/config/default-docker-compose.yml b/pkg/config/default-docker-compose.yml
@@ -15,6 +15,7 @@ services:
       - backendAction
       - backendPresenter
       - autoupdate
+      - search
       - auth
       - media
       - icc
@@ -54,6 +55,7 @@ services:
       - backendAction
       - backendPresenter
       - autoupdate
+      - search
       - auth
       - media
       - icc
@@ -228,6 +230,30 @@ services:
   {{- end }}
 
 
+  {{- with .Services.search }}
+
+  search:
+    image: {{ .ContainerRegistry }}/openslides-search:{{ .Tag }}
+    {{- if checkFlag $.DisableDependsOn }}{{ else }}
+    depends_on:
+      - datastoreReader
+      - postgres
+      - autoupdate
+    {{- end }}
+    environment:
+      << : *default-environment
+      {{- with .Environment }}{{ marshalContent 6 . }}{{- end }}
+    networks:
+      - frontend
+      - data
+    secrets:
+      - auth_token_key
+      - auth_cookie_key
+      - postgres_password
+    {{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
+  {{- end }}
+
+
   {{- with .Services.auth }}
 
   auth:

diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
@@ -505,6 +505,9 @@ x-default-environment: &default-environment
   OPENSLIDES_LOGLEVEL: info
   PRESENTER_HOST: backendPresenter
   PRESENTER_PORT: "9003"
+  RESTRICTER_URL: http://autoupdate:9012/internal/autoupdate
+  SEARCH_HOST: search
+  SEARCH_PORT: "9050"
   SUPERADMIN_PASSWORD_FILE: /run/secrets/superadmin
   SYSTEM_URL: localhost:8000
   VOTE_DATABASE_HOST: postgres
@@ -523,6 +526,7 @@ services:
       - backendAction
       - backendPresenter
       - autoupdate
+      - search
       - auth
       - media
       - icc
@@ -547,6 +551,7 @@ services:
       - backendAction
       - backendPresenter
       - autoupdate
+      - search
       - auth
       - media
       - icc
@@ -663,6 +668,22 @@ services:
       - auth_cookie_key
       - postgres_password
 
+  search:
+    image: ghcr.io/openslides/openslides/openslides-search:latest
+    depends_on:
+      - datastoreReader
+      - postgres
+      - autoupdate
+    environment:
+      << : *default-environment
+    networks:
+      - frontend
+      - data
+    secrets:
+      - auth_token_key
+      - auth_cookie_key
+      - postgres_password
+
   auth:
     image: ghcr.io/openslides/openslides/openslides-auth:latest
     depends_on: