From 9e259ae0bc8482a35c8a74472b8a20001a942960 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 21 Jul 2021 07:27:21 +0000
Subject: [PATCH] =?UTF-8?q?stages/cloud-init:=20configuration=5Ffiles=20?=
 =?UTF-8?q?=E2=86=92=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename the `configuration_files` key to `config` key.
---
 stages/org.osbuild.cloud-init          | 12 ++++++------
 test/data/stages/cloud-init/b.json     |  2 +-
 test/data/stages/cloud-init/b.mpp.json |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stages/org.osbuild.cloud-init b/stages/org.osbuild.cloud-init
index b13d094c..dba4e5fc 100755
--- a/stages/org.osbuild.cloud-init
+++ b/stages/org.osbuild.cloud-init
@@ -2,15 +2,15 @@
 """
 Configure cloud-init
 
-'configuration_files' option allows to create cloud-init `.cfg` configuration
+The 'config' option allows to create cloud-init `.cfg` configuration
 files under `/etc/cloud/cloud.cfg.d`. Its value is a dictionary which keys
 represent filenames of `.cfg` configuration files, which will be created.
 Value of each configuration file key is a dictionary representing the
 cloud-init configuration.
 
 Constrains:
-  - If 'configuration_files' option is specified, it must contain at least one
-    definition of a configuration file.
+  - If 'config' option is specified, it must contain at least one definition
+    of a configuration file.
   - Each configuration file definition must contain at least one configuration
     section definition, which is not empty (must be setting a configuration
     option).
@@ -32,10 +32,10 @@ import osbuild.api
 SCHEMA = r"""
 "additionalProperties": false,
 "properties": {
-  "configuration_files": {
+  "config": {
     "additionalProperties": false,
     "type": "object",
-    "description": "cloud-init configuration files.",
+    "description": "cloud-init configuration file.",
     "minProperties": 1,
     "patternProperties": {
       "^[\\w.-]{1,251}\\.cfg$": {
@@ -82,7 +82,7 @@ def create_configuration_file(tree, filename, options):
 
 
 def main(tree, options):
-    configuration_files_options = options.get("configuration_files", {})
+    configuration_files_options = options.get("config", {})
 
     for configuration_file, configuration_options in configuration_files_options.items():
         create_configuration_file(tree, configuration_file, configuration_options)
diff --git a/test/data/stages/cloud-init/b.json b/test/data/stages/cloud-init/b.json
index 1afcfff1..7804441f 100644
--- a/test/data/stages/cloud-init/b.json
+++ b/test/data/stages/cloud-init/b.json
@@ -506,7 +506,7 @@
       {
         "name": "org.osbuild.cloud-init",
         "options": {
-          "configuration_files": {
+          "config": {
             "00-default_user.cfg": {
               "system_info": {
                 "default_user": {
diff --git a/test/data/stages/cloud-init/b.mpp.json b/test/data/stages/cloud-init/b.mpp.json
index f130e5e6..f150ac43 100644
--- a/test/data/stages/cloud-init/b.mpp.json
+++ b/test/data/stages/cloud-init/b.mpp.json
@@ -32,7 +32,7 @@
       {
         "name": "org.osbuild.cloud-init",
         "options": {
-          "configuration_files": {
+          "config": {
             "00-default_user.cfg": {
               "system_info": {
                 "default_user": {