From 39408acc49b0d29640fb408632c5599626863be6 Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Thu, 6 Jul 2023 12:42:26 +0200
Subject: [PATCH] Fix linting issues

---
 .ansible-lint.yml             |  1 -
 molecule/default/converge.yml | 11 ++++++-----
 requirements-dev.in           |  2 ++
 requirements-dev.txt          |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.ansible-lint.yml b/.ansible-lint.yml
index 83666af..5b34d53 100644
--- a/.ansible-lint.yml
+++ b/.ansible-lint.yml
@@ -2,7 +2,6 @@
 exclude_paths:
   - .ansible
   - .venv
-  - molecule/*/converge.yml
 parseable: true
 skip_list:
   - "empty-string-compare"
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index a1c37bc..077aaa3 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -13,7 +13,7 @@
     - name: Get list of installed Nix packages
       become: true
       become_user: "{{ nix_user }}"
-      shell: "nix-env --query --installed"
+      ansible.builtin.command: "nix-env --query --installed"
       environment:
         PATH: "/home/{{ nix_user }}/.nix-profile/bin:{{ lookup('env', 'PATH') }}"
       changed_when: false
@@ -22,29 +22,30 @@
     - name: Try to install a Nix package
       become: true
       become_user: "{{ nix_user }}"
-      shell: "nix-env -i hello"
+      ansible.builtin.command: "nix-env -i hello"
       environment:
         PATH: "/home/{{ nix_user }}/.nix-profile/bin:{{ lookup('env', 'PATH') }}"
       when: "'hello' not in nix_packages.stdout"
+      changed_when: true
 
     - name: Try to run the hello Nix package
       become: true
       become_user: "{{ nix_user }}"
-      command: "hello"
+      ansible.builtin.command: "hello"
       environment:
         PATH: "/home/{{ nix_user }}/.nix-profile/bin:{{ lookup('env', 'PATH') }}"
       changed_when: false
       register: hello_output
 
     - name: Verify output of the hello program
-      fail:
+      ansible.builtin.fail:
         msg: "The hello program did not return the expected output!"
       when: "hello_output.stdout != 'Hello, world!'"
 
     - name: Try to use Nix Flakes
       become: true
       become_user: "{{ nix_user }}"
-      shell: "nix flake metadata github:edolstra/dwarffs"
+      ansible.builtin.command: "nix flake metadata github:edolstra/dwarffs"
       environment:
         PATH: "/home/{{ nix_user }}/.nix-profile/bin:{{ lookup('env', 'PATH') }}"
       changed_when: false
diff --git a/requirements-dev.in b/requirements-dev.in
index bbafddd..683b0b2 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -2,3 +2,5 @@ ansible-core
 ansible-lint
 molecule
 molecule-plugins[docker]
+# https://github.com/docker/docker-py/issues/3113
+urllib3<2
diff --git a/requirements-dev.txt b/requirements-dev.txt
index a8d19b7..ced479d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -154,8 +154,9 @@ text-unidecode==1.3
     # via python-slugify
 tomli==2.0.1
     # via black
-urllib3==2.0.3
+urllib3==1.26.16
     # via
+    #   -r requirements-dev.in
     #   docker
     #   requests
 wcmatch==8.4.1