add search-service (#6569)

* add search-service

* add restricter url config

* update search service

* add search service to image build

* update search service caddy config

* update localprod config

* change search service host env var name

* update services to feature branches

* update search service

* update services

* Update restricter URL

* Update search service env

* Don't update submods in this branch

* Revert proxy changes - it is now a separate repo

* Add search as default target in build.sh

* Properly add search submod

not really sure what was wrong before ...

* Increase wait time in test action

---------

Co-authored-by: Bastian Rihm <Bastian Rihm brihm@intevation.de>
Co-authored-by: Adrian Richter <adrian@intevation.de>

.github/workflows/build-images.yml

@@ -23,6 +23,7 @@ jobs:
           - name: datastore-writer
           - name: autoupdate
           - name: auth
+          - name: search
           - name: vote
           - name: icc
           - name: media

.github/workflows/test-integration.yml

@@ -19,7 +19,7 @@ jobs:
         uses: iFaxity/wait-on-action@v1
         with:
           resource: https://localhost:8000
-          timeout: 300000
+          timeout: 900000
 
       - name: Start tests
         working-directory: "./openslides-client"

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "openslides-proxy"]
 	path = openslides-proxy
 	url = https://github.com/OpenSlides/openslides-proxy.git
+[submodule "openslides-search-service"]
+	path = openslides-search-service
+	url = https://github.com/OpenSlides/openslides-search-service.git

dev/docker/build.sh

@@ -10,6 +10,7 @@ TARGETS=(
   [backend]="$HOME/openslides-backend/"
   [auth]="$HOME/openslides-auth-service/"
   [autoupdate]="$HOME/openslides-autoupdate-service/"
+  [search]="$HOME/openslides-search-service/"
   [manage]="$HOME/openslides-manage-service/"
   [datastore-reader]="$HOME/openslides-datastore-service/reader"
   [datastore-writer]="$HOME/openslides-datastore-service/writer"
@@ -26,7 +27,7 @@ DOCKER_TAG="$(cat VERSION)"
 CONFIG="/etc/osinstancectl"
 OPTIONS=()
 BUILT_IMAGES=()
-DEFAULT_TARGETS=(proxy client backend auth autoupdate manage datastore-reader datastore-writer media vote icc)
+DEFAULT_TARGETS=(proxy client backend auth autoupdate manage datastore-reader datastore-writer media vote icc search)
 ASK_PUSH=
 OPT_YES=
 OPT_IMAGES=

dev/docker/docker-compose.dev.yml

@@ -107,6 +107,21 @@ services:
     ports:
       - "9007:9007"
 
+  search:
+    image: openslides-search-dev
+    depends_on:
+      - autoupdate
+      - backend
+      - postgres
+    env_file: services.env
+    environment:
+      - OPENSLIDES_DEVELOPMENT=1
+    volumes:
+      - ../../openslides-search-service/cmd:/root/cmd
+      - ../../openslides-search-service/pkg:/root/pkg
+    ports:
+      - "9050:9050"
+
   auth:
     image: openslides-auth-dev
     depends_on:

dev/docker/services.env

@@ -18,6 +18,10 @@ PRESENTER_PORT=9003
 AUTOUPDATE_HOST=autoupdate
 AUTOUPDATE_PORT=9012
 
+SEARCH_HOST=search
+SEARCH_PORT=9050
+RESTRICTER_URL=http://autoupdate:9012/internal/autoupdate
+
 AUTH_HOST=auth
 AUTH_PORT=9004
 CACHE_HOST=redis

dev/localprod/config.yml

@@ -54,6 +54,9 @@ services:
   icc:
     additionalContent:
       build: ../../openslides-icc-service/
+  search:
+    additionalContent:
+      build: ../../openslides-search-service/
   manage:
     additionalContent:
       build: ../../openslides-manage-service/