Merge pull request #12 from seven-beep/linter_update

Linter update

Author: mdsketch

.ansible-lint

@@ -0,0 +1,22 @@
+---
+# Configuration file for ansible-lint
+
+# Ignore these paths during auto-detection
+exclude_paths:
+  - '.github'
+
+# Ref: https://github.com/ansible-community/ansible-lint/blob/main/.ansible-lint#L41-L49
+enable_list:
+  - 'fqcn-builtins'
+
+# List of rules currently ignored in DebOps repository
+skip_list:
+  # This check warns that a 'run_once' keyword will not work correctly on task
+  # level in playbooks with "free" strategy, but ansible-lint doesn't take the
+  # strategy of a given play into account, so the check is moot. A solution is
+  # to ignore the check on the task level.
+  # Ref: https://github.com/ansible/ansible-lint/issues/2815
+  #
+  # This tag is not correctly detected on the task level using "noqa" comment,
+  # so instead it's ignored globally for now.
+  - 'run-once[task]'

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -24,11 +24,7 @@ repos:
       - id: codespell
         args: [-I, .codespellignore]
   - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: v6.14.2
+    rev: v24
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$
-  - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: v6.3.0
-    hooks:
-      - id: ansible-lint

.yamllint.yaml

@@ -1,19 +1,97 @@
 ---
+# -*- mode: yaml -*-
+# vim:ts=2:sw=2:ai:si:syntax=yaml
+#
+# Copyright (C) 2017 Maciej Delmanowski <drybjed@gmail.com>
+# Copyright (C) 2017 DebOps <https://debops.org/>
+# Copyright (C) 2024 seven-beep <ebn@entreparentheses.xyz>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# yamllint configuration directives
+#
+# Project Homepage: https://github.com/adrienverge/yamllint
+#
+# How to override rules in files:
+# https://yamllint.readthedocs.io/en/latest/disable_with_comments.html
+
 extends: default
 
+# Rules documentation: https://yamllint.readthedocs.io/en/latest/rules.html
 rules:
   truthy:
     allowed-values: ["yes", "no", "True", "false", "False", "true"]
+
   line-length:
     max: 200
     level: warning
-  indentation: disable
-  braces: disable
+
+  braces:
+    # Defaults
+    # min-spaces-inside: 0
+    # max-spaces-inside: 0
+
+    # Keep 0 min-spaces to not error on empty {} collection definitions
+    min-spaces-inside: 0
+
+    # Allow one space inside braces to improve code readability
+    max-spaces-inside: 1
+
+  brackets:
+    # Defaults
+    # min-spaces-inside: 0
+    # max-spaces-inside: 0
+
+    # Keep 0 min-spaces to not error on empty [] collection definitions
+    min-spaces-inside: 0
+
+    # Allow one space inside braces to improve code readability
+    max-spaces-inside: 1
+
+  colons:
+    # Defaults
+    # min-spaces-before: 0
+    # max-spaces-after: 1
+
+    # Allow multiple spaces after a colon to allow indentation of YAML
+    # dictionary values
+    max-spaces-after: -1
+
+  commas:
+    # Defaults
+    # max-spaces-after: 1
+
+    # Allow multiple spaces after a comma to allow indentation of YAML
+    # dictionary values
+    max-spaces-after: -1
+
   comments:
-    require-starting-space: true
-    ignore-shebangs: true
+    # Defaults
+    # level: warning
+    # require-starting-space: True
     min-spaces-from-content: 1
 
+    # Disable to allow for code comment blocks and #!/usr/bin/ansible-playbook
+    require-starting-space: False
+
+  # Disable comment indentation checks due to copious amounts of long lines in
+  # the code which would require a code style change to resolve
+  comments-indentation: False
+
+  indentation:
+    # Defaults
+    # spaces: consistent
+    # indent-sequences: True
+    # check-multi-line-strings: False
+
+    # Require 2 space indentation
+    spaces: 2
+
+    # Require consistent indentation within a file, either indented or not
+    indent-sequences: consistent
+
+  octal-values:
+    forbid-implicit-octal: True
+
 ignore:
   - .git
   - .github

Makefile

@@ -4,6 +4,3 @@ pre-commit:
 	echo "yay pre-commit"
 	pre-commit install
 	pre-commit run --all-files
-
-lint:
-	ansible-lint -p deploy.yml

molecule/default/requirements.yml

@@ -2,3 +2,4 @@
 
 collections:
   - ansible.posix
+  - community.docker

tasks/main.yml

@@ -82,7 +82,7 @@
     dest: "{{ teleport_config_path }}"
     owner: "root"
     group: "root"
-    mode: 0600
+    mode: "0600"
     backup: "{{ backup_teleport_config }}"
   when: teleport_template_config
   notify:
@@ -94,7 +94,7 @@
     dest: "/etc/systemd/system"
     owner: "root"
     group: "root"
-    mode: 0755
+    mode: "0755"
     state: directory
 
 - name: Create teleport service
@@ -104,7 +104,7 @@
     dest: "/etc/systemd/system/teleport.service"
     owner: "root"
     group: "root"
-    mode: 0644
+    mode: "0644"
   notify: Reload_Teleport
   when: teleport_control_systemd