Skip to content

Use curly brace format instead of explicit ARRAY keyword when specifying Redshift group members #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2017
Merged

Use curly brace format instead of explicit ARRAY keyword when specifying Redshift group members #10

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b3ec13
Use curly brace syntax instead of ARRAY syntax for group members
y-trobinso Jul 31, 2017
b6865c8
Update tests to apply the new array format
y-trobinso Jul 31, 2017
150eea7
Replace puppet array syntax with psql array syntax, thus allowing a p…
y-trobinso Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions manifests/server/dbgroup.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
define postgresql::server::dbgroup(
$db = $postgresql::server::default_database,
$port = undef,
$groupmembers = [],
$groupmembers = '{}',
$groupname = $title,
$dialect = $postgresql::server::dialect,
$connect_settings = undef,
Expand Down Expand Up @@ -44,8 +44,8 @@
require => Class['Postgresql::Server'],
}

postgresql_psql {"${title}: UPDATE pg_group SET grolist = ARRAY${groupmembers} WHERE groname = '${groupname}'":
command => "UPDATE pg_group SET grolist = ARRAY${groupmembers} WHERE groname = '${groupname}'",
unless => "SELECT 1 FROM pg_group WHERE groname = '${groupname}' AND grolist = ARRAY${groupmembers}",
postgresql_psql {"${title}: UPDATE pg_group SET grolist = '${groupmembers}' WHERE groname = '${groupname}'":
command => "UPDATE pg_group SET grolist = '${groupmembers}' WHERE groname = '${groupname}'",
unless => "SELECT 1 FROM pg_group WHERE groname = '${groupname}' AND grolist = '${groupmembers}'",
}
}
18 changes: 8 additions & 10 deletions spec/unit/defines/server/dbgroup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@
'port' => "5432",
})
end
it 'should have update pg_group for test group with groupmembers as []' do
is_expected.to contain_postgresql_psql("test: UPDATE pg_group SET grolist = ARRAY[] WHERE groname = 'test'").with({
'command' => "UPDATE pg_group SET grolist = ARRAY[] WHERE groname = 'test'",
'environment' => [],
'unless' => "SELECT 1 FROM pg_group WHERE groname = 'test' AND grolist = ARRAY[]",
it 'should have update pg_group for test group with groupmembers as {}' do
is_expected.to contain_postgresql_psql("test: UPDATE pg_group SET grolist = '{}' WHERE groname = 'test'").with({
'command' => "UPDATE pg_group SET grolist = '{}' WHERE groname = 'test'",
'unless' => "SELECT 1 FROM pg_group WHERE groname = 'test' AND grolist = '{}'",
'port' => "5432",
})
end
Expand All @@ -51,7 +50,7 @@

let :params do
{
:groupmembers => ['testuser1', 'testuser2'],
:groupmembers => "{\"testuser1\", \"testuser2\"}",
Copy link
Member

@danielpops danielpops Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I much preferred the prior API. Is it possible to expose the previous API to the caller (array of names) and then do the escaping / formatting yourself inside postgresql::server::dbgroup?

Copy link
Author

@y-trobinso y-trobinso Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a set of regexp rules to convert puppet arrays to psql arrays.

}
end

Expand All @@ -65,10 +64,9 @@
})
end
it 'should have update pg_group for test group with provided groupmembers' do
is_expected.to contain_postgresql_psql("test: UPDATE pg_group SET grolist = ARRAY[testuser1, testuser2] WHERE groname = 'test'").with({
'command' => "UPDATE pg_group SET grolist = ARRAY[testuser1, testuser2] WHERE groname = 'test'",
'environment' => [],
'unless' => "SELECT 1 FROM pg_group WHERE groname = 'test' AND grolist = ARRAY[testuser1, testuser2]",
is_expected.to contain_postgresql_psql("test: UPDATE pg_group SET grolist = '{\"testuser1\", \"testuser2\"}' WHERE groname = 'test'").with({
'command' => "UPDATE pg_group SET grolist = '{\"testuser1\", \"testuser2\"}' WHERE groname = 'test'",
'unless' => "SELECT 1 FROM pg_group WHERE groname = 'test' AND grolist = '{\"testuser1\", \"testuser2\"}'",
'port' => "5432",
})
end
Expand Down
1 change: 0 additions & 1 deletion spec/unit/defines/server/role_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@
it 'should have an alter statement to set PASSWORD DISABLE' do
is_expected.to contain_postgresql_psql('test: ALTER USER "test" PASSWORD DISABLE').with({
'command' => "ALTER USER \"test\" PASSWORD DISABLE",
'environment' => [],
'port' => "5432",
})
end
Expand Down