Shellcheck

.github/workflows/debug-workflow.yml

@@ -1,12 +1,12 @@
-on: push
+on: deployment
 
 jobs:
   test-job:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Test
-        run: echo "Hey"
       - name: Test actions
-        uses: Janmtbehrens/OpenSlides/dev/actions/test-submodule@main
+        uses: Janmtbehrens/OpenSlides/dev/actions/build-and-test-service@all-in-one
+        with:
+          service: auth

.github/workflows/pick-to-staging.yml

@@ -63,4 +63,3 @@ jobs:
           reviewers: ${{ github.event.pull_request.user.login }}
           assignees: ${{ github.event.pull_request.user.login }}
           labels: picked-to-staging
-          milestone: 4

Makefile

@@ -21,7 +21,7 @@ run-dev-otel: | build-dev
 build-dev:
 	sed -i "1s/.*/$(GO_VERSION)/" $(DOCKER_PATH)/workspaces/*.work
 	chmod +x $(SCRIPT_PATH)/makefile/build-all-submodules.sh
-	$(SCRIPT_PATH)/makefile/build-all-submodules.sh
+	$(SCRIPT_PATH)/makefile/build-all-submodules.sh dev
 
 # Run the tests of all services
 run-service-tests:

VERSION

@@ -1 +1 @@
-4.2.8-dev
+4.2.14

dev/actions/build-and-test-service/action-run.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bash dev/run-tests.sh
+

dev/actions/build-and-test-service/action.yml

@@ -0,0 +1,19 @@
+name: 'Build and run service tests'
+description: 'Build test context image and runs all tests of service.'
+
+inputs:
+  service:  
+    description: 'Name of the service. Examples: proxy, auth, datastore'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+      - name: "Build Test"
+        uses: Janmtbehrens/OpenSlides/dev/actions/build-service@all-in-one
+        with:
+          service: ${{ inputs.service }} 
+          context: tests
+      - name: "Test Service"
+        shell: bash
+        run: bash $GITHUB_ACTION_PATH/action-run.sh

dev/actions/build-service/action-run.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 
-printenv
-
-chmod +x ${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh
-${GITHUB_ACTION_PATH}/../../scripts/makefile/build-service.sh ${SERVICE} ${CONTEXT} ${MODULE} ${PORT}
+chmod +x "${GITHUB_ACTION_PATH}"/../../scripts/makefile/build-service.sh
+"${GITHUB_ACTION_PATH}"/../../scripts/makefile/build-service.sh "${SERVICE}" "${CONTEXT}" "${MODULE}" "${PORT}"

dev/docker/build.sh

@@ -37,7 +37,7 @@ OPT_IMAGES=
 
 usage() {
   cat << EOF
-Usage: $(basename ${BASH_SOURCE[0]}) [<options>] <service>...
+Usage: $(basename "${BASH_SOURCE[0]}") [<options>] <service>...
 
 Options:
   -D, --docker-repo  Specify a Docker repository
@@ -58,8 +58,8 @@ fi
 
 shortopt="hr:D:t:"
 longopt="help,docker-repo:,tag:,no-cache,ask-push,yes,images"
-ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@")
-if [ $? -ne 0 ]; then usage; exit 1; fi
+ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@") || { usage; exit 1; }
+
 eval set -- "$ARGS";
 unset ARGS
 
@@ -75,7 +75,7 @@ while true; do
       shift 2
       ;;
     --no-cache)
-      OPTIONS+="--no-cache"
+      OPTIONS+=("--no-cache")
       shift 1
       ;;
     --ask-push)
@@ -96,9 +96,8 @@ while true; do
   esac
 done
 
-SELECTED_TARGETS=($@)
-[[ "${#SELECTED_TARGETS[@]}" -ge 1 ]] || SELECTED_TARGETS=("${DEFAULT_TARGETS[@]}")
-[[ "${SELECTED_TARGETS[@]}" != "all" ]] || SELECTED_TARGETS=("${!TARGETS[@]}")
+SELECTED_TARGETS=("$@")
+if [ "$#" == 0 ]; then SELECTED_TARGETS=("${DEFAULT_TARGETS[@]}"); elif [ "$*" = "all" ]; then SELECTED_TARGETS=("${!TARGETS[@]}"); fi
 
 OPTIONS+=(--build-arg "VERSION=$DOCKER_TAG")
 
@@ -122,7 +121,7 @@ for i in "${SELECTED_TARGETS[@]}"; do
   fi
 
   echo "Building $img..."
-  cd $loc
+  cd "$loc" || exit 1
   {
     printf '{\n'
     printf '\t"service": "%s,\n' "${i}"
@@ -152,7 +151,7 @@ if [[ "${#BUILT_IMAGES[@]}" -ge 1 ]]; then
   printf "\nSuccessfully built images:\n\n"
   for i in "${BUILT_IMAGES[@]}"; do
     read -r img x <<< "$i"
-    printf "  - $img\n"
+    printf "  - %s\n" "$img"
   done
 else
   echo "No images were built."
@@ -161,27 +160,27 @@ fi
 
 [[ -n "$ASK_PUSH" ]] || exit 0
 
-if [ -n $OPT_YES ] || ! hash whiptail > /dev/null 2>&1; then
+if [ -n "$OPT_YES" ] || ! hash whiptail > /dev/null 2>&1; then
   echo
   for i in "${BUILT_IMAGES[@]}"; do
     read -r img x <<< "$i"
-    if [ -n $OPT_YES ]; then
+    if [ -n "$OPT_YES" ]; then
       REPL=y
     else
-      read -p "Push image '$img' to repository? [Y/n] " REPL
+      read -r -p "Push image '$img' to repository? [Y/n] " REPL
     fi
     case "$REPL" in
       N|n|No|no|NO) exit 0;;
       *) docker push "$img" ;;
     esac
   done
 else
-  while read img; do
+  while read -r img; do
     echo "Pushing ${img}."
     docker push "$img"
   done < <( whiptail --title "OpenSlides build script" \
     --checklist "Select images to push to their registry." \
     25 78 16 --separate-output --noitem --clear \
-    ${BUILT_IMAGES[@]} \
+    "${BUILT_IMAGES[@]}" \
     3>&2 2>&1 1>&3 )
 fi

dev/docker/docker-compose.dev.yml

@@ -1,6 +1,13 @@
 version: "3"
 services:
   datastore-reader:
+    build:
+        context: ../../openslides-datastore-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
+            MODULE: "reader"
+            PORT: "9010"
     image: openslides-datastore-reader-dev
     depends_on:
       - postgres
@@ -15,6 +22,13 @@ services:
       - 5680:5678
 
   datastore-writer:
+    build:
+        context: ../../openslides-datastore-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
+            MODULE: "writer"
+            PORT: "9011"
     image: openslides-datastore-writer-dev
     depends_on:
       - postgres
@@ -37,6 +51,11 @@ services:
       - POSTGRES_DB=openslides
 
   client:
+    build:
+        context: ../../openslides-client
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-client-dev
     env_file: services.env
     environment:
@@ -46,6 +65,11 @@ services:
       - ../../openslides-client/client/cli:/app/cli
 
   backend:
+    build:
+        context: ../../openslides-backend
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-backend-dev
     depends_on:
       - datastore-reader
@@ -77,6 +101,11 @@ services:
       - ../../openslides-backend/scripts:/app/scripts
 
   autoupdate:
+    build:
+        context: ../../openslides-autoupdate-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-autoupdate-dev
     depends_on:
       - datastore-reader
@@ -95,6 +124,11 @@ services:
       - "9012:9012"
 
   icc:
+    build:
+        context: ../../openslides-icc-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-icc-dev
     depends_on:
       - datastore-reader
@@ -112,6 +146,11 @@ services:
       - "9007:9007"
 
   search:
+    build:
+        context: ../../openslides-search-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-search-dev
     depends_on:
       - autoupdate
@@ -129,6 +168,11 @@ services:
       - "9050:9050"
 
   auth:
+    build:
+        context: ../../openslides-auth-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-auth-dev
     depends_on:
       - datastore-reader
@@ -142,6 +186,11 @@ services:
       - "9004:9004"
 
   media:
+    build:
+        context: ../../openslides-media-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-media-dev
     depends_on:
       - backend
@@ -153,6 +202,11 @@ services:
       - ../../openslides-media-service/src:/app/src
 
   manage:
+    build:
+        context: ../../openslides-manage-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-manage-dev
     depends_on:
       - auth
@@ -169,6 +223,11 @@ services:
       - "6379:6379"
 
   proxy:
+    build:
+        context: ../../openslides-proxy
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-proxy-dev
     depends_on:
       - client
@@ -185,6 +244,11 @@ services:
       - "8025:8025" # web ui to check mails manually
 
   vote:
+    build:
+        context: ../../openslides-vote-service
+        target: "dev"
+        args:
+            CONTEXT: "dev"
     image: openslides-vote-dev
     depends_on:
       - auth

dev/scripts/co-branch.sh

@@ -24,7 +24,7 @@ set_remote() {
 }
 
 verify_branch() {
-  git fetch $REMOTE_NAME
+  git fetch "$REMOTE_NAME"
   git rev-parse --verify remotes/"$REMOTE_NAME"/"$BRANCH_NAME" &>/dev/null || BRANCH_NAME=main
 }
 
@@ -35,8 +35,8 @@ pull_latest_commit() {
     git checkout "$REMOTE_NAME/$BRANCH_NAME"
   else
     echo "git checkout $BRANCH_NAME && git pull --ff-only $REMOTE_NAME $BRANCH_NAME ..."
-    git checkout "$BRANCH_NAME" &&
-    git pull --ff-only "$REMOTE_NAME" "$BRANCH_NAME" || {
+    { git checkout "$BRANCH_NAME" &&
+    git pull --ff-only "$REMOTE_NAME" "$BRANCH_NAME"; } || {
       echo "ERROR: make sure a local branch $BRANCH_NAME exists and can be fast-forwarded to $REMOTE_NAME"
       exit 1
     }
@@ -46,10 +46,10 @@ pull_latest_commit() {
 run_switch () {
     # First check for changes and stash them if wanted.
     echo "Check for changes..."
-    if [[ `git status --porcelain --ignore-submodules --untracked-files=no` ]]; then
+    if [[ $(git status --porcelain --ignore-submodules --untracked-files=no) ]]; then
         echo "The repository $mod has changes. Stash them? [y/n]"
-        read decision
-        if [ $decision == "y" ]; then
+        read -r decision
+        if [ "$decision" == "y" ]; then
             git stash
         else
             exit 0
@@ -59,10 +59,10 @@ run_switch () {
       (
         echo "Check for changes..."
         cd "$mod"
-        if [[ `git status --porcelain` ]]; then
+        if [[ $(git status --porcelain) ]]; then
             echo "The repository $mod has changes. Stash them? [y/n]"
-            read decision
-            if [ $decision == "y" ]; then
+            read -r decision
+            if [ "$decision" == "y" ]; then
                 git stash
             else
                 exit 0
@@ -88,8 +88,8 @@ if [ $# -eq 0 ]; then
     usage
     echo ""
     echo "Do you want to want to proceed with branch main in remote ${REMOTE_NAME}? [y/n]"
-    read sw
-    if [ $sw == "y" ]; then
+    read -r sw
+    if [ "$sw" == "y" ]; then
         run_switch
     fi
     exit 0

dev/scripts/db.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-cd "$(dirname $0)"
+cd "$(dirname "$0")" || exit 1
 docker compose -f ../docker/docker-compose.dev.yml exec datastore-writer psql postgresql://openslides:openslides@postgres/openslides

dev/scripts/dc-dev.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-cd "$(dirname $0)"
-docker compose -f ../docker/docker-compose.dev.yml $@
+cd "$(dirname "$0")" || exit 1
+docker compose -f ../docker/docker-compose.dev.yml "$@"