From 63df71f8ec9c8611776cbfbcb28981305ac9b6a5 Mon Sep 17 00:00:00 2001
From: Pablo Estigarribia <pablodav@gmail.com>
Date: Thu, 12 Oct 2023 22:15:59 -0300
Subject: [PATCH 1/2] fixes on dependencies and molecule-podman tests

---
 .github/workflows/galaxy-notify.yml | 6 +++---
 .github/workflows/molecule-test.yml | 2 +-
 defaults/main.yml                   | 3 +++
 handlers/main.yml                   | 2 +-
 tasks/python3_pip.yml               | 7 +++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/galaxy-notify.yml b/.github/workflows/galaxy-notify.yml
index 2ddeb99..11c36c8 100644
--- a/.github/workflows/galaxy-notify.yml
+++ b/.github/workflows/galaxy-notify.yml
@@ -16,8 +16,8 @@ jobs:
       matrix:
         # Better to use one scenario per OS for faster performance and easier debugging
         scenario:
-          - ubuntu-2204
-          - rocky9
+          - local-stable
+          - local-rocky9
     steps:
 
       - name: Checkout
@@ -33,7 +33,7 @@ jobs:
       - name: Install dependencies.
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install yamllint ansible-lint ansible "molecule[lint,docker]"
+          python3 -m pip install yamllint ansible-lint ansible molecule-podman
       
       - name: Install Galaxy dependencies.
         run: ansible-galaxy collection install community.docker
diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml
index 7c198a7..96db11f 100644
--- a/.github/workflows/molecule-test.yml
+++ b/.github/workflows/molecule-test.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install dependencies.
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install yamllint ansible-lint ansible molecule molecule-plugins[podman] podman
+          python3 -m pip install yamllint ansible-lint ansible molecule-podman
 
       # https://www.linkedin.com/pulse/how-run-rootless-podman-service-github-actions-%D0%B4%D0%BC%D0%B8%D1%82%D1%80%D0%B8%D0%B9-%D0%BC%D0%B8%D1%88%D0%B0%D1%80%D0%BE%D0%B2
       - name: Prepare the environment for podman
diff --git a/defaults/main.yml b/defaults/main.yml
index cf5f317..353dcd0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -221,4 +221,7 @@ burpui_pip_present:
   - "requests[security]>=2.12"  # required to avoid issues with get_url module
   #- "normalizer==0.2.1"
 
+burpui_pip_fixed_deps:
+  - werkzeug==2.3.7 # Fix issue with ImportError: cannot import name 'url_quote' from 'werkzeug.urls'
+
 ##### --------------------------- #####
diff --git a/handlers/main.yml b/handlers/main.yml
index f3679b6..3d79308 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -12,7 +12,7 @@
   notify: wait burpui
 
 - name: restart bui-celery
-  supervisorctl:
+  service:
     name: bui-celery
     state: restarted
   when: not bui_use_systemd
diff --git a/tasks/python3_pip.yml b/tasks/python3_pip.yml
index 35e4559..52c7535 100644
--- a/tasks/python3_pip.yml
+++ b/tasks/python3_pip.yml
@@ -64,3 +64,10 @@
     mode: '0755'
     state: link
   with_items: "{{ burpui_bin_links }}"
+
+- name: pip3 | Install pip fixes packages
+  pip:
+    name: "{{ burpui_pip_fixed_deps }}"
+    state: present
+    virtualenv: "{{ burpui_virtualenv }}"
+    virtualenv_command: "{{ burpui_virtualenv_command }}"

From ab233cd1185eae7e922bd7c01162523c6986c515 Mon Sep 17 00:00:00 2001
From: Pablo Estigarribia <pablodav@gmail.com>
Date: Thu, 12 Oct 2023 22:24:46 -0300
Subject: [PATCH 2/2] changelog update

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c9b7d6b..04506eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.2.1
+* important fix for werkzeug dependency
+* minor fixes on molecule-podman
+
 2.2.0
 * fix for #28 issues with dependencies and python 3.10
 * python3 only supported