use PEP 589 syntax for TypeDict

cloudinit/config/cc_apk_configure.py

@@ -10,7 +10,7 @@
 
 from cloudinit import log as logging
 from cloudinit import temp_utils, templater, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
@@ -53,7 +53,7 @@
 
 frequency = PER_INSTANCE
 distros = ["alpine"]
-meta = {
+meta: MetaSchema = {
     "id": "cc_apk_configure",
     "name": "APK Configure",
     "title": "Configure apk repositories file",

cloudinit/config/cc_apt_configure.py

@@ -17,7 +17,7 @@
 from cloudinit import gpg
 from cloudinit import log as logging
 from cloudinit import subp, templater, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
@@ -32,7 +32,7 @@
 frequency = PER_INSTANCE
 distros = ["ubuntu", "debian"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_apt_configure",
     "name": "Apt Configure",
     "title": "Configure apt for the user",

cloudinit/config/cc_apt_pipelining.py

@@ -9,7 +9,7 @@
 from textwrap import dedent
 
 from cloudinit import util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
@@ -24,7 +24,7 @@
 # A value of zero MUST be specified if the remote host does not properly linger
 # on TCP connections - otherwise data corruption will occur.
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_apt_pipelining",
     "name": "Apt Pipelining",
     "title": "Configure apt pipelining",

cloudinit/config/cc_bootcmd.py

@@ -13,14 +13,14 @@
 from textwrap import dedent
 
 from cloudinit import subp, temp_utils, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_ALWAYS
 
 frequency = PER_ALWAYS
 
 distros = ["all"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_bootcmd",
     "name": "Bootcmd",
     "title": "Run arbitrary commands early in the boot process",

cloudinit/config/cc_byobu.py

@@ -9,7 +9,7 @@
 """Byobu: Enable/disable byobu system wide and for default user."""
 
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.distros import ug_util
 from cloudinit.settings import PER_INSTANCE
 
@@ -32,7 +32,7 @@
 """
 distros = ["ubuntu", "debian"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_byobu",
     "name": "Byobu",
     "title": "Enable/disable byobu system wide and for default user",

cloudinit/config/cc_ca_certs.py

@@ -8,7 +8,7 @@
 from textwrap import dedent
 
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_INSTANCE
 
 DEFAULT_CONFIG = {
@@ -45,7 +45,7 @@
 """
 distros = ["alpine", "debian", "ubuntu", "rhel"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_ca_certs",
     "name": "CA Certificates",
     "title": "Add ca certificates",

cloudinit/config/cc_chef.py

@@ -14,7 +14,7 @@
 from textwrap import dedent
 
 from cloudinit import subp, temp_utils, templater, url_helper, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.settings import PER_ALWAYS
 
 RUBY_VERSION_DEFAULT = "1.8"
@@ -92,7 +92,7 @@
 frequency = PER_ALWAYS
 distros = ["all"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_chef",
     "name": "Chef",
     "title": "module that configures, starts and installs chef",

cloudinit/config/cc_debug.py

@@ -9,7 +9,7 @@
 from textwrap import dedent
 
 from cloudinit import safeyaml, type_utils, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.settings import PER_INSTANCE
 
@@ -24,7 +24,7 @@
     Log configurations are not output.
 """
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_debug",
     "name": "Debug",
     "title": "Helper to debug cloud-init *internal* datastructures",

cloudinit/config/cc_disable_ec2_metadata.py

@@ -11,14 +11,14 @@
 from textwrap import dedent
 
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.settings import PER_ALWAYS
 
 REJECT_CMD_IF = ["route", "add", "-host", "169.254.169.254", "reject"]
 REJECT_CMD_IP = ["ip", "route", "add", "prohibit", "169.254.169.254"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_disable_ec2_metadata",
     "name": "Disable EC2 Metadata",
     "title": "Disable AWS EC2 Metadata",

cloudinit/config/cc_disk_setup.py

@@ -13,7 +13,7 @@
 from textwrap import dedent
 
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc
+from cloudinit.config.schema import MetaSchema, get_meta_doc
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.settings import PER_INSTANCE
 
@@ -50,7 +50,7 @@
 filesystem configs.
 """
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_disk_setup",
     "name": "Disk Setup",
     "title": "Configure partitions and filesystems",

cloudinit/config/cc_install_hotplug.py

@@ -4,15 +4,19 @@
 from textwrap import dedent
 
 from cloudinit import stages, subp, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.event import EventScope, EventType
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
 distros = [ALL_DISTROS]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_install_hotplug",
     "name": "Install Hotplug",
     "title": "Install hotplug if supported and enabled",

cloudinit/config/cc_keyboard.py

@@ -10,7 +10,11 @@
 
 from cloudinit import distros
 from cloudinit import log as logging
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
@@ -22,7 +26,7 @@
 
 DEFAULT_KEYBOARD_MODEL = "pc105"
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_keyboard",
     "name": "Keyboard",
     "title": "Set keyboard layout",

cloudinit/config/cc_locale.py

@@ -11,12 +11,16 @@
 from textwrap import dedent
 
 from cloudinit import util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
 distros = ["all"]
-meta = {
+meta: MetaSchema = {
     "id": "cc_locale",
     "name": "Locale",
     "title": "Set system locale",

cloudinit/config/cc_ntp.py

@@ -12,7 +12,11 @@
 
 from cloudinit import log as logging
 from cloudinit import subp, temp_utils, templater, type_utils, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
@@ -148,7 +152,7 @@
 # configuration options before actually attempting to deploy with said
 # configuration.
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_ntp",
     "name": "NTP",
     "title": "enable and configure ntp",

cloudinit/config/cc_resizefs.py

@@ -14,15 +14,19 @@
 from textwrap import dedent
 
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_ALWAYS
 
 NOBLOCK = "noblock"
 
 frequency = PER_ALWAYS
 distros = ["all"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_resizefs",
     "name": "Resizefs",
     "title": "Resize filesystem",

cloudinit/config/cc_runcmd.py

@@ -12,7 +12,11 @@
 from textwrap import dedent
 
 from cloudinit import util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.distros import ALL_DISTROS
 from cloudinit.settings import PER_INSTANCE
 
@@ -24,7 +28,7 @@
 
 distros = [ALL_DISTROS]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_runcmd",
     "name": "Runcmd",
     "title": "Run arbitrary commands",

cloudinit/config/cc_snap.py

@@ -9,7 +9,11 @@
 
 from cloudinit import log as logging
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 from cloudinit.subp import prepend_base_command
 
@@ -18,7 +22,7 @@
 
 LOG = logging.getLogger(__name__)
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_snap",
     "name": "Snap",
     "title": "Install, configure and manage snapd and snap packages",

cloudinit/config/cc_ubuntu_advantage.py

@@ -6,14 +6,18 @@
 
 from cloudinit import log as logging
 from cloudinit import subp, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 UA_URL = "https://ubuntu.com/advantage"
 
 distros = ["ubuntu"]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_ubuntu_advantage",
     "name": "Ubuntu Advantage",
     "title": "Configure Ubuntu Advantage support services",

cloudinit/config/cc_ubuntu_drivers.py

@@ -7,14 +7,18 @@
 
 from cloudinit import log as logging
 from cloudinit import subp, temp_utils, type_utils, util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
 
 frequency = PER_INSTANCE
 distros = ["ubuntu"]
-meta = {
+meta: MetaSchema = {
     "id": "cc_ubuntu_drivers",
     "name": "Ubuntu Drivers",
     "title": "Interact with third party drivers in Ubuntu.",

cloudinit/config/cc_write_files.py

@@ -12,7 +12,11 @@
 
 from cloudinit import log as logging
 from cloudinit import util
-from cloudinit.config.schema import get_meta_doc, validate_cloudconfig_schema
+from cloudinit.config.schema import (
+    MetaSchema,
+    get_meta_doc,
+    validate_cloudconfig_schema,
+)
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
@@ -43,7 +47,7 @@
     "base64",
 ]
 
-meta = {
+meta: MetaSchema = {
     "id": "cc_write_files",
     "name": "Write Files",
     "title": "write arbitrary files",