Skip to content

Commit fa5023b

Browse files
david22swandavid22swan
committed
(GH-cat-9) syntax:hiera:yaml fixes
1 parent 17a940a commit fa5023b

File tree

12 files changed

+68
-71
lines changed

12 files changed

+68
-71
lines changed

‎examples/database_full.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
sqlserver::config{ 'MSSQLSERVER':
1+
sqlserver::config { 'MSSQLSERVER':
22
admin_user => 'sa',
33
admin_pass => 'Pupp3t1@',
44
}
5-
sqlserver::database{ 'testdb_full':
5+
sqlserver::database { 'testdb_full':
66
instance => 'MSSQLSERVER',
77
containment => 'PARTIAL',
88
compatibility => 110,

‎examples/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
$sapwd = 'Pupp3t1@'
1313
$instance_name = 'MSSQLSERVER'
1414

15-
sqlserver_instance{ $instance_name:
15+
sqlserver_instance { $instance_name:
1616
source => 'E:/',
1717
security_mode => 'SQL',
1818
sa_pwd => $sapwd,
1919
features => ['SQL'],
2020
sql_sysadmin_accounts => ['vagrant'],
2121
}
2222

23-
sqlserver::config{ 'MSSQLSERVER':
23+
sqlserver::config { 'MSSQLSERVER':
2424
admin_user => 'sa',
2525
admin_pass => 'Pupp3t1@',
2626
require => Mssql_instance[$instance_name],
2727
}
2828

29-
sqlserver::login{ 'padmin':
29+
sqlserver::login { 'padmin':
3030
password => 'PadminP@ssw0rd1',
3131
instance => $instance_name,
3232
}

‎examples/sp_configure.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
sqlserver::config{ 'MSSQLSERVER':
1+
sqlserver::config { 'MSSQLSERVER':
22
admin_user => 'sa',
33
admin_pass => 'Pupp3t1@',
44
require => Mssql_instance[$instance_name],
55
}
66
#Enable Filestream access on server
7-
sqlserver::sp_configure{ 'filestream access level':
7+
sqlserver::sp_configure { 'filestream access level':
88
value => 1,
99
}
1010
#Enable Partial Contained databases on server
11-
sqlserver::sp_configure{ 'contained database authentication':
11+
sqlserver::sp_configure { 'contained database authentication':
1212
value => 1,
1313
reconfigure => true,
1414
with_override => false,

‎manifests/config.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
# }
2323
#
2424
define sqlserver::config (
25-
Optional[Variant[Sensitive[String], String]] $admin_user = '',
26-
Optional[Variant[Sensitive[String], String]] $admin_pass = '',
25+
Variant[Sensitive[String], String] $admin_user = '',
26+
Variant[Sensitive[String], String] $admin_pass = '',
2727
Enum['SQL_LOGIN', 'WINDOWS_LOGIN'] $admin_login_type = 'SQL_LOGIN',
2828
String[1,16] $instance_name = $title,
2929
) {

‎manifests/database.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
Integer[1753, 9999] $two_digit_year_cutoff = 2049,
128128
Enum['ON', 'OFF'] $db_chaining = 'OFF',
129129
Enum['ON', 'OFF'] $trustworthy = 'OFF',
130-
){
130+
) {
131131
##
132132
# validate max size
133133
# Specifies that the file grows until the disk is full. In SQL Server, a log file specified with unlimited growth has

‎manifests/login.pp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,14 @@
5757
Enum['SQL_LOGIN', 'WINDOWS_LOGIN'] $login_type = 'SQL_LOGIN',
5858
Enum['present', 'absent'] $ensure = 'present',
5959
Optional[Variant[Sensitive[String], String]] $password = undef,
60-
Optional[Hash] $svrroles = { },
60+
Hash $svrroles = {},
6161
String $default_database = 'master',
6262
String $default_language = 'us_english',
6363
Boolean $check_expiration = false,
6464
Boolean $check_policy = true,
6565
Boolean $disabled = false,
66-
Optional[Hash] $permissions = { },
66+
Hash $permissions = {},
6767
) {
68-
6968
sqlserver_validate_instance_name($instance)
7069

7170
if $check_expiration and !$check_policy {
@@ -77,42 +76,42 @@
7776
absent => 'delete',
7877
}
7978

80-
sqlserver_tsql{ "login-${instance}-${login}":
79+
sqlserver_tsql { "login-${instance}-${login}":
8180
instance => $instance,
8281
command => template("sqlserver/${_create_delete}/login.sql.erb"),
8382
onlyif => template('sqlserver/query/login_exists.sql.erb'),
84-
require => Sqlserver::Config[$instance]
83+
require => Sqlserver::Config[$instance],
8584
}
8685

8786
if $ensure == present {
8887
$_upermissions = sqlserver_upcase($permissions)
8988
sqlserver_validate_hash_uniq_values($_upermissions, "Duplicate permissions found for sqlserver::login[${title}]")
9089

91-
Sqlserver::Login::Permissions{
90+
Sqlserver::Login::Permissions {
9291
login => $login,
9392
instance => $instance,
94-
require => Sqlserver_tsql["login-${instance}-${login}"]
93+
require => Sqlserver_tsql["login-${instance}-${login}"],
9594
}
9695
if has_key($_upermissions, 'GRANT') and is_array($_upermissions['GRANT']) {
97-
sqlserver::login::permissions{ "Sqlserver::Login[${title}]-GRANT-${login}":
96+
sqlserver::login::permissions { "Sqlserver::Login[${title}]-GRANT-${login}":
9897
state => 'GRANT',
9998
permissions => $_upermissions['GRANT'],
10099
}
101100
}
102101
if has_key($_upermissions, 'DENY') and is_array($_upermissions['DENY']) {
103-
sqlserver::login::permissions{ "Sqlserver::Login[${title}]-DENY-${login}":
102+
sqlserver::login::permissions { "Sqlserver::Login[${title}]-DENY-${login}":
104103
state => 'DENY',
105104
permissions => $_upermissions['DENY'],
106105
}
107106
}
108107
if has_key($_upermissions, 'REVOKE') and is_array($_upermissions['REVOKE']) {
109-
sqlserver::login::permissions{ "Sqlserver::Login[${title}]-REVOKE-${login}":
108+
sqlserver::login::permissions { "Sqlserver::Login[${title}]-REVOKE-${login}":
110109
state => 'REVOKE',
111110
permissions => $_upermissions['REVOKE'],
112111
}
113112
}
114113
if has_key($_upermissions, 'GRANT_WITH_OPTION') and is_array($_upermissions['GRANT_WITH_OPTION']) {
115-
sqlserver::login::permissions{ "Sqlserver::Login[${title}]-GRANT-WITH_GRANT_OPTION-${login}":
114+
sqlserver::login::permissions { "Sqlserver::Login[${title}]-GRANT-WITH_GRANT_OPTION-${login}":
116115
state => 'GRANT',
117116
with_grant_option => true,
118117
permissions => $_upermissions['GRANT_WITH_OPTION'],

‎manifests/login/permissions.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
String[1,128] $login,
2828
Array[String[4,128]] $permissions,
2929
Pattern[/(?i)^(GRANT|REVOKE|DENY)$/] $state = 'GRANT',
30-
Optional[Boolean] $with_grant_option = false,
31-
String[1,16] $instance = 'MSSQLSERVER',
32-
){
30+
Boolean $with_grant_option = false,
31+
String[1,16] $instance = 'MSSQLSERVER',
32+
) {
3333
sqlserver_validate_instance_name($instance)
3434

3535
$_state = upcase($state)
@@ -38,7 +38,7 @@
3838
true => '-WITH_GRANT_OPTION',
3939
default => ''
4040
}
41-
sqlserver_tsql{ "login-permission-${instance}-${login}-${_state}${_grant_option}":
41+
sqlserver_tsql { "login-permission-${instance}-${login}-${_state}${_grant_option}":
4242
instance => $instance,
4343
command => template('sqlserver/create/login/permission.sql.erb'),
4444
onlyif => template('sqlserver/query/login/permission_exists.sql.erb'),

‎manifests/role.pp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
# @param members_purge
3636
# Whether we should purge any members not listed in the members parameter. Default: false
3737
##
38-
define sqlserver::role(
39-
String[1,128] $role = $title,
40-
String[1,16] $instance = 'MSSQLSERVER',
38+
define sqlserver::role (
39+
String[1,128] $role = $title,
40+
String[1,16] $instance = 'MSSQLSERVER',
4141
Enum['present', 'absent'] $ensure = 'present',
42-
Optional[String] $authorization = undef,
43-
Enum['SERVER', 'DATABASE'] $type = 'SERVER',
44-
String[1,128] $database = 'master',
45-
Optional[Hash] $permissions = { },
46-
Array[String] $members = [],
47-
Boolean $members_purge = false,
48-
){
42+
Optional[String] $authorization = undef,
43+
Enum['SERVER', 'DATABASE'] $type = 'SERVER',
44+
String[1,128] $database = 'master',
45+
Hash $permissions = {},
46+
Array[String] $members = [],
47+
Boolean $members_purge = false,
48+
) {
4949
sqlserver_validate_instance_name($instance)
5050

5151
if $type == 'SERVER' and $database != 'master' {
@@ -63,7 +63,7 @@
6363
# users. see MODULES-3355
6464
$sqlserver_tsql_title = "role-${instance}-${database}-${role}"
6565

66-
sqlserver_tsql{ $sqlserver_tsql_title:
66+
sqlserver_tsql { $sqlserver_tsql_title:
6767
command => template("sqlserver/${_create_delete}/role.sql.erb"),
6868
onlyif => template('sqlserver/query/role_exists.sql.erb'),
6969
instance => $instance,
@@ -72,41 +72,41 @@
7272
if $ensure == present {
7373
$_upermissions = sqlserver_upcase($permissions)
7474

75-
Sqlserver::Role::Permissions{
75+
Sqlserver::Role::Permissions {
7676
role => $role,
7777
instance => $instance,
7878
database => $database,
7979
type => $type,
80-
require => Sqlserver_tsql[$sqlserver_tsql_title]
80+
require => Sqlserver_tsql[$sqlserver_tsql_title],
8181
}
8282
if has_key($_upermissions, 'GRANT') and is_array($_upermissions['GRANT']) {
83-
sqlserver::role::permissions{ "Sqlserver::Role[${title}]-GRANT-${role}":
83+
sqlserver::role::permissions { "Sqlserver::Role[${title}]-GRANT-${role}":
8484
state => 'GRANT',
8585
permissions => $_upermissions['GRANT'],
8686
}
8787
}
8888
if has_key($_upermissions, 'DENY') and is_array($_upermissions['DENY']) {
89-
sqlserver::role::permissions{ "Sqlserver::Role[${title}]-DENY-${role}":
89+
sqlserver::role::permissions { "Sqlserver::Role[${title}]-DENY-${role}":
9090
state => 'DENY',
9191
permissions => $_upermissions['DENY'],
9292
}
9393
}
9494
if has_key($_upermissions, 'REVOKE') and is_array($_upermissions['REVOKE']) {
95-
sqlserver::role::permissions{ "Sqlserver::Role[${title}]-REVOKE-${role}":
95+
sqlserver::role::permissions { "Sqlserver::Role[${title}]-REVOKE-${role}":
9696
state => 'REVOKE',
9797
permissions => $_upermissions['REVOKE'],
9898
}
9999
}
100100
if has_key($_upermissions, 'GRANT_WITH_OPTION') and is_array($_upermissions['GRANT_WITH_OPTION']) {
101-
sqlserver::role::permissions{ "Sqlserver::Role[${title}]-GRANT-WITH_GRANT_OPTION-${role}":
101+
sqlserver::role::permissions { "Sqlserver::Role[${title}]-GRANT-WITH_GRANT_OPTION-${role}":
102102
state => 'GRANT',
103103
with_grant_option => true,
104104
permissions => $_upermissions['GRANT_WITH_OPTION'],
105105
}
106106
}
107107

108108
if size($members) > 0 or $members_purge == true {
109-
sqlserver_tsql{ "${sqlserver_tsql_title}-members":
109+
sqlserver_tsql { "${sqlserver_tsql_title}-members":
110110
command => template('sqlserver/create/role/members.sql.erb'),
111111
onlyif => template('sqlserver/query/role/member_exists.sql.erb'),
112112
instance => $instance,

‎manifests/role/permissions.pp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
String[1,128] $role,
3535
Array[String[4,128]] $permissions,
3636
Pattern[/(?i)^(GRANT|REVOKE|DENY)$/] $state = 'GRANT',
37-
Optional[Boolean] $with_grant_option = false,
38-
Enum['SERVER','DATABASE'] $type = 'SERVER',
39-
String[1,128] $database = 'master',
40-
String[1,16] $instance = 'MSSQLSERVER',
41-
){
37+
Boolean $with_grant_option = false,
38+
Enum['SERVER','DATABASE'] $type = 'SERVER',
39+
String[1,128] $database = 'master',
40+
String[1,16] $instance = 'MSSQLSERVER',
41+
) {
4242
if size($permissions) < 1 {
4343
warning("Received an empty set of permissions for ${title}, no further action will be taken")
44-
} else{
44+
} else {
4545
sqlserver_validate_instance_name($instance)
4646
$_state = upcase($state)
4747

@@ -52,11 +52,10 @@
5252
##
5353
# Parameters required in template are _state, role, _upermissions, database, type, with_grant_option
5454
##
55-
sqlserver_tsql{ "role-permissions-${role}-${_state}${_grant_option}-${instance}-${database}":
55+
sqlserver_tsql { "role-permissions-${role}-${_state}${_grant_option}-${instance}-${database}":
5656
instance => $instance,
5757
command => template('sqlserver/create/role/permissions.sql.erb'),
5858
onlyif => template('sqlserver/query/role/permission_exists.sql.erb'),
5959
}
6060
}
61-
6261
}

‎manifests/sp_configure.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
Boolean $reconfigure = true,
3333
Boolean $with_override = false,
3434
Boolean $restart = false,
35-
){
35+
) {
3636
sqlserver_validate_instance_name($instance)
3737

3838
$service_name = $instance ? {
@@ -44,14 +44,14 @@
4444
Sqlserver_tsql["sp_configure-${instance}-${config_name}"] ~> Exec["restart-service-${service_name}-${config_name}"]
4545
}
4646

47-
sqlserver_tsql{ "sp_configure-${instance}-${config_name}":
47+
sqlserver_tsql { "sp_configure-${instance}-${config_name}":
4848
instance => $instance,
4949
command => template('sqlserver/create/sp_configure.sql.erb'),
5050
onlyif => template('sqlserver/query/sp_configure.sql.erb'),
51-
require => Sqlserver::Config[$instance]
51+
require => Sqlserver::Config[$instance],
5252
}
5353

54-
exec{"restart-service-${service_name}-${config_name}":
54+
exec { "restart-service-${service_name}-${config_name}":
5555
command => template('sqlserver/restart_service.ps1.erb'),
5656
provider => powershell,
5757
logoutput => true,

‎manifests/user.pp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,14 @@
4545
String[1,16] $instance = 'MSSQLSERVER',
4646
Optional[String[1]] $login = undef,
4747
Optional[String[1,128]] $password = undef,
48-
Optional[Hash] $permissions = { },
49-
)
50-
{
48+
Hash $permissions = {},
49+
) {
5150
sqlserver_validate_instance_name($instance)
5251

5352
$is_windows_user = sqlserver_is_domain_or_local_user($login)
5453

5554
if $password {
56-
if $is_windows_user and $login != undef{
55+
if $is_windows_user and $login != undef {
5756
fail('Can not provide password when using a Windows Login')
5857
}
5958
}
@@ -63,43 +62,43 @@
6362
absent => 'delete',
6463
}
6564

66-
sqlserver_tsql{ "user-${instance}-${database}-${user}":
65+
sqlserver_tsql { "user-${instance}-${database}-${user}":
6766
instance => $instance,
6867
command => template("sqlserver/${create_delete}/user.sql.erb"),
6968
onlyif => template('sqlserver/query/user_exists.sql.erb'),
70-
require => Sqlserver::Config[$instance]
69+
require => Sqlserver::Config[$instance],
7170
}
7271

7372
if $ensure == present {
7473
$_upermissions = sqlserver_upcase($permissions)
7574
sqlserver_validate_hash_uniq_values($_upermissions, "Duplicate permissions found for sqlserver::user[${title}]")
7675

77-
Sqlserver::User::Permissions{
76+
Sqlserver::User::Permissions {
7877
user => $user,
7978
database => $database,
8079
instance => $instance,
81-
require => Sqlserver_tsql["user-${instance}-${database}-${user}"]
80+
require => Sqlserver_tsql["user-${instance}-${database}-${user}"],
8281
}
8382
if has_key($_upermissions, 'GRANT') and is_array($_upermissions['GRANT']) {
84-
sqlserver::user::permissions{ "Sqlserver::User[${title}]-GRANT-${user}":
83+
sqlserver::user::permissions { "Sqlserver::User[${title}]-GRANT-${user}":
8584
state => 'GRANT',
8685
permissions => $_upermissions['GRANT'],
8786
}
8887
}
8988
if has_key($_upermissions, 'DENY') and is_array($_upermissions['DENY']) {
90-
sqlserver::user::permissions{ "Sqlserver::User[${title}]-DENY-${user}":
89+
sqlserver::user::permissions { "Sqlserver::User[${title}]-DENY-${user}":
9190
state => 'DENY',
9291
permissions => $_upermissions['DENY'],
9392
}
9493
}
9594
if has_key($_upermissions, 'REVOKE') and is_array($_upermissions['REVOKE']) {
96-
sqlserver::user::permissions{ "Sqlserver::User[${title}]-REVOKE-${user}":
95+
sqlserver::user::permissions { "Sqlserver::User[${title}]-REVOKE-${user}":
9796
state => 'REVOKE',
9897
permissions => $_upermissions['REVOKE'],
9998
}
10099
}
101100
if has_key($_upermissions, 'GRANT_WITH_OPTION') and is_array($_upermissions['GRANT_WITH_OPTION']) {
102-
sqlserver::user::permissions{ "Sqlserver::User[${title}]-GRANT-WITH_GRANT_OPTION-${user}":
101+
sqlserver::user::permissions { "Sqlserver::User[${title}]-GRANT-WITH_GRANT_OPTION-${user}":
103102
state => 'GRANT',
104103
with_grant_option => true,
105104
permissions => $_upermissions['GRANT_WITH_OPTION'],

0 commit comments

Comments
 (0)