From 17afb5f5ad950393f82db8905ffd41d8a37b178b Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:05:40 -0700
Subject: [PATCH 01/12] DRY: Remove default parameter value handeling in
 __apt_source

---
 cdist/conf/type/__apt_source/manifest                    | 8 +++-----
 cdist/conf/type/__apt_source/parameter/default/component | 0
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__apt_source/parameter/default/component

diff --git a/cdist/conf/type/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest
index 0e782716..59c7c567 100755
--- a/cdist/conf/type/__apt_source/manifest
+++ b/cdist/conf/type/__apt_source/manifest
@@ -27,11 +27,9 @@ if [ -f "$__object/parameter/distribution" ]; then
 else
    distribution="$(cat "$__global/explorer/lsb_codename")"
 fi
-if [ -f "$__object/parameter/component" ]; then
-   component="$(cat "$__object/parameter/component")"
-else
-   component=""
-fi
+
+component="$(cat "$__object/parameter/component")"
+
 if [ -f "$__object/parameter/arch" ]; then
    forcedarch="[arch=$(cat "$__object/parameter/arch")]"
 else
diff --git a/cdist/conf/type/__apt_source/parameter/default/component b/cdist/conf/type/__apt_source/parameter/default/component
new file mode 100644
index 00000000..e69de29b

From 82f48ef27116ed458c7fc10d864292e843ddef0a Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:11:14 -0700
Subject: [PATCH 02/12] DRY: Remove default parameter value handeling in
 __apt_source

---
 cdist/conf/type/__cdistmarker/gencode-remote         | 12 ++----------
 .../type/__cdistmarker/parameter/default/destination |  1 +
 .../conf/type/__cdistmarker/parameter/default/format |  1 +
 3 files changed, 4 insertions(+), 10 deletions(-)
 create mode 100644 cdist/conf/type/__cdistmarker/parameter/default/destination
 create mode 100644 cdist/conf/type/__cdistmarker/parameter/default/format

diff --git a/cdist/conf/type/__cdistmarker/gencode-remote b/cdist/conf/type/__cdistmarker/gencode-remote
index e332df38..92ea582b 100755
--- a/cdist/conf/type/__cdistmarker/gencode-remote
+++ b/cdist/conf/type/__cdistmarker/gencode-remote
@@ -19,19 +19,11 @@
 #
 
 # The marker file is established in the docs, but it isn't obligatory.
-if [ -f "$__object/parameter/destination" ]; then
-    destination="$(cat "$__object/parameter/destination")"
-else
-    destination='/etc/cdist-configured'
-fi
+destination="$(cat "$__object/parameter/destination")"
 
 # The basic output of date is usually good enough, but variety is the
 #   spice of life...
-if [ -f "$__object/parameter/format" ]; then
-    format="$(cat "$__object/parameter/format")"
-else
-    format='-u'
-fi
+format="$(cat "$__object/parameter/format")"
 
 # Dump the timestamp in UTC to the marker
 echo "date $format > $destination"
diff --git a/cdist/conf/type/__cdistmarker/parameter/default/destination b/cdist/conf/type/__cdistmarker/parameter/default/destination
new file mode 100644
index 00000000..bd3a112f
--- /dev/null
+++ b/cdist/conf/type/__cdistmarker/parameter/default/destination
@@ -0,0 +1 @@
+/etc/cdist-configured
diff --git a/cdist/conf/type/__cdistmarker/parameter/default/format b/cdist/conf/type/__cdistmarker/parameter/default/format
new file mode 100644
index 00000000..5dc9e6ec
--- /dev/null
+++ b/cdist/conf/type/__cdistmarker/parameter/default/format
@@ -0,0 +1 @@
+-u

From 0844f717a856dc6bed936fbf94045687cd86c27a Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:26:29 -0700
Subject: [PATCH 03/12] Password is unused in the else branch

---
 cdist/conf/type/__mysql_database/gencode-remote | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cdist/conf/type/__mysql_database/gencode-remote b/cdist/conf/type/__mysql_database/gencode-remote
index 7cd32242..b1c2e6a1 100755
--- a/cdist/conf/type/__mysql_database/gencode-remote
+++ b/cdist/conf/type/__mysql_database/gencode-remote
@@ -45,7 +45,6 @@ if [ -f "$__object/parameter/user" ]; then
 EOF
 EOFF
    else
-      password=""
       cat <<-EOFF
       mysql -u root <<-EOF
       	GRANT ALL PRIVILEGES ON $database.* to '$user'@'localhost';

From 601346d48270ae0397a94612d8b167224b19b529 Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:29:45 -0700
Subject: [PATCH 04/12] DRY: Remove default parameter value handeling in
 __package_apt

---
 cdist/conf/type/__package_apt/gencode-remote          | 6 +-----
 cdist/conf/type/__package_apt/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_apt/parameter/default/state

diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote
index 1feec012..ef313070 100755
--- a/cdist/conf/type/__package_apt/gencode-remote
+++ b/cdist/conf/type/__package_apt/gencode-remote
@@ -27,11 +27,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 if [ -f "$__object/parameter/target-release" ]; then
    target_release="--target-release $(cat "$__object/parameter/target-release")"
diff --git a/cdist/conf/type/__package_apt/parameter/default/state b/cdist/conf/type/__package_apt/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_apt/parameter/default/state
@@ -0,0 +1 @@
+present

From de282c50f39aff65ae00bdc833ab8178c9e7854c Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:31:46 -0700
Subject: [PATCH 05/12] DRY: Remove default parameter value handeling in
 __package_luarocks

---
 cdist/conf/type/__package_luarocks/gencode-remote          | 6 +-----
 cdist/conf/type/__package_luarocks/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_luarocks/parameter/default/state

diff --git a/cdist/conf/type/__package_luarocks/gencode-remote b/cdist/conf/type/__package_luarocks/gencode-remote
index 7a5a5b04..1046a936 100755
--- a/cdist/conf/type/__package_luarocks/gencode-remote
+++ b/cdist/conf/type/__package_luarocks/gencode-remote
@@ -29,11 +29,7 @@ else
     name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 if grep -q "(installed)" "$__object/explorer/pkg_status"; then
     state_is="present"
diff --git a/cdist/conf/type/__package_luarocks/parameter/default/state b/cdist/conf/type/__package_luarocks/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_luarocks/parameter/default/state
@@ -0,0 +1 @@
+present

From 65f50b64b78e2c35f74c53eece5e2b530ae320db Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:32:49 -0700
Subject: [PATCH 06/12] DRY: Remove default parameter value handeling in
 __package_opkg

---
 cdist/conf/type/__package_opkg/gencode-remote          | 6 +-----
 cdist/conf/type/__package_opkg/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_opkg/parameter/default/state

diff --git a/cdist/conf/type/__package_opkg/gencode-remote b/cdist/conf/type/__package_opkg/gencode-remote
index 1fb78fbe..2df31202 100755
--- a/cdist/conf/type/__package_opkg/gencode-remote
+++ b/cdist/conf/type/__package_opkg/gencode-remote
@@ -28,11 +28,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 state_is="$(cat "$__object/explorer/pkg_status")"
 case "$state_is" in
diff --git a/cdist/conf/type/__package_opkg/parameter/default/state b/cdist/conf/type/__package_opkg/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_opkg/parameter/default/state
@@ -0,0 +1 @@
+present

From 5aaea371943d7836843006e10c03e95a5ae315a5 Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:34:38 -0700
Subject: [PATCH 07/12] DRY: Remove default parameter value handeling in
 __package_pacman

---
 cdist/conf/type/__package_pacman/gencode-remote          | 6 +-----
 cdist/conf/type/__package_pacman/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_pacman/parameter/default/state

diff --git a/cdist/conf/type/__package_pacman/gencode-remote b/cdist/conf/type/__package_pacman/gencode-remote
index 02744fa8..da1ac7c2 100755
--- a/cdist/conf/type/__package_pacman/gencode-remote
+++ b/cdist/conf/type/__package_pacman/gencode-remote
@@ -31,11 +31,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 if [ -z "$pkg_version" ]; then
diff --git a/cdist/conf/type/__package_pacman/parameter/default/state b/cdist/conf/type/__package_pacman/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pacman/parameter/default/state
@@ -0,0 +1 @@
+present

From 9fd285da4c8f2424d08dd58be493b2335122c542 Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:35:53 -0700
Subject: [PATCH 08/12] DRY: Remove default parameter value handeling in
 __package_pip

---
 cdist/conf/type/__package_pip/gencode-remote          | 6 +-----
 cdist/conf/type/__package_pip/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_pip/parameter/default/state

diff --git a/cdist/conf/type/__package_pip/gencode-remote b/cdist/conf/type/__package_pip/gencode-remote
index ec1c89f8..ba44927a 100644
--- a/cdist/conf/type/__package_pip/gencode-remote
+++ b/cdist/conf/type/__package_pip/gencode-remote
@@ -22,11 +22,7 @@
 #
 
 state_is=$(cat "$__object/explorer/state")
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 [ "$state_is" = "$state_should" ] && exit 0
 
diff --git a/cdist/conf/type/__package_pip/parameter/default/state b/cdist/conf/type/__package_pip/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pip/parameter/default/state
@@ -0,0 +1 @@
+present

From f7bf6a058ec87780d19abb73fad65f93b1a3acde Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:42:03 -0700
Subject: [PATCH 09/12] DRY: Remove default parameter value handeling in
 __package_pkg_freebsd

flavor, pkgsite and version are expected to be empty.
They're all checked with [ -n "$var" ]
---
 .../type/__package_pkg_freebsd/gencode-remote | 21 ++++---------------
 .../parameter/default/flavor                  |  0
 .../parameter/default/pkgsite                 |  0
 .../parameter/default/state                   |  1 +
 .../parameter/default/version                 |  0
 5 files changed, 5 insertions(+), 17 deletions(-)
 create mode 100644 cdist/conf/type/__package_pkg_freebsd/parameter/default/flavor
 create mode 100644 cdist/conf/type/__package_pkg_freebsd/parameter/default/pkgsite
 create mode 100644 cdist/conf/type/__package_pkg_freebsd/parameter/default/state
 create mode 100644 cdist/conf/type/__package_pkg_freebsd/parameter/default/version

diff --git a/cdist/conf/type/__package_pkg_freebsd/gencode-remote b/cdist/conf/type/__package_pkg_freebsd/gencode-remote
index 3f5ebde7..5866a0a8 100755
--- a/cdist/conf/type/__package_pkg_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkg_freebsd/gencode-remote
@@ -51,23 +51,10 @@ else
 	name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/flavor" ]; then
-	flavor="$(cat "$__object/parameter/flavor")"
-fi
-
-if [ -f "$__object/parameter/version" ]; then
-	version="$(cat "$__object/parameter/version")"
-fi
-
-if [ -f "$__object/parameter/pkgsite" ]; then
-	pkgsite="$(cat "$__object/parameter/pkgsite")"
-fi
-
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
+flavor="$(cat "$__object/parameter/flavor")"
+version="$(cat "$__object/parameter/version")"
+pkgsite="$(cat "$__object/parameter/pkgsite")"
+state="$(cat "$__object/parameter/state")"
 curr_version="$(cat "$__object/explorer/pkg_version")"
 add_cmd="pkg_add"
 rm_cmd="pkg_delete"
diff --git a/cdist/conf/type/__package_pkg_freebsd/parameter/default/flavor b/cdist/conf/type/__package_pkg_freebsd/parameter/default/flavor
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkg_freebsd/parameter/default/pkgsite b/cdist/conf/type/__package_pkg_freebsd/parameter/default/pkgsite
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkg_freebsd/parameter/default/state b/cdist/conf/type/__package_pkg_freebsd/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pkg_freebsd/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__package_pkg_freebsd/parameter/default/version b/cdist/conf/type/__package_pkg_freebsd/parameter/default/version
new file mode 100644
index 00000000..e69de29b

From ebf0479f60f5c03eed0e8a3160e32ff8e3ec44e2 Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:44:47 -0700
Subject: [PATCH 10/12] DRY: Remove default parameter value handeling in
 __package_pkgng_freebsd

flavor, repo and version are expected to be empty by default.
They're all checked with [ -n "$var" ]
---
 .../__package_pkgng_freebsd/gencode-remote    | 20 ++++---------------
 .../parameter/default/flavor                  |  0
 .../parameter/default/repo                    |  0
 .../parameter/default/state                   |  1 +
 .../parameter/default/version                 |  0
 5 files changed, 5 insertions(+), 16 deletions(-)
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/version

diff --git a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
index 39965aca..3c3e41e9 100755
--- a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
@@ -31,13 +31,8 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/flavor" ]; then
-   flavor="$(cat "$__object/parameter/flavor")"
-fi
-
-if [ -f "$__object/parameter/version" ]; then
-   version="$(cat "$__object/parameter/version")"
-fi
+flavor="$(cat "$__object/parameter/flavor")"
+version="$(cat "$__object/parameter/version")"
 
 if [ -f "$__object/parameter/upgrade" ]; then
    upgrade="true"
@@ -45,15 +40,8 @@ else
    upgrade="false"
 fi
 
-if [ -f "$__object/parameter/repo" ]; then
-   repo="$(cat "$__object/parameter/repo")"
-fi
-
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
+repo="$(cat "$__object/parameter/repo")"
+state="$(cat "$__object/parameter/state")"
 curr_version="$(cat "$__object/explorer/pkg_version")"
 add_cmd="pkg install -y"
 rm_cmd="pkg delete -y"
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/version b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/version
new file mode 100644
index 00000000..e69de29b

From 33cc3b0fa2dd66e905cd253b2a89c0bd65a2e54d Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:47:30 -0700
Subject: [PATCH 11/12] DRY: Remove default parameter value handeling in
 __package_pkg_openbsd

---
 cdist/conf/type/__package_pkg_openbsd/gencode-remote        | 6 +-----
 .../conf/type/__package_pkg_openbsd/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_pkg_openbsd/parameter/default/state

diff --git a/cdist/conf/type/__package_pkg_openbsd/gencode-remote b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
index 08e15e89..dea7f711 100755
--- a/cdist/conf/type/__package_pkg_openbsd/gencode-remote
+++ b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
@@ -42,11 +42,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 
diff --git a/cdist/conf/type/__package_pkg_openbsd/parameter/default/state b/cdist/conf/type/__package_pkg_openbsd/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pkg_openbsd/parameter/default/state
@@ -0,0 +1 @@
+present

From a938468bb04d68c29d837cf3bb6e8f4d97039a8e Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:48:42 -0700
Subject: [PATCH 12/12] DRY: Remove default parameter value handeling in
 __package_rubygem

---
 cdist/conf/type/__package_rubygem/gencode-remote          | 6 +-----
 cdist/conf/type/__package_rubygem/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__package_rubygem/parameter/default/state

diff --git a/cdist/conf/type/__package_rubygem/gencode-remote b/cdist/conf/type/__package_rubygem/gencode-remote
index 6256e308..dc755ad3 100755
--- a/cdist/conf/type/__package_rubygem/gencode-remote
+++ b/cdist/conf/type/__package_rubygem/gencode-remote
@@ -27,11 +27,7 @@ else
     name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
 if grep -q true "$__object/explorer/pkg_status"; then
     state_is="present"
diff --git a/cdist/conf/type/__package_rubygem/parameter/default/state b/cdist/conf/type/__package_rubygem/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_rubygem/parameter/default/state
@@ -0,0 +1 @@
+present