Skip to content

Commit 2dfeb76

Browse files
silugsilug
committed
Refactor to be more consistent
1 parent 9556bc8 commit 2dfeb76

File tree

9 files changed

+247
-375
lines changed

9 files changed

+247
-375
lines changed

‎manifests/provider/files.pp‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,25 @@
2121
Optional[Array[Stdlib::Absolutepath]] $passwd_files = undef,
2222
Optional[Array[Stdlib::Absolutepath]] $group_files = undef,
2323
) {
24-
# Build configuration content for the Files provider
25-
$_content = [
26-
'# sssd::provider::files',
27-
]
24+
# Build configuration lines in order (matching expected test output)
25+
$passwd_files_line = ($passwd_files and !$passwd_files.empty) ? { true => ["passwd_files = ${passwd_files.join(', ')}"], false => [] }
26+
$group_files_line = ($group_files and !$group_files.empty) ? { true => ["group_files = ${group_files.join(', ')}"], false => [] }
2827

29-
# Add conditional parameters if defined
30-
if $passwd_files and !$passwd_files.empty {
31-
$_passwd_files_entries = ["passwd_files = ${passwd_files.join(', ')}"]
32-
} else {
33-
$_passwd_files_entries = []
34-
}
35-
36-
if $group_files and !$group_files.empty {
37-
$_group_files_entries = ["group_files = ${group_files.join(', ')}"]
38-
} else {
39-
$_group_files_entries = []
40-
}
41-
42-
# Combine all configuration entries
43-
$_all_entries = $_content + $_passwd_files_entries + $_group_files_entries
28+
# Combine all lines in order
29+
$config_lines = (
30+
$passwd_files_line +
31+
$group_files_line
32+
)
4433

45-
$_final_content = "${_all_entries.join("\n")}"
34+
# Join all configuration lines
35+
$content = "${(['# sssd::provider::files'] + $config_lines).join("\n")}"
4636

4737
sssd::config::entry { "puppet_provider_${name}_files":
4838
content => epp(
4939
"${module_name}/generic.epp",
5040
{
5141
'title' => "domain/${title}",
52-
'content' => $_final_content,
42+
'content' => $content,
5343
}
5444
),
5545
}

‎manifests/provider/krb5.pp‎

Lines changed: 52 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -45,103 +45,64 @@
4545
Integer $krb5_renew_interval = 0,
4646
Optional[Enum['never','try','demand']] $krb5_use_fast = undef,
4747
) {
48-
# Build configuration content for the Kerberos provider
49-
$_content = [
50-
'# sssd::provider::krb5',
51-
]
52-
53-
# Add conditional parameters if defined in the correct order
54-
if $debug_level {
55-
$_debug_level_entries = ["debug_level = ${debug_level}"]
56-
} else {
57-
$_debug_level_entries = []
58-
}
59-
60-
$_debug_timestamps_entries = $debug_timestamps ? {
61-
true => ['debug_timestamps = true'],
62-
false => ['debug_timestamps = false'],
63-
}
64-
65-
$_debug_microseconds_entries = $debug_microseconds ? {
66-
true => ['debug_microseconds = true'],
67-
false => ['debug_microseconds = false'],
68-
}
69-
70-
if $krb5_server {
71-
$_krb5_server_entries = ["krb5_server = ${krb5_server}"]
72-
} else {
73-
$_krb5_server_entries = []
74-
}
75-
76-
$_krb5_realm_entries = ["krb5_realm = ${krb5_realm}"]
77-
78-
if $krb5_kpasswd {
79-
$_krb5_kpasswd_entries = ["krb5_kpasswd = ${krb5_kpasswd}"]
80-
} else {
81-
$_krb5_kpasswd_entries = []
82-
}
83-
84-
if $krb5_ccachedir {
85-
$_krb5_ccachedir_entries = ["krb5_ccachedir = ${krb5_ccachedir}"]
86-
} else {
87-
$_krb5_ccachedir_entries = []
88-
}
89-
90-
if $krb5_ccname_template {
91-
$_krb5_ccname_template_entries = ["krb5_ccname_template = ${krb5_ccname_template}"]
92-
} else {
93-
$_krb5_ccname_template_entries = []
94-
}
95-
96-
$_krb5_auth_timeout_entries = ["krb5_auth_timeout = ${krb5_auth_timeout}"]
97-
98-
$_krb5_validate_entries = $krb5_validate ? {
99-
true => ['krb5_validate = true'],
100-
false => ['krb5_validate = false'],
101-
}
102-
103-
if $krb5_keytab {
104-
$_krb5_keytab_entries = ["krb5_keytab = ${krb5_keytab}"]
105-
} else {
106-
$_krb5_keytab_entries = []
107-
}
108-
109-
$_krb5_store_password_if_offline_entries = $krb5_store_password_if_offline ? {
110-
true => ['krb5_store_password_if_offline = true'],
111-
false => ['krb5_store_password_if_offline = false'],
112-
}
113-
114-
if $krb5_renewable_lifetime {
115-
$_krb5_renewable_lifetime_entries = ["krb5_renewable_lifetime = ${krb5_renewable_lifetime}"]
116-
} else {
117-
$_krb5_renewable_lifetime_entries = []
118-
}
119-
120-
if $krb5_lifetime {
121-
$_krb5_lifetime_entries = ["krb5_lifetime = ${krb5_lifetime}"]
122-
} else {
123-
$_krb5_lifetime_entries = []
124-
}
125-
126-
$_krb5_renew_interval_entries = ["krb5_renew_interval = ${krb5_renew_interval}"]
127-
128-
if $krb5_use_fast {
129-
$_krb5_use_fast_entries = ["krb5_use_fast = ${krb5_use_fast}"]
130-
} else {
131-
$_krb5_use_fast_entries = []
132-
}
133-
134-
# Combine all configuration entries in the expected order
135-
$_all_entries = $_content + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_krb5_server_entries + $_krb5_realm_entries + $_krb5_kpasswd_entries + $_krb5_ccachedir_entries + $_krb5_ccname_template_entries + $_krb5_auth_timeout_entries + $_krb5_validate_entries + $_krb5_keytab_entries + $_krb5_store_password_if_offline_entries + $_krb5_renewable_lifetime_entries + $_krb5_lifetime_entries + $_krb5_renew_interval_entries + $_krb5_use_fast_entries
136-
137-
$_final_content = "${_all_entries.join("\n")}"
48+
# Build configuration lines in order (matching expected test output)
49+
# Debug settings
50+
$debug_level_line = $debug_level ? { undef => [], default => ["debug_level = ${debug_level}"] }
51+
$debug_timestamps_line = ["debug_timestamps = ${debug_timestamps}"]
52+
$debug_microseconds_line = ["debug_microseconds = ${debug_microseconds}"]
53+
54+
# Kerberos server settings
55+
$krb5_server_line = $krb5_server ? { undef => [], default => ["krb5_server = ${krb5_server}"] }
56+
$krb5_realm_line = ["krb5_realm = ${krb5_realm}"]
57+
$krb5_kpasswd_line = $krb5_kpasswd ? { undef => [], default => ["krb5_kpasswd = ${krb5_kpasswd}"] }
58+
59+
# Cache settings
60+
$krb5_ccachedir_line = $krb5_ccachedir ? { undef => [], default => ["krb5_ccachedir = ${krb5_ccachedir}"] }
61+
$krb5_ccname_template_line = $krb5_ccname_template ? { undef => [], default => ["krb5_ccname_template = ${krb5_ccname_template}"] }
62+
63+
# Authentication settings
64+
$krb5_auth_timeout_line = ["krb5_auth_timeout = ${krb5_auth_timeout}"]
65+
$krb5_validate_line = ["krb5_validate = ${krb5_validate}"]
66+
$krb5_keytab_line = $krb5_keytab ? { undef => [], default => ["krb5_keytab = ${krb5_keytab}"] }
67+
$krb5_store_password_if_offline_line = ["krb5_store_password_if_offline = ${krb5_store_password_if_offline}"]
68+
69+
# Lifetime settings
70+
$krb5_renewable_lifetime_line = $krb5_renewable_lifetime ? { undef => [], default => ["krb5_renewable_lifetime = ${krb5_renewable_lifetime}"] }
71+
$krb5_lifetime_line = $krb5_lifetime ? { undef => [], default => ["krb5_lifetime = ${krb5_lifetime}"] }
72+
$krb5_renew_interval_line = ["krb5_renew_interval = ${krb5_renew_interval}"]
73+
74+
# Advanced settings
75+
$krb5_use_fast_line = $krb5_use_fast ? { undef => [], default => ["krb5_use_fast = ${krb5_use_fast}"] }
76+
77+
# Combine all lines in order
78+
$config_lines = (
79+
$debug_level_line +
80+
$debug_timestamps_line +
81+
$debug_microseconds_line +
82+
$krb5_server_line +
83+
$krb5_realm_line +
84+
$krb5_kpasswd_line +
85+
$krb5_ccachedir_line +
86+
$krb5_ccname_template_line +
87+
$krb5_auth_timeout_line +
88+
$krb5_validate_line +
89+
$krb5_keytab_line +
90+
$krb5_store_password_if_offline_line +
91+
$krb5_renewable_lifetime_line +
92+
$krb5_lifetime_line +
93+
$krb5_renew_interval_line +
94+
$krb5_use_fast_line
95+
)
96+
97+
# Join all configuration lines
98+
$content = $config_lines.join("\n")
13899

139100
sssd::config::entry { "puppet_provider_${name}_krb5":
140101
content => epp(
141102
"${module_name}/generic.epp",
142103
{
143104
'title' => "domain/${title}",
144-
'content' => $_final_content,
105+
'content' => "# sssd::provider::krb5\n${content}",
145106
},
146107
),
147108
}

‎manifests/service/autofs.pp‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,45 +37,35 @@
3737
},
3838
)
3939
} else {
40-
# Build configuration content for the AutoFS service
41-
$_base_content = [
42-
'# sssd::service::autofs',
43-
'[autofs]',
44-
]
40+
# Build configuration lines in order (matching expected test output)
41+
# Debug settings
42+
$description_line = $description ? { undef => [], default => ["description = ${description}"] }
43+
$debug_level_line = $debug_level ? { undef => [], default => ["debug_level = ${debug_level}"] }
44+
$debug_timestamps_line = ["debug_timestamps = ${debug_timestamps}"]
45+
$debug_microseconds_line = ["debug_microseconds = ${debug_microseconds}"]
4546

46-
# Add conditional parameters if defined
47-
if $description {
48-
$_description_entries = ["description = ${description}"]
49-
} else {
50-
$_description_entries = []
51-
}
47+
# AutoFS-specific settings
48+
$autofs_negative_timeout_line = $autofs_negative_timeout ? { undef => [], default => ["autofs_negative_timeout = ${autofs_negative_timeout}"] }
5249

53-
if $debug_level {
54-
$_debug_level_entries = ["debug_level = ${debug_level}"]
55-
} else {
56-
$_debug_level_entries = []
57-
}
58-
59-
$_debug_timestamps_entries = $debug_timestamps ? {
60-
true => ['debug_timestamps = true'],
61-
false => ['debug_timestamps = false'],
62-
}
63-
64-
$_debug_microseconds_entries = $debug_microseconds ? {
65-
true => ['debug_microseconds = true'],
66-
false => ['debug_microseconds = false'],
67-
}
68-
69-
if $autofs_negative_timeout {
70-
$_autofs_negative_timeout_entries = ["autofs_negative_timeout = ${autofs_negative_timeout}"]
71-
} else {
72-
$_autofs_negative_timeout_entries = []
73-
}
50+
# Combine all lines in order
51+
$config_lines = (
52+
$description_line +
53+
$debug_level_line +
54+
$debug_timestamps_line +
55+
$debug_microseconds_line +
56+
$autofs_negative_timeout_line
57+
)
7458

75-
# Combine all configuration entries in the expected order
76-
$_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_autofs_negative_timeout_entries
59+
# Join all configuration lines
60+
$content = $config_lines.join("\n")
7761

78-
$_content = "${_all_entries.join("\n")}\n"
62+
$_content = epp(
63+
"${module_name}/generic.epp",
64+
{
65+
'title' => 'autofs',
66+
'content' => "# sssd::service::autofs\n${content}",
67+
},
68+
)
7969
}
8070

8171
sssd::config::entry { 'puppet_service_autofs':

‎manifests/service/ifp.pp‎

Lines changed: 29 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -42,57 +42,39 @@
4242
},
4343
)
4444
} else {
45-
# Build configuration content for the IFP service
46-
$_base_content = [
47-
'# sssd::service::ifp',
48-
'[ifp]',
49-
]
45+
# Build configuration lines in order (matching expected test output)
46+
# Debug settings
47+
$description_line = $description ? { undef => [], default => ["description = ${description}"] }
48+
$debug_level_line = $debug_level ? { undef => [], default => ["debug_level = ${debug_level}"] }
49+
$debug_timestamps_line = ["debug_timestamps = ${debug_timestamps}"]
50+
$debug_microseconds_line = ["debug_microseconds = ${debug_microseconds}"]
5051

51-
# Add conditional parameters if defined
52-
if $description {
53-
$_description_entries = ["description = ${description}"]
54-
} else {
55-
$_description_entries = []
56-
}
52+
# IFP-specific settings
53+
$allowed_uids_line = $allowed_uids ? { undef => [], default => ["allowed_uids = ${allowed_uids.join(', ')}"] }
54+
$user_attributes_line = $user_attributes ? { undef => [], default => ["user_attributes = ${user_attributes.join(', ')}"] }
55+
$wildcard_limit_line = $wildcard_limit ? { undef => [], default => ["wildcard_limit = ${wildcard_limit}"] }
5756

58-
if $debug_level {
59-
$_debug_level_entries = ["debug_level = ${debug_level}"]
60-
} else {
61-
$_debug_level_entries = []
62-
}
63-
64-
$_debug_timestamps_entries = $debug_timestamps ? {
65-
true => ['debug_timestamps = true'],
66-
false => ['debug_timestamps = false'],
67-
}
68-
69-
$_debug_microseconds_entries = $debug_microseconds ? {
70-
true => ['debug_microseconds = true'],
71-
false => ['debug_microseconds = false'],
72-
}
73-
74-
if $allowed_uids {
75-
$_allowed_uids_entries = ["allowed_uids = ${allowed_uids.join(', ')}"]
76-
} else {
77-
$_allowed_uids_entries = []
78-
}
79-
80-
if $user_attributes {
81-
$_user_attributes_entries = ["user_attributes = ${user_attributes.join(', ')}"]
82-
} else {
83-
$_user_attributes_entries = []
84-
}
85-
86-
if $wildcard_limit {
87-
$_wildcard_limit_entries = ["wildcard_limit = ${wildcard_limit}"]
88-
} else {
89-
$_wildcard_limit_entries = []
90-
}
57+
# Combine all lines in order
58+
$config_lines = (
59+
$description_line +
60+
$debug_level_line +
61+
$debug_timestamps_line +
62+
$debug_microseconds_line +
63+
$allowed_uids_line +
64+
$user_attributes_line +
65+
$wildcard_limit_line
66+
)
9167

92-
# Combine all configuration entries in the expected order
93-
$_all_entries = $_base_content + $_description_entries + $_debug_level_entries + $_debug_timestamps_entries + $_debug_microseconds_entries + $_allowed_uids_entries + $_user_attributes_entries + $_wildcard_limit_entries
68+
# Join all configuration lines
69+
$content = $config_lines.join("\n")
9470

95-
$_content = "${_all_entries.join("\n")}\n"
71+
$_content = epp(
72+
"${module_name}/generic.epp",
73+
{
74+
'title' => 'ifp',
75+
'content' => "# sssd::service::ifp\n${content}",
76+
},
77+
)
9678
}
9779

9880
sssd::config::entry { 'puppet_service_ifp':

0 commit comments

Comments
 (0)