From 9e568140fa1bf49cf856932e106ca67360e1e3de Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Wed, 6 Dec 2017 22:14:25 +0100 Subject: [PATCH] According to the puppet doc, Pattern should be a list of regex. Link to the doc: https://puppet.com/docs/puppet/5.3/lang_data_abstract.html#pattern --- manifests/server/grant.pp | 82 +++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/manifests/server/grant.pp b/manifests/server/grant.pp index ecc7a76f7e..5f9c081678 100644 --- a/manifests/server/grant.pp +++ b/manifests/server/grant.pp @@ -71,11 +71,11 @@ 'ALL' => 'CREATE', 'ALL PRIVILEGES' => 'CREATE', Pattern[ - '^$', - '^CONNECT$', - '^CREATE$', - '^TEMP$', - '^TEMPORARY$' + /^$/, + /^CONNECT$/, + /^CREATE$/, + /^TEMP$/, + /^TEMPORARY$/ ] => $_privilege, default => fail('Illegal value for $privilege parameter'), } @@ -88,9 +88,9 @@ 'ALL' => 'CREATE', 'ALL PRIVILEGES' => 'CREATE', Pattern[ - '^$', - '^CREATE$', - '^USAGE$' + /^$/, + /^CREATE$/, + /^USAGE$/ ] => $_privilege, default => fail('Illegal value for $privilege parameter'), } @@ -102,11 +102,11 @@ $unless_privilege = $_privilege ? { 'ALL' => 'USAGE', Pattern[ - '^$', - '^ALL PRIVILEGES$', - '^SELECT$', - '^UPDATE$', - '^USAGE$' + /^$/, + /^ALL PRIVILEGES$/, + /^SELECT$/, + /^UPDATE$/, + /^USAGE$/ ] => $_privilege, default => fail('Illegal value for $privilege parameter'), } @@ -117,12 +117,12 @@ 'ALL SEQUENCES IN SCHEMA': { case $_privilege { Pattern[ - '^$', - '^ALL$', - '^ALL PRIVILEGES$', - '^SELECT$', - '^UPDATE$', - '^USAGE$' + /^$/, + /^ALL$/, + /^ALL PRIVILEGES$/, + /^SELECT$/, + /^UPDATE$/, + /^USAGE$/ ]: { } default: { fail('Illegal value for $privilege parameter') } } @@ -191,15 +191,15 @@ $unless_privilege = $_privilege ? { 'ALL' => 'INSERT', Pattern[ - '^$', - '^ALL$', - '^ALL PRIVILEGES$', - '^DELETE$', - '^REFERENCES$', - '^SELECT$', - '^TRIGGER$', - '^TRUNCATE$', - '^UPDATE$' + /^$/, + /^ALL$/, + /^ALL PRIVILEGES$/, + /^DELETE$/, + /^REFERENCES$/, + /^SELECT$/, + /^TRIGGER$/, + /^TRUNCATE$/, + /^UPDATE$/ ] => $_privilege, default => fail('Illegal value for $privilege parameter'), } @@ -213,16 +213,16 @@ 'ALL TABLES IN SCHEMA': { case $_privilege { Pattern[ - '^$', - '^ALL$', - '^ALL PRIVILEGES$', - '^DELETE$', - '^INSERT$', - '^REFERENCES$', - '^SELECT$', - '^TRIGGER$', - '^TRUNCATE$', - '^UPDATE$' + /^$/, + /^ALL$/, + /^ALL PRIVILEGES$/, + /^DELETE$/, + /^INSERT$/, + /^REFERENCES$/, + /^SELECT$/, + /^TRIGGER$/, + /^TRUNCATE$/, + /^UPDATE$/ ]: { } default: { fail('Illegal value for $privilege parameter') } } @@ -270,9 +270,9 @@ 'ALL' => 'USAGE', 'ALL PRIVILEGES' => 'USAGE', Pattern[ - '^$', - '^CREATE$', - '^USAGE$' + /^$/, + /^CREATE$/, + /^USAGE$/ ] => $_privilege, default => fail('Illegal value for $privilege parameter'), }