Merge main into stable/4.0.x. Update 20230906

* commit '9ca701b83a47b2b35cba4a6a85393d45e98807da': (96 commits) Update linear sort error messages (#1891) Use automation access token in repository_dispatch (#1890) fix key error in get_user_scope (#1887) Fix reachability of actions in dev mode (#1818) Catch internal auth password decoding error (#1817) Add check to forbid self vote delegation (#1875) Fix agenda item update (#1861) Fix delete user with poll candidate (#1872) Fix of a problem with calculated user/committee_ids (#1859) Add default to meeting/users_pdf_wlan_encryption (#1863) Add meeting_user_id to user.create action result (#1866) change saml_private_key type to text (#1860) Move additional model code to mixins (#1808) Add saml_id to the account import actions (#1821) Fix relation handling with calculated fields handler (#1839) Extend project automation Update GitHub actions (#1822) Fix for a key error problem in speaker create (#1838) Allow to set agenda item tags with agenda_tag_ids (#1832) Add two options to workflow import (#1833) ...
OpenSlides · Sep 6, 2023 · 91054a7 · 91054a7
2 parents a14f277 + 9ca701b
commit 91054a7
Show file tree

Hide file tree

Showing 244 changed files with 13,395 additions and 7,274 deletions.
diff --git a/.github/docker-compose/docker-compose.prod.yml b/.github/docker-compose/docker-compose.prod.yml
@@ -11,7 +11,7 @@ services:
             - DATASTORE_READER_PORT=9010
             - DATASTORE_WRITER_HOST=datastore-writer
             - DATASTORE_WRITER_PORT=9011
-            - DATASTORE_DATABASE_HOST=postgres
+            - DATABASE_HOST=postgres
         depends_on:
             - datastore-writer
             - datastore-reader
@@ -28,7 +28,7 @@ services:
             - DATASTORE_READER_PORT=9010
             - DATASTORE_WRITER_HOST=datastore-writer
             - DATASTORE_WRITER_PORT=9011
-            - DATASTORE_DATABASE_HOST=postgres
+            - DATABASE_HOST=postgres
         depends_on:
             - datastore-writer
             - datastore-reader
@@ -42,7 +42,7 @@ services:
                 PORT: "9010"
         image: openslides-datastore-reader
         environment:
-            - DATASTORE_DATABASE_HOST=postgres
+            - DATABASE_HOST=postgres
         ports:
             - "9010:9010"
         depends_on:
@@ -57,7 +57,7 @@ services:
                 PORT: "9011"
         image: openslides-datastore-writer
         environment:
-            - DATASTORE_DATABASE_HOST=postgres
+            - DATABASE_HOST=postgres
         ports:
             - "9011:9011"
         depends_on:

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -2,7 +2,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 'feature/**'
 
 env:
   PYTHON_VERSION: 3.10.x
@@ -16,7 +18,7 @@ jobs:
         working-directory: .github/docker-compose
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create secrets for datastore
       run: mkdir secrets && echo -n "openslides" > secrets/postgres_password
@@ -44,7 +46,7 @@ jobs:
     name: Build and test development docker image with Docker Compose
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Run tests
       run: dev/run-tests.sh
@@ -53,10 +55,10 @@ jobs:
     name: Check coding style
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ env.PYTHON_VERSION }}
 
@@ -86,10 +88,10 @@ jobs:
       PYTHONPATH: .
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ env.PYTHON_VERSION }}
 

diff --git a/.github/workflows/create-issue-for-file-updates.yml b/.github/workflows/create-issue-for-file-updates.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository_owner == 'OpenSlides'
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -42,14 +42,21 @@ jobs:
           OS_FILE_NAME: permission.yml
         with:
           filename: .github/workflows/announce-file-changes-template.md
-
+
+    steps:
+      - name: Generate access token
+        uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
       - name: Send dispatch if models.yml or permission.yml was changed
         if: |
           contains(steps.changed-files.outputs.modified_files, 'global/meta/models.yml') ||
           contains(steps.changed-files.outputs.modified_files, 'global/meta/permission.yml')
         uses: peter-evans/repository-dispatch@v2
         with:
           event-type: models-update
-          repository: OpenSlides/openslides-autoupdate-service
-          token: ${{ secrets.AUTOUPDATE_ACCESS_TOKEN }}
+          repository: ${{ github.repository_owner }}/openslides-autoupdate-service
+          token: ${{ steps.generate-token.outputs.token }}
           client-payload: '{"body": "Triggered by commit [${{ github.sha }}](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})"}'
diff --git a/.github/workflows/project-automation.yml b/.github/workflows/project-automation.yml
@@ -0,0 +1,32 @@
+name: Project automation
+on:
+  workflow_call:
+    inputs:
+      resource_node_id:
+        required: true
+        type: string
+      status_value:
+        required: true
+        type: string
+    secrets:
+      AUTOMATION_APP_ID:
+        required: true
+      AUTOMATION_APP_INSTALLATION_ID:
+        required: true
+      AUTOMATION_APP_PRIVATE_KEY:
+        required: true
+
+jobs:
+  workflow_call:
+    name: Set status
+    runs-on: ubuntu-latest
+    steps:
+      - uses: leonsteinhaeuser/[email protected]
+        with:
+          gh_app_ID: ${{ secrets.AUTOMATION_APP_ID }}
+          gh_app_installation_ID: ${{ secrets.AUTOMATION_APP_INSTALLATION_ID }}
+          gh_app_secret_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
+          organization: OpenSlides
+          project_id: 2
+          resource_node_id: ${{ inputs.resource_node_id }}
+          status_value: ${{ inputs.status_value }}
diff --git a/.github/workflows/project-issue-closed.yml b/.github/workflows/project-issue-closed.yml
@@ -0,0 +1,14 @@
+name: Project automation
+on:
+  issues:
+    types:
+      - closed
+
+jobs:
+  issue_closed:
+    name: Issue closed
+    uses: ./.github/workflows/project-automation.yml
+    secrets: inherit
+    with:
+      resource_node_id: ${{ github.event.issue.node_id }}
+      status_value: "Done"
diff --git a/.github/workflows/project-issue-opened.yml b/.github/workflows/project-issue-opened.yml
@@ -0,0 +1,15 @@
+name: Project automation
+on:
+  issues:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  issue_opened:
+    name: Issue opened
+    uses: ./.github/workflows/project-automation.yml
+    secrets: inherit
+    with:
+      resource_node_id: ${{ github.event.issue.node_id }}
+      status_value: "Backlog"
diff --git a/.github/workflows/project-pull-request-closed.yml b/.github/workflows/project-pull-request-closed.yml
@@ -0,0 +1,14 @@
+name: Project automation
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  pull_request_closed:
+    name: Pull request closed
+    uses: ./.github/workflows/project-automation.yml
+    secrets: inherit
+    with:
+      resource_node_id: ${{ github.event.pull_request.node_id }}
+      status_value: "Done"
diff --git a/.github/workflows/project-pull-request-opened.yml b/.github/workflows/project-pull-request-opened.yml
@@ -0,0 +1,15 @@
+name: Project automation
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  pull_request_opened:
+    name: Pull request opened
+    uses: ./.github/workflows/project-automation.yml
+    secrets: inherit
+    with:
+      resource_node_id: ${{ github.event.pull_request.node_id }}
+      status_value: "Work in progress"
diff --git a/.github/workflows/project-pull-request-review-requested.yml b/.github/workflows/project-pull-request-review-requested.yml
@@ -0,0 +1,14 @@
+name: Project automation
+on:
+  pull_request_target:
+    types:
+      - review_requested
+
+jobs:
+  pull_request_review_requested:
+    name: Pull request review requested
+    uses: ./.github/workflows/project-automation.yml
+    secrets: inherit
+    with:
+      resource_node_id: ${{ github.event.pull_request.node_id }}
+      status_value: "Review in progress"
diff --git a/.github/workflows/set-project.yml b/.github/workflows/set-project.yml
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ test-unit-integration:
 check-all: validate-models-yml check-models check-initial-data-json check-example-data-json check-permissions
 
 validate-models-yml:
-	python cli/modelsvalidator/validate.py
+	python cli/validate.py
 
 generate-models:
 	python cli/generate_models.py $(MODELS_PATH)
@@ -55,7 +55,7 @@ run-debug:
 	OPENSLIDES_DEVELOPMENT=1 python -m openslides_backend
 
 pip-check:
-	pip-check
+	pip-check -H
 
 coverage:
 	pytest --cov --cov-report html