Update goss

manala · Oct 18, 2023 · d59abf7 · d59abf7
1 parent 9871280
commit d59abf7
Show file tree

Hide file tree

Showing 110 changed files with 1,147 additions and 1,159 deletions.
diff --git a/molecule/Dockerfile.debian.bookworm.j2 b/molecule/Dockerfile.debian.bookworm.j2
@@ -1,7 +1,7 @@
 FROM {{ item.image }}
 
 # Versions
-ENV GOSS_VERSION=0.3.23
+ENV GOSS_VERSION=0.4.2
 
 ENV LC_ALL=C.UTF-8
 

diff --git a/molecule/Dockerfile.debian.bullseye.j2 b/molecule/Dockerfile.debian.bullseye.j2
@@ -1,7 +1,7 @@
 FROM {{ item.image }}
 
 # Versions
-ENV GOSS_VERSION=0.3.23
+ENV GOSS_VERSION=0.4.2
 
 ENV LC_ALL=C.UTF-8
 

diff --git a/molecule/Dockerfile.debian.buster.j2 b/molecule/Dockerfile.debian.buster.j2
@@ -1,7 +1,7 @@
 FROM {{ item.image }}
 
 # Versions
-ENV GOSS_VERSION=0.3.23
+ENV GOSS_VERSION=0.4.2
 
 ENV LC_ALL=C.UTF-8
 

diff --git a/molecule/accounts/goss/users_authorized_keys.yaml.j2 b/molecule/accounts/goss/users_authorized_keys.yaml.j2
@@ -26,25 +26,25 @@ file:
     filetype: file
     owner: user_ak_verbose_syntax
     mode: "0600"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # Flatten
   /home/user_ak_flatten/.ssh/authorized_keys:
     exists: true
     filetype: file
     owner: user_ak_flatten
     mode: "0600"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # Multiple
   /home/user_ak_multiple/.ssh/authorized_keys:
     exists: true
     filetype: file
     owner: user_ak_multiple
     mode: "0600"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_2.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
+      {{ lookup('ansible.builtin.file', 'fixtures/key_2.pub') | indent(4) }}
   # File
   /home/user_ak_file/.ssh/authorized_keys:
     exists: false
@@ -53,9 +53,8 @@ file:
     filetype: file
     owner: user_ak_file
     mode: "0600"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
-      - "!{{ lookup('ansible.builtin.file', 'fixtures/key_2.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # State
   /home/user_ak_state_ignore/.ssh/authorized_keys:
     exists: false
diff --git a/molecule/accounts/goss/users_keys.yaml.j2 b/molecule/accounts/goss/users_keys.yaml.j2
@@ -50,10 +50,8 @@ file:
     owner: user_k_private
     group: user_k_private
     mode: "0600"
-    contains:
-{% for line in lookup('ansible.builtin.file', 'fixtures/key_1').splitlines() %}
-      - "{{ line }}"
-{% endfor %}
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1') | indent(4) }}
   /home/user_k_private/.ssh/id_rsa.pub:
     exists: false
   # Public
@@ -71,8 +69,8 @@ file:
     owner: user_k_public
     group: user_k_public
     mode: "0644"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # Verbose syntax
   /home/user_k_verbose_syntax/.ssh:
     exists: true
@@ -86,18 +84,16 @@ file:
     owner: user_k_verbose_syntax
     group: user_k_verbose_syntax
     mode: "0600"
-    contains:
-{% for line in lookup('ansible.builtin.file', 'fixtures/key_1').splitlines() %}
-      - "{{ line }}"
-{% endfor %}
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1') | indent(4) }}
   /home/user_k_verbose_syntax/.ssh/id_rsa.pub:
     exists: true
     filetype: file
     owner: user_k_verbose_syntax
     group: user_k_verbose_syntax
     mode: "0644"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # Flatten
   /home/user_k_flatten/.ssh:
     exists: true
@@ -111,18 +107,16 @@ file:
     owner: user_k_flatten
     group: user_k_flatten
     mode: "0600"
-    contains:
-{% for line in lookup('ansible.builtin.file', 'fixtures/key_1').splitlines() %}
-      - "{{ line }}"
-{% endfor %}
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1') | indent(4) }}
   /home/user_k_flatten/.ssh/id_rsa.pub:
     exists: true
     filetype: file
     owner: user_k_flatten
     group: user_k_flatten
     mode: "0644"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   # Multiple
   /home/user_k_multiple/.ssh:
     exists: true
@@ -136,36 +130,32 @@ file:
     owner: user_k_multiple
     group: user_k_multiple
     mode: "0600"
-    contains:
-{% for line in lookup('ansible.builtin.file', 'fixtures/key_1').splitlines() %}
-      - "{{ line }}"
-{% endfor %}
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1') | indent(4) }}
   /home/user_k_multiple/.ssh/id_rsa_1.pub:
     exists: true
     filetype: file
     owner: user_k_multiple
     group: user_k_multiple
     mode: "0644"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_1.pub') | indent(4) }}
   /home/user_k_multiple/.ssh/id_rsa_2:
     exists: true
     filetype: file
     owner: user_k_multiple
     group: user_k_multiple
     mode: "0600"
-    contains:
-{% for line in lookup('ansible.builtin.file', 'fixtures/key_2').splitlines() %}
-      - "{{ line }}"
-{% endfor %}
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_2') | indent(4) }}
   /home/user_k_multiple/.ssh/id_rsa_2.pub:
     exists: true
     filetype: file
     owner: user_k_multiple
     group: user_k_multiple
     mode: "0644"
-    contains:
-      - "{{ lookup('ansible.builtin.file', 'fixtures/key_2.pub') }}"
+    contents: |
+      {{ lookup('ansible.builtin.file', 'fixtures/key_2.pub') | indent(4) }}
   # State
   /home/user_k_state_ignore/.ssh:
     exists: false
diff --git a/molecule/ansible/goss/config.yaml.j2 b/molecule/ansible/goss/config.yaml.j2
@@ -7,13 +7,13 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Content$/"
+    contents: |
+      Content
   {{ tests_dir }}/template:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template
diff --git a/molecule/ansible/goss/group_vars.yaml.j2 b/molecule/ansible/goss/group_vars.yaml.j2
@@ -9,25 +9,25 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Content$/"
+    contents: |
+      Content
   # Default - Template
   {{ tests_dir }}/default/template:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template
   {{ tests_dir }}/default/template_file:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
   # Default - Flatten
   {{ tests_dir }}/default/flatten:
     exists: true
@@ -65,24 +65,24 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template
   {{ tests_dir }}/defaults/template_file:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
   {{ tests_dir }}/defaults/template_overwrite:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
 
   # Exclusive
   {{ tests_dir }}/exclusive/existing:

diff --git a/molecule/ansible/goss/host_vars.yaml.j2 b/molecule/ansible/goss/host_vars.yaml.j2
@@ -9,25 +9,25 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Content$/"
+    contents: |
+      Content
   # Default - Template
   {{ tests_dir }}/default/template:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template
   {{ tests_dir }}/default/template_file:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
   # Default - Flatten
   {{ tests_dir }}/default/flatten:
     exists: true
@@ -65,24 +65,24 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template
   {{ tests_dir }}/defaults/template_file:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
   {{ tests_dir }}/defaults/template_overwrite:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template file$/"
+    contents: |
+      Template file
 
   # Exclusive
   {{ tests_dir }}/exclusive/existing:

diff --git a/molecule/ansible/goss/hosts.yaml.j2 b/molecule/ansible/goss/hosts.yaml.j2
@@ -7,13 +7,13 @@ file:
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Content$/"
+    contents: |
+      Content
   {{ tests_dir }}/template:
     exists: true
     filetype: file
     owner: root
     group: root
     mode: "0644"
-    contains:
-      - "/^Template$/"
+    contents: |
+      Template