Enable prettier (#127)

Author: ssbarnea

.github/workflows/push.yml

@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - main
-      - 'releases/**'
-      - 'stable/**'
+      - "releases/**"
+      - "stable/**"
 
 jobs:
   ack:

.github/workflows/release.yml

@@ -16,29 +16,29 @@ jobs:
       TOX_PARALLEL_NO_SPINNER: 1
 
     steps:
-    - name: Switch to using Python 3.9 by default
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-
-    - name: Install tox
-      run: >-
-        python3 -m
-        pip install
-        --user
-        tox
-
-    - name: Check out src from Git
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0  # needed by setuptools-scm
-
-    - name: Build dists
-      run: python -m tox -e pkg
-
-    - name: Publish to pypi.org
-      if: >-  # "create" workflows run separately from "push" & "pull_request"
-        github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.pypi_password }}
+      - name: Switch to using Python 3.9 by default
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Install tox
+        run: >-
+          python3 -m
+          pip install
+          --user
+          tox
+
+      - name: Check out src from Git
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # needed by setuptools-scm
+
+      - name: Build dists
+        run: python -m tox -e pkg
+
+      - name: Publish to pypi.org
+        if: >- # "create" workflows run separately from "push" & "pull_request"
+          github.event_name == 'release'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.pypi_password }}

.pre-commit-config.yaml

@@ -11,6 +11,17 @@ default_language_version:
   python: python3
 minimum_pre_commit_version: "1.14.0"
 repos:
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    # keep it before yamllint
+    rev: "v3.0.0-alpha.6"
+    hooks:
+      - id: prettier
+        # Temporary excludes so we can gradually normalize the formatting
+        exclude: >
+          (?x)^(
+            .*\.md|
+            .*\{\{.*
+          )$
   - repo: https://github.com/PyCQA/doc8.git
     rev: v1.1.1
     hooks:

src/molecule_plugins/azure/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/containers/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/docker/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/docker/playbooks/create.yml

@@ -84,7 +84,7 @@
         - not item.pre_build_image | default(false)
       register: docker_images
 
-    - name: Build an Ansible compatible image (new)  # noqa: no-handler
+    - name: Build an Ansible compatible image (new) # noqa: no-handler
       when:
         - platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0
         - not item.item.pre_build_image | default(false)

src/molecule_plugins/docker/playbooks/validate-dockerfile.yml

@@ -15,7 +15,6 @@
   tags:
     - always
   tasks:
-
     - name: Assure we have docker module installed
       ansible.builtin.pip:
         name: docker

src/molecule_plugins/ec2/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/gce/cookiecutter/cookiecutter.json

@@ -1,9 +1,9 @@
 {
-    "molecule_directory": "molecule",
-    "dependency_name": "OVERRIDDEN",
-    "driver_name": "OVERRIDDEN",
-    "provisioner_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN",
-    "role_name": "OVERRIDDEN",
-    "verifier_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "dependency_name": "OVERRIDDEN",
+  "driver_name": "OVERRIDDEN",
+  "provisioner_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN",
+  "role_name": "OVERRIDDEN",
+  "verifier_name": "OVERRIDDEN"
 }

src/molecule_plugins/gce/playbooks/handlers/main.yml

@@ -1,14 +1,15 @@
 ---
 - name: Populate instance config dict Linux
   ansible.builtin.set_fact:
-    instance_conf_dict: {
-      'instance': "{{ instance_info.name }}",
-      'address': "{{ instance_info.networkInterfaces.0.accessConfigs.0.natIP if molecule_yml.driver.external_access else instance_info.networkInterfaces.0.networkIP }}",
-      'user': "{{ lookup('env','USER') }}",
-      'port': "22",
-      'identity_file': "{{ ssh_identity_file }}",
-      'instance_os_type': "{{ molecule_yml.driver.instance_os_type }}"
-    }
+    instance_conf_dict:
+      {
+        "instance": "{{ instance_info.name }}",
+        "address": "{{ instance_info.networkInterfaces.0.accessConfigs.0.natIP if molecule_yml.driver.external_access else instance_info.networkInterfaces.0.networkIP }}",
+        "user": "{{ lookup('env','USER') }}",
+        "port": "22",
+        "identity_file": "{{ ssh_identity_file }}",
+        "instance_os_type": "{{ molecule_yml.driver.instance_os_type }}",
+      }
   loop: "{{ server.results }}"
   loop_control:
     loop_var: instance_info
@@ -17,23 +18,23 @@
 
 - name: Populate instance config dict Windows
   ansible.builtin.set_fact:
-    instance_conf_dict: {
-      'instance': "{{ instance_info.name }}",
-      'address': "{{ instance_info.networkInterfaces.0.accessConfigs.0.natIP if molecule_yml.driver.external_access else instance_info.networkInterfaces.0.networkIP }}",
-      'user': "molecule_usr",
-      'password': "{{ instance_info.password }}",
-      'port': "{{ instance_info.winrm_port | default(5986) }}",
-      'winrm_transport': "{{ molecule_yml.driver.winrm_transport | default('ntlm') }}",
-      'winrm_server_cert_validation': "{{ molecule_yml.driver.winrm_server_cert_validation | default('ignore') }}",
-      'instance_os_type': "{{ molecule_yml.driver.instance_os_type }}"
-    }
+    instance_conf_dict:
+      {
+        "instance": "{{ instance_info.name }}",
+        "address": "{{ instance_info.networkInterfaces.0.accessConfigs.0.natIP if molecule_yml.driver.external_access else instance_info.networkInterfaces.0.networkIP }}",
+        "user": "molecule_usr",
+        "password": "{{ instance_info.password }}",
+        "port": "{{ instance_info.winrm_port | default(5986) }}",
+        "winrm_transport": "{{ molecule_yml.driver.winrm_transport | default('ntlm') }}",
+        "winrm_server_cert_validation": "{{ molecule_yml.driver.winrm_server_cert_validation | default('ignore') }}",
+        "instance_os_type": "{{ molecule_yml.driver.instance_os_type }}",
+      }
   loop: "{{ win_instances }}"
   loop_control:
     loop_var: instance_info
   no_log: true
   register: instance_conf_dict
 
-
 - name: Wipe out instance config
   ansible.builtin.set_fact:
     instance_conf: {}
@@ -46,4 +47,4 @@
   ansible.builtin.copy:
     content: "{{ instance_conf }}"
     dest: "{{ molecule_instance_config }}"
-    mode: '0600'
+    mode: "0600"

src/molecule_plugins/podman/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/podman/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/converge.yml

@@ -7,7 +7,7 @@
       ansible.builtin.copy:
         src: /etc/hosts
         dest: /tmp/hosts-from-controller
-        mode: '0644'
+        mode: "0644"
     - name: "Include {{ cookiecutter.role_name }}"
       ansible.builtin.include_role:
         name: "{{ cookiecutter.role_name }}"

src/molecule_plugins/podman/playbooks/create.yml

@@ -8,7 +8,7 @@
   vars:
     podman_exec: "{{ lookup('env','MOLECULE_PODMAN_EXECUTABLE')|default('podman',true) }}"
   tasks:
-    - name: Get podman executable path  # noqa: command-instead-of-shell
+    - name: Get podman executable path # noqa: command-instead-of-shell
       ansible.builtin.shell: "command -v {{ podman_exec }}"
       register: _podman_path
       changed_when: false
@@ -79,7 +79,7 @@
         - not item.pre_build_image | default(false)
       register: podman_images
 
-    - name: Build an Ansible compatible image  # noqa: no-handler
+    - name: Build an Ansible compatible image # noqa: no-handler
       ansible.builtin.command: >
         {{ podman_cmd }} build
         -f {{ item.dest }}
@@ -139,8 +139,7 @@
       containers.podman.podman_network:
         name: "{{ podman_network.results[0].ansible_loop.allitems[0].network }}"
         executable: "{{ podman_exec }}"
-        subnet:
-          "{{ podman_network.results[0].ansible_loop.allitems[0].subnet | default(omit) }}"
+        subnet: "{{ podman_network.results[0].ansible_loop.allitems[0].subnet | default(omit) }}"
       when:
         - podman_network.results[0].msg is defined
         # podman message changed at some point in time

src/molecule_plugins/podman/playbooks/validate-dockerfile.yml

@@ -14,7 +14,6 @@
       - image: ubuntu:latest
       - image: debian:latest
   tasks:
-
     - name: Create isolated build directories for each image
       ansible.builtin.tempfile:
         prefix: "molecule-dockerfile-{{ item.image }}"

src/molecule_plugins/vagrant/cookiecutter/cookiecutter.json

@@ -1,5 +1,5 @@
 {
-    "molecule_directory": "molecule",
-    "role_name": "OVERRIDDEN",
-    "scenario_name": "OVERRIDDEN"
+  "molecule_directory": "molecule",
+  "role_name": "OVERRIDDEN",
+  "scenario_name": "OVERRIDDEN"
 }

src/molecule_plugins/vagrant/playbooks/create.yml

@@ -5,7 +5,7 @@
   gather_facts: false
   no_log: "{{ molecule_no_log }}"
   tasks:
-    - name: Create molecule instance(s)  # noqa fqcn[action]
+    - name: Create molecule instance(s) # noqa fqcn[action]
       vagrant:
         instances: "{{ molecule_yml.platforms }}"
         default_box: "{{ molecule_yml.driver.default_box | default('generic/alpine316') }}"
@@ -23,17 +23,18 @@
     # Mandatory configuration for Molecule to function.
 
     - name: Create molecule instances configuration
-      when: server is changed  # noqa no-handler
+      when: server is changed # noqa no-handler
       block:
-
         - name: Populate instance config dict
           ansible.builtin.set_fact:
-            instance_conf_dict: {
-              'instance': "{{ item.Host }}",
-              'address': "{{ item.HostName }}",
-              'user': "{{ item.User }}",
-              'port': "{{ item.Port }}",
-              'identity_file': "{{ item.IdentityFile }}", }
+            instance_conf_dict:
+              {
+                "instance": "{{ item.Host }}",
+                "address": "{{ item.HostName }}",
+                "user": "{{ item.User }}",
+                "port": "{{ item.Port }}",
+                "identity_file": "{{ item.IdentityFile }}",
+              }
           with_items: "{{ server.results }}"
           register: instance_config_dict
 

src/molecule_plugins/vagrant/playbooks/destroy.yml

@@ -5,7 +5,7 @@
   gather_facts: false
   no_log: "{{ molecule_no_log }}"
   tasks:
-    - name: Destroy molecule instance(s)  # noqa fqcn[action]
+    - name: Destroy molecule instance(s) # noqa fqcn[action]
       vagrant:
         instances: "{{ molecule_yml.platforms }}"
         default_box: "{{ molecule_yml.driver.default_box | default('generic/alpine316') }}"
@@ -25,7 +25,7 @@
       ansible.builtin.set_fact:
         instance_conf: {}
 
-    - name: Dump instance config  # noqa no-handler
+    - name: Dump instance config # noqa no-handler
       ansible.builtin.copy:
         content: |
           # Molecule managed