From 057c3b0bc45ee218a8b4fe808de7e1a0cc5626e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Wed, 5 Jul 2023 11:53:08 +0200
Subject: [PATCH] [UPD] ansible-lint

---
 .ansible-lint     |  7 +++++++
 .yamllint         | 39 +++++++++++++++++++++++++++++++++++++++
 handlers/main.yml | 10 +++++-----
 meta/main.yml     | 26 +++++++++++++-------------
 tasks/main.yml    | 14 +++++++-------
 5 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 .ansible-lint
 create mode 100644 .yamllint

diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000..8d40d06
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,7 @@
+---
+warn_list:  # or 'skip_list' to silence them completely
+    - git-latest  # Git checkouts must contain explicit version
+    - ignore-errors  # Use failed_when and specify error conditions instead of using ignore_errors
+    - no-changed-when  # Commands should not change things if nothing needs doing
+    - no-handler  # Tasks that run when changed should likely be handlers
+    - package-latest  # Package installs should not use latest
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..fbebdb8
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,39 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+    braces:
+        max-spaces-inside: 1
+        level: error
+    brackets:
+        max-spaces-inside: 1
+        level: error
+    colons:
+        max-spaces-after: -1
+        level: error
+    commas:
+        max-spaces-after: -1
+        level: error
+    # comments enable
+    comments: enable
+    comments-indentation: enable
+    document-start: enable
+    empty-lines:
+        max: 3
+        level: error
+    hyphens:
+        level: error
+    indentation:
+        level: warning
+        indent-sequences: consistent
+        spaces: 4
+        check-multi-line-strings: true
+    key-duplicates: enable
+    line-length: disable
+    new-line-at-end-of-file: enable
+    new-lines:
+        type: unix
+    # trailing-spaces enable
+    trailing-spaces: enable
+    truthy: enable
diff --git a/handlers/main.yml b/handlers/main.yml
index 2101342..4993f93 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,10 +1,10 @@
 ---
 
-- name: start drawio docker
-  docker_compose:
-    project_src: /home/docker/
-    files: draw.io.yaml
-    project_name: draw.io
+- name: Start drawio docker
+  community.docker.docker_compose:
+      project_src: /home/docker/
+      files: draw.io.yaml
+      project_name: draw.io
   async: 120
   poll: 10
   when: not ansible_check_mode
diff --git a/meta/main.yml b/meta/main.yml
index 2f5ada4..414a326 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,15 +1,15 @@
 ---
 galaxy_info:
-  author: Rémi
-  description: This role deploys diagrams.net (ex draw.io) with Docker
-  company: Le Filament (https://le-filament.com)
-  license: AGPL-3.0-or-later
-  min_ansible_version: 2.1
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-  galaxy_tags:
-    - drawio
-    - diagramsnet
-    - docker
+    author: lefilament
+    description: This role deploys diagrams.net (ex draw.io) with Docker
+    company: Le Filament (https://le-filament.com)
+    license: AGPL-3.0-or-later
+    min_ansible_version: "2.1"
+    platforms:
+        - name: Ubuntu
+          versions:
+              - focal
+    galaxy_tags:
+        - drawio
+        - diagramsnet
+        - docker
diff --git a/tasks/main.yml b/tasks/main.yml
index 8194e52..c3da282 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,11 +2,11 @@
 
 ## Install drawio docker
 - name: Install drawio docker
-  template:
-    src: drawio.yaml.j2
-    dest: /home/docker/draw.io.yaml
-    owner: root
-    group: root
-    mode: '0400'
+  ansible.builtin.template:
+      src: drawio.yaml.j2
+      dest: /home/docker/draw.io.yaml
+      owner: root
+      group: root
+      mode: '0400'
   notify:
-    - start drawio docker
+      - Start drawio docker
-- 
GitLab