Merge pull request #24 from remerge/escape-config-values

Escape string values in config file

Author: hollow

.ansible-lint

@@ -18,4 +18,5 @@ exclude_paths:
 skip_list:
   - meta-no-info
   - template-instead-of-copy
+  - var-naming[no-role-prefix]
   - yaml[comments-indentation]

.copier-answers.yml

@@ -1,6 +1,6 @@
 ---
 # Changes here will be overwritten by Copier
-_commit: v2.1.3
+_commit: v2.1.4-18-g036146e
 _src_path: gh:remerge/template
 project_id: ansible-role-nomad
 project_license: apache-2.0

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ default_install_hook_types:
 repos:
   # https://github.com/pre-commit/pre-commit-hooks/tags
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v4.4.0"
+    rev: "v4.5.0"
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -74,7 +74,7 @@ repos:
 
   # https://github.com/ansible/ansible-lint/tags
   - repo: https://github.com/ansible/ansible-lint
-    rev: "v6.20.0"
+    rev: "v6.21.1"
     hooks:
       - id: ansible-lint
         name: ansible-lint
@@ -96,7 +96,7 @@ repos:
 
   # https://github.com/bridgecrewio/checkov/tags
   - repo: https://github.com/bridgecrewio/checkov
-    rev: "2.4.48"
+    rev: "3.0.12"
     hooks:
       - id: checkov
         name: checkov

.vscode/settings.json

@@ -1,11 +1,8 @@
 {
-  "python.formatting.provider": "black",
-  "python.linting.pylintEnabled": true,
-  "python.linting.flake8Enabled": true,
   "[python]": {
     "editor.formatOnSave": true,
     "editor.formatOnSaveMode": "file",
-    "editor.defaultFormatter": "ms-python.python"
+    "editor.defaultFormatter": "ms-python.black-formatter"
   },
   "python.defaultInterpreterPath": ".venv/bin/python",
   "ansible.python.interpreterPath": ".venv/bin/python",

bin/.keep

@@ -8,13 +8,13 @@ authors = ["Remerge GmbH <[email protected]>"]
 python = "^3.9"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.9.1"
+black = "^23.10.1"
 flake8 = "^6.1.0"
 flake8-bugbear = "^23.9.16"
-pylint = "^2.17.5"
+pylint = "^3.0.2"
 tox = "^4.11.3"
 molecule = { extras = ["docker"], version = "^6.0.2" }
-ansible-lint = { version = "^6.20.0", markers = "platform_system != 'Windows'" }
+ansible-lint = { version = "^6.21.1", markers = "platform_system != 'Windows'" }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

poetry.lock

@@ -28,7 +28,7 @@ client {
 {% if nomad_client_metadata is defined %}
   meta {
 {% for key , value in nomad_client_metadata.items() %}
-    {{ key }} = "{{ value }}"
+    {{ key }} = {{ value | string | to_json }}
 {% endfor %}
   }
 {% endif %}
@@ -42,7 +42,7 @@ plugin "docker" {
       type = "{{ nomad_docker_logging['type'] }}"
       config {
 {% for key , value in nomad_docker_logging['config'].items() %}
-        {{ key }} = "{{ value }}"
+        {{ key }} = {{ value | string | to_json }}
 {% endfor %}
       }
     }