From 8ef54f7f0d1b15129adf4ed8a0ed87d32208bde6 Mon Sep 17 00:00:00 2001
From: santi-eidu <perezsantiago93@outlook.es>
Date: Wed, 23 Mar 2022 18:01:02 +0100
Subject: [PATCH] Update ansible to v5.2.0 and ansible-lint to v5.3.2

---
 README.md                                                  | 4 ++--
 cookiecutter.json                                          | 4 ++--
 test.sh                                                    | 6 +++---
 {{cookiecutter.app_name}}_role/molecule/default/verify.yml | 2 +-
 {{cookiecutter.app_name}}_role/tasks/install.yml           | 2 ++
 {{cookiecutter.app_name}}_role/tasks/main.yml              | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b14d5b4..d1ef27a 100644
--- a/README.md
+++ b/README.md
@@ -46,10 +46,10 @@ github_user [idealista]:
 company [Idealista S.A.U.]:
 author []: pablogcaldito
 min_ansible_version []: 2.2
-ansible_version []: 2.8.8
+ansible_version []: 5.2.0
 molecule_version []: 3.0.1
 python_docker_version []: 4.1.0
-ansible_lint_version []: 4.2.0
+ansible_lint_version []: 5.3.2
 license [Apache 2.0]:
 galaxy_tag_1 [example_tag1]: github_cli
 galaxy_tag_2 [example_tag2]: github
diff --git a/cookiecutter.json b/cookiecutter.json
index 3c9c9c3..8a5240c 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -7,11 +7,11 @@
   "company": "Idealista S.A.U.",
   "author": "",
   "min_ansible_version": "",
-  "ansible_version": "4.4.0",
+  "ansible_version": "5.2.0",
   "molecule_version": "3.4.0",
   "python_docker_version": "5.0.0",
   "molecule_docker_version": "0.2.4",
-  "ansible_lint_version":"5.1.2",
+  "ansible_lint_version":"5.3.2",
   "license":"Apache 2.0",
   "galaxy_tag_1":"example_tag1",
   "galaxy_tag_2":"example_tag2",
diff --git a/test.sh b/test.sh
index dfc090a..4ab9398 100755
--- a/test.sh
+++ b/test.sh
@@ -8,11 +8,11 @@ printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv instal
     exec_name="gh" \
     author="John Doe" \
     min_ansible_version="2.2" \
-    ansible_version="4.4.0" \
+    ansible_version="5.2.0" \
     molecule_version="3.4.0" \
     python_docker_version="5.0.0" \
     molecule_docker_version="0.2.4" \
-    ansible_lint_version="5.1.2" \
+    ansible_lint_version="5.3.2" \
     has_service="False" \
     has_files="False" \
     has_handlers="False" \
@@ -29,7 +29,7 @@ printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv instal
     # Launch molecule tests
     pipenv install -r test-requirements.txt --three
     pipenv run molecule test
-    
+
 )
 # Cleanup
 rm -rf github_cli_role
diff --git a/{{cookiecutter.app_name}}_role/molecule/default/verify.yml b/{{cookiecutter.app_name}}_role/molecule/default/verify.yml
index a604052..94e9691 100644
--- a/{{cookiecutter.app_name}}_role/molecule/default/verify.yml
+++ b/{{cookiecutter.app_name}}_role/molecule/default/verify.yml
@@ -24,7 +24,7 @@
       get_url:
         url: "{% raw %}{{{% endraw %} goss_url {% raw %}}}{% endraw %}"
         dest: "{% raw %}{{{% endraw %} goss_dst {% raw %}}}{% endraw %}"
-        sha256sum: "{% raw %}{{{% endraw %} goss_sha256sum {% raw %}}}{% endraw %}"
+        checksum: "sha256{% raw %}:{{{% endraw %} goss_sha256sum {% raw %}}}{% endraw %}"
         mode: 0755
       register: download_goss
       until: download_goss is succeeded
diff --git a/{{cookiecutter.app_name}}_role/tasks/install.yml b/{{cookiecutter.app_name}}_role/tasks/install.yml
index 0ffea00..34025a9 100644
--- a/{{cookiecutter.app_name}}_role/tasks/install.yml
+++ b/{{cookiecutter.app_name}}_role/tasks/install.yml
@@ -25,6 +25,7 @@
     owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}"
     group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}"
 {%- endif %}
+    mode: 0755
     state: directory
   with_items:
     - "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_skeleton_paths {% raw %}}}{% endraw %}"
@@ -38,6 +39,7 @@
     owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}"
     group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}"
 {%- endif %}
+    mode: 0755
     state: directory
   when: {{ cookiecutter.app_name }}_log_file is defined
   tags:
diff --git a/{{cookiecutter.app_name}}_role/tasks/main.yml b/{{cookiecutter.app_name}}_role/tasks/main.yml
index f959f73..25be2e8 100644
--- a/{{cookiecutter.app_name}}_role/tasks/main.yml
+++ b/{{cookiecutter.app_name}}_role/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
 
 - name: {{ cookiecutter.app_name | upper }} | Install
-  include: install.yml
+  import_tasks: install.yml
   tags:
     - {{ cookiecutter.app_name }}_install
 
 - name: {{ cookiecutter.app_name | upper }} | Configure
-  include: config.yml
+  import_tasks: config.yml
   tags:
     - {{ cookiecutter.app_name }}_configure
 {% if cookiecutter.has_service  == 'True' %}
 - name: {{ cookiecutter.app_name | upper }} | Service
-  include: service.yml
+  import_tasks: service.yml
   tags:
     - {{ cookiecutter.app_name }}_service
 {% endif %}
\ No newline at end of file