From 6f5148a871881d102847046173f9e700359a5a35 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 30 Oct 2023 02:14:28 +0100 Subject: [PATCH] improve linting and requirements --- .github/dependabot.yml | 12 +++++++++++ .github/workflows/ansible-linting-check.yml | 24 +++++++++++++++++++++ .github/workflows/j2lint-check.yml | 22 +++++++++++++++++++ .github/workflows/yamllint-check.yml | 22 +++++++++++++++++++ .github/workflows/yamllint.yaml | 20 ----------------- host_vars/services.l3d.space/vars.yml | 1 - requirements.txt | 3 ++- requirements.yml | 6 ++++++ 8 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/ansible-linting-check.yml create mode 100644 .github/workflows/j2lint-check.yml create mode 100644 .github/workflows/yamllint-check.yml delete mode 100644 .github/workflows/yamllint.yaml create mode 100644 requirements.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c40819a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +--- +# See https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "gitsubmodule" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml new file mode 100644 index 0000000..cdf93dc --- /dev/null +++ b/.github/workflows/ansible-linting-check.yml @@ -0,0 +1,24 @@ +--- +name: Ansible Lint check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + name: Ansible Lint + runs-on: ubuntu-latest + + steps: + - name: Checkout git repo + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run ansible-lint + uses: ansible-actions/ansible-lint-action@v1.0.2 + with: + target: "site.yml" + python_dependency_file: 'requirements.txt' + collections_yml: 'requirements.yml' diff --git a/.github/workflows/j2lint-check.yml b/.github/workflows/j2lint-check.yml new file mode 100644 index 0000000..00c7861 --- /dev/null +++ b/.github/workflows/j2lint-check.yml @@ -0,0 +1,22 @@ +--- +name: Jinja2 Linting check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + name: Jinja2 Linting + runs-on: ubuntu-latest + + steps: + - name: Checkout git repo + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run j2lint + uses: ansible-actions/j2lint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint-check.yml b/.github/workflows/yamllint-check.yml new file mode 100644 index 0000000..5e62f57 --- /dev/null +++ b/.github/workflows/yamllint-check.yml @@ -0,0 +1,22 @@ +--- +name: Yamllint check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + name: Yamllint + runs-on: ubuntu-latest + + steps: + - name: Checkout git repo + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run yamllint + uses: ansible-actions/yamllint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml deleted file mode 100644 index c4894bd..0000000 --- a/.github/workflows/yamllint.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: 'Yamllint GitHub Actions' - -# yamllint disable-line rule:truthy -on: [push, pull_request] - -jobs: - yamllint: - name: 'Yamllint' - runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@master - - name: 'Yamllint' - uses: karancode/yamllint-github-action@master - with: - yamllint_file_or_dir: '.' - yamllint_config_filepath: './.yamllint' - yamllint_strict: false - yamllint_comment: true diff --git a/host_vars/services.l3d.space/vars.yml b/host_vars/services.l3d.space/vars.yml index 87f9ff4..fbe25ce 100644 --- a/host_vars/services.l3d.space/vars.yml +++ b/host_vars/services.l3d.space/vars.yml @@ -23,4 +23,3 @@ etebase__create_backup: true # acmetool config acme_reload_services: - 'nginx' - diff --git a/requirements.txt b/requirements.txt index 45c1e03..da63411 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -jmespath +jmespath>=1.0.1 +passlib[bcrypt]>=1.7.4 diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..4fcd9ad --- /dev/null +++ b/requirements.yml @@ -0,0 +1,6 @@ +--- +collections: + - name: 'community.general' + version: ">=7.5.0,<=8.0.0" + - name: 'community.crypto' + version: ">=2.15.1,<=3.0.0"