Merge branch 'main' into aap-64560

Author: hsong-rh

.github/workflows/sonar-pr.yml

@@ -24,11 +24,14 @@ on:
       - CI
     types:
       - completed
-permissions: read-all
 jobs:
   sonar-pr-analysis:
     name: SonarCloud PR Analysis
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
+      pull-requests: read
     if: |
       github.repository == 'ansible/eda-server' &&
       github.event.workflow_run.conclusion == 'success' && 
@@ -38,7 +41,7 @@ jobs:
 
       # Download coverage artifact from CI workflow
       - name: Download coverage artifact
-        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392  #v2.27.0 sonar cannot use official Github action: actions/download-artifact
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05  #v2.27.0 sonar cannot use official Github action: actions/download-artifact
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: CI
@@ -168,6 +171,9 @@ jobs:
   sonar-branch-analysis:
     name: SonarCloud Branch Analysis (Push)
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
     if: |
       github.event.workflow_run.conclusion == 'success' &&
       github.event.workflow_run.event == 'push' &&
@@ -177,7 +183,7 @@ jobs:
 
       # Download coverage artifact from CI workflow
       - name: Download coverage artifact
-        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392  #v2.27.0 sonar cannot use official Github action: actions/download-artifact
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05  #v2.27.0 sonar cannot use official Github action: actions/download-artifact
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: CI

poetry.lock

@@ -53,7 +53,6 @@ django-ansible-base = { git = "https://github.com/ansible/django-ansible-base.gi
     "feature-flags",
 ] }
 jinja2 = ">=3.1.3,<3.2"
-django-split-settings = "^1.2.0"
 pexpect = "^4.9.0"
 ansible-runner = ">=2.4"
 python-gnupg = "^0.5.2"