.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 default_stages: [commit, manual, merge-commit, push]
 repos:
   - repo: https://github.com/jorisroovers/gitlint
-    rev: v0.17.0
+    rev: v0.18.0
     hooks:
       - id: gitlint
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -36,12 +36,15 @@ repos:
       - id: script-must-have-extension
         exclude: .*\.bats$
       - id: script-must-not-have-extension
+  - repo: meta
+    hooks:
+      - id: check-useless-excludes
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.32.1
+    rev: v0.32.2
     hooks:
       - id: markdownlint
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.27.1
+    rev: v1.28.0
     hooks:
       - id: yamllint
         args: [--strict]
@@ -62,7 +65,6 @@ repos:
         entry: shfmt -i 4
         language: system
         types: [shell]
-        exclude: .*\.bats$
       - id: shfmt-bats
         name: shfmt-bats
         entry: shfmt -ln bats -i 4
@@ -74,11 +76,11 @@ repos:
         language: system
         types: [shell]
   - repo: https://github.com/zricethezav/gitleaks
-    rev: v8.11.0
+    rev: v8.15.0
     hooks:
       - id: gitleaks
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.74.1
+    rev: v1.76.0
     hooks:
       - id: terraform_fmt
         args:
@@ -95,7 +97,7 @@ repos:
       - id: terraform-docs-go
         args: [./terraform]
   - repo: https://github.com/ansible-community/ansible-lint
-    rev: v6.4.0
+    rev: v6.8.6
     hooks:
       - id: ansible-lint
         args: [-c, .ansible-lint.yml]

CHANGELOG.md

+## [0.19.1](https://gitlab.com/xebis/infrastructure-template/compare/v0.19.0...v0.19.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* speed up nftables service check ([b961571](https://gitlab.com/xebis/infrastructure-template/commit/b961571c5ce5148e4b4f351b58b2f51703753de1))
+
 # [0.19.0](https://gitlab.com/xebis/infrastructure-template/compare/v0.18.1...v0.19.0) (2022-10-10)
 
 

ansible/roles/firewall/tasks/main.yml

@@ -39,5 +39,5 @@
   register: nftables_service_result
   when: not ansible_check_mode
   until: nftables_service_result.finished
-  retries: 4
-  delay: 15
+  retries: 12
+  delay: 5

scripts/bootstrap

@@ -9,11 +9,11 @@ LANG=C
 # Install dependencies
 function install_dependencies() {
     apt_add "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" 'https://apt.releases.hashicorp.com/gpg'
-    pkgs install 'apt:git' 'apt:python3-pip' 'pip:pre-commit' 'pip:gitlint' 'apt:npm' 'npm:markdownlint-cli' \
-        'pip:yamllint' 'snap:shfmt' 'apt:shellcheck' 'apt:bats' \
+    pkgs install 'apt:git' 'apt:python3-pip' 'pip:pre-commit' 'pip:gitlint' 'snap:node' 'npm:markdownlint-cli' \
+        'pip:yamllint' 'snap:shfmt' 'snap:shellcheck' 'apt:bats' \
         'apt:terraform' \
         'curl2bash:tflint=https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh' \
-        'pip:checkov' 'apt:golang' 'apt:ansible' 'pip:ansible-lint'
+        'pip:checkov' 'snap:golang' 'apt:ansible' 'pip:ansible-lint'
     ansible-galaxy collection install ansible.posix
 }
 

shellib @ b19491bc

-Subproject commit 6db5af6682579f278300ba4325194f99bc98b35c
+Subproject commit b19491bc8189f271a4b227e07280234058eddd1f

bats-assert @ 78fa631d

-Subproject commit ffe84ea5dd43b568851549b3e241db150c12929c
+Subproject commit 78fa631d1370562d2cd4a1390989e706158e7bf0