summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cloudinit/config/cc_bootcmd.py1
-rw-r--r--cloudinit/config/cc_runcmd.py1
-rw-r--r--cloudinit/config/cc_snap.py1
-rw-r--r--cloudinit/config/cc_ubuntu_advantage.py1
-rw-r--r--cloudinit/config/tests/test_snap.py36
-rw-r--r--tests/unittests/test_handler/test_handler_bootcmd.py24
-rw-r--r--tests/unittests/test_handler/test_handler_runcmd.py25
7 files changed, 82 insertions, 7 deletions
diff --git a/cloudinit/config/cc_bootcmd.py b/cloudinit/config/cc_bootcmd.py
index 233da1ef..db64f0a6 100644
--- a/cloudinit/config/cc_bootcmd.py
+++ b/cloudinit/config/cc_bootcmd.py
@@ -63,7 +63,6 @@ schema = {
'additionalProperties': False,
'minItems': 1,
'required': [],
- 'uniqueItems': True
}
}
}
diff --git a/cloudinit/config/cc_runcmd.py b/cloudinit/config/cc_runcmd.py
index 539cbd5d..b6f6c807 100644
--- a/cloudinit/config/cc_runcmd.py
+++ b/cloudinit/config/cc_runcmd.py
@@ -66,7 +66,6 @@ schema = {
'additionalProperties': False,
'minItems': 1,
'required': [],
- 'uniqueItems': True
}
}
}
diff --git a/cloudinit/config/cc_snap.py b/cloudinit/config/cc_snap.py
index 34a53fd4..a7a03214 100644
--- a/cloudinit/config/cc_snap.py
+++ b/cloudinit/config/cc_snap.py
@@ -110,7 +110,6 @@ schema = {
'additionalItems': False, # Reject non-string & non-list
'minItems': 1,
'minProperties': 1,
- 'uniqueItems': True
},
'squashfuse_in_container': {
'type': 'boolean'
diff --git a/cloudinit/config/cc_ubuntu_advantage.py b/cloudinit/config/cc_ubuntu_advantage.py
index 16b1868b..29d18c96 100644
--- a/cloudinit/config/cc_ubuntu_advantage.py
+++ b/cloudinit/config/cc_ubuntu_advantage.py
@@ -87,7 +87,6 @@ schema = {
'additionalItems': False, # Reject non-string & non-list
'minItems': 1,
'minProperties': 1,
- 'uniqueItems': True
}
},
'additionalProperties': False, # Reject keys not in schema
diff --git a/cloudinit/config/tests/test_snap.py b/cloudinit/config/tests/test_snap.py
index c5b4a9de..492d2d46 100644
--- a/cloudinit/config/tests/test_snap.py
+++ b/cloudinit/config/tests/test_snap.py
@@ -340,6 +340,42 @@ class TestSchema(CiTestCase):
{'snap': {'assertions': {'01': 'also valid'}}}, schema)
self.assertEqual('', self.logs.getvalue())
+ def test_duplicates_are_fine_array_array(self):
+ """Duplicated commands array/array entries are allowed."""
+ byebye = ["echo", "bye"]
+ try:
+ cfg = {'snap': {'commands': [byebye, byebye]}}
+ validate_cloudconfig_schema(cfg, schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("command entries can be duplicate.")
+
+ def test_duplicates_are_fine_array_string(self):
+ """Duplicated commands array/string entries are allowed."""
+ byebye = "echo bye"
+ try:
+ cfg = {'snap': {'commands': [byebye, byebye]}}
+ validate_cloudconfig_schema(cfg, schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("command entries can be duplicate.")
+
+ def test_duplicates_are_fine_dict_array(self):
+ """Duplicated commands dict/array entries are allowed."""
+ byebye = ["echo", "bye"]
+ try:
+ cfg = {'snap': {'commands': {'00': byebye, '01': byebye}}}
+ validate_cloudconfig_schema(cfg, schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("command entries can be duplicate.")
+
+ def test_duplicates_are_fine_dict_string(self):
+ """Duplicated commands dict/string entries are allowed."""
+ byebye = "echo bye"
+ try:
+ cfg = {'snap': {'commands': {'00': byebye, '01': byebye}}}
+ validate_cloudconfig_schema(cfg, schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("command entries can be duplicate.")
+
class TestHandle(CiTestCase):
diff --git a/tests/unittests/test_handler/test_handler_bootcmd.py b/tests/unittests/test_handler/test_handler_bootcmd.py
index 29fc25e4..c3abedde 100644
--- a/tests/unittests/test_handler/test_handler_bootcmd.py
+++ b/tests/unittests/test_handler/test_handler_bootcmd.py
@@ -1,6 +1,6 @@
# This file is part of cloud-init. See LICENSE file for license information.
-from cloudinit.config import cc_bootcmd
+from cloudinit.config import cc_bootcmd, schema
from cloudinit.sources import DataSourceNone
from cloudinit import (distros, helpers, cloud, util)
from cloudinit.tests.helpers import CiTestCase, mock, skipUnlessJsonSchema
@@ -138,4 +138,26 @@ class TestBootcmd(CiTestCase):
self.logs.getvalue())
+class TestSchema(CiTestCase):
+ """Directly test schema rather than through handle."""
+
+ def test_duplicates_are_fine_array_array(self):
+ """Duplicated array entries are allowed."""
+ try:
+ byebye = ["echo", "bye"]
+ schema.validate_cloudconfig_schema(
+ {'bootcmd': [byebye, byebye]}, cc_bootcmd.schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("runcmd entries as list are allowed to be duplicates.")
+
+ def test_duplicates_are_fine_array_string(self):
+ """Duplicated array entries entries are allowed in values of array."""
+ try:
+ byebye = "echo bye"
+ schema.validate_cloudconfig_schema(
+ {'bootcmd': [byebye, byebye]}, cc_bootcmd.schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("runcmd entries are allowed to be duplicates.")
+
+
# vi: ts=4 expandtab
diff --git a/tests/unittests/test_handler/test_handler_runcmd.py b/tests/unittests/test_handler/test_handler_runcmd.py
index dbbb2717..ee1981d1 100644
--- a/tests/unittests/test_handler/test_handler_runcmd.py
+++ b/tests/unittests/test_handler/test_handler_runcmd.py
@@ -1,10 +1,10 @@
# This file is part of cloud-init. See LICENSE file for license information.
-from cloudinit.config import cc_runcmd
+from cloudinit.config import cc_runcmd, schema
from cloudinit.sources import DataSourceNone
from cloudinit import (distros, helpers, cloud, util)
from cloudinit.tests.helpers import (
- FilesystemMockingTestCase, skipUnlessJsonSchema)
+ CiTestCase, FilesystemMockingTestCase, skipUnlessJsonSchema)
import logging
import os
@@ -99,4 +99,25 @@ class TestRuncmd(FilesystemMockingTestCase):
self.assertEqual(0o700, stat.S_IMODE(file_stat.st_mode))
+class TestSchema(CiTestCase):
+ """Directly test schema rather than through handle."""
+
+ def test_duplicates_are_fine_array(self):
+ """Duplicated array entries are allowed."""
+ try:
+ byebye = ["echo", "bye"]
+ schema.validate_cloudconfig_schema(
+ {'runcmd': [byebye, byebye]}, cc_runcmd.schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("runcmd entries as list are allowed to be duplicates.")
+
+ def test_duplicates_are_fine_string(self):
+ """Duplicated string entries are allowed."""
+ try:
+ byebye = "echo bye"
+ schema.validate_cloudconfig_schema(
+ {'runcmd': [byebye, byebye]}, cc_runcmd.schema, strict=True)
+ except schema.SchemaValidationError as e:
+ self.fail("runcmd entries are allowed to be duplicates.")
+
# vi: ts=4 expandtab
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 06:41:10 +0000