From ceedfb98c0eaf2ccf04e5b3783ffe5c9df4f6f5b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 13 Mar 2019 17:59:44 +0100 Subject: [PATCH] fix(k8s/generated): fix if definition has no options or config --- generators/k8s/default.nix | 4 ++-- modules/generated/v1.10.nix | 4 ++-- modules/generated/v1.11.nix | 4 ++-- modules/generated/v1.12.nix | 4 ++-- modules/generated/v1.13.nix | 4 ++-- modules/generated/v1.7.nix | 4 ++-- modules/generated/v1.8.nix | 4 ++-- modules/generated/v1.9.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/generators/k8s/default.nix b/generators/k8s/default.nix index c2b55d4..5c61a7d 100644 --- a/generators/k8s/default.nix +++ b/generators/k8s/default.nix @@ -302,8 +302,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions.\"\${ref}\".options; - config = definitions.\"\${ref}\".config; + options = definitions.\"\${ref}\".options or {}; + config = definitions.\"\${ref}\".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.10.nix b/modules/generated/v1.10.nix index 98a7519..94e1be5 100644 --- a/modules/generated/v1.10.nix +++ b/modules/generated/v1.10.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.11.nix b/modules/generated/v1.11.nix index c701166..f615230 100644 --- a/modules/generated/v1.11.nix +++ b/modules/generated/v1.11.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.12.nix b/modules/generated/v1.12.nix index e484afe..f3d1b44 100644 --- a/modules/generated/v1.12.nix +++ b/modules/generated/v1.12.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.13.nix b/modules/generated/v1.13.nix index b68aa8c..48b61c9 100644 --- a/modules/generated/v1.13.nix +++ b/modules/generated/v1.13.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.7.nix b/modules/generated/v1.7.nix index 586f2ef..e58e9e4 100644 --- a/modules/generated/v1.7.nix +++ b/modules/generated/v1.7.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.8.nix b/modules/generated/v1.8.nix index 167a6c9..d8b33d5 100644 --- a/modules/generated/v1.8.nix +++ b/modules/generated/v1.8.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let diff --git a/modules/generated/v1.9.nix b/modules/generated/v1.9.nix index fa4c90e..7bc8e9e 100644 --- a/modules/generated/v1.9.nix +++ b/modules/generated/v1.9.nix @@ -56,8 +56,8 @@ let values); submoduleOf = ref: types.submodule ({name, ...}: { - options = definitions."${ref}".options; - config = definitions."${ref}".config; + options = definitions."${ref}".options or {}; + config = definitions."${ref}".config or {}; }); submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let