Skip to content

Commit 71da1f0

Browse files
AndersAstrandAndersAstrand
committed
Run pgperltidy
Just as we use pgindent we should probably use pgperltidy. This is an initial run of it using the following command: src/tools/pgindent/pgperltidy contrib/pg_tde
1 parent 54cd79c commit 71da1f0

12 files changed

+539
-262
lines changed

‎contrib/pg_tde/t/001_basic.pl

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,33 @@
1818

1919
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2020

21-
PGTDE::psql($node, 'postgres', 'SELECT extname, extversion FROM pg_extension WHERE extname = \'pg_tde\';');
21+
PGTDE::psql($node, 'postgres',
22+
'SELECT extname, extversion FROM pg_extension WHERE extname = \'pg_tde\';'
23+
);
2224

23-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;');
25+
PGTDE::psql($node, 'postgres',
26+
'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
27+
);
2428

2529
PGTDE::append_to_result_file("-- server restart");
2630
$node->stop();
2731
$rt_value = $node->start();
2832
ok($rt_value == 1, "Restart Server");
2933

30-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');");
34+
PGTDE::psql($node, 'postgres',
35+
"SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');"
36+
);
3137

32-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');");
38+
PGTDE::psql($node, 'postgres',
39+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');"
40+
);
3341

34-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc(id SERIAL,k VARCHAR(32),PRIMARY KEY (id)) USING tde_heap;');
42+
PGTDE::psql($node, 'postgres',
43+
'CREATE TABLE test_enc(id SERIAL,k VARCHAR(32),PRIMARY KEY (id)) USING tde_heap;'
44+
);
3545

36-
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc (k) VALUES (\'foobar\'),(\'barfoo\');');
46+
PGTDE::psql($node, 'postgres',
47+
'INSERT INTO test_enc (k) VALUES (\'foobar\'),(\'barfoo\');');
3748

3849
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
3950

@@ -47,7 +58,8 @@
4758
# Verify that we can't see the data in the file
4859
my $tablefile = $node->safe_psql('postgres', 'SHOW data_directory;');
4960
$tablefile .= '/';
50-
$tablefile .= $node->safe_psql('postgres', 'SELECT pg_relation_filepath(\'test_enc\');');
61+
$tablefile .=
62+
$node->safe_psql('postgres', 'SELECT pg_relation_filepath(\'test_enc\');');
5163

5264
my $strings = 'TABLEFILE FOUND: ';
5365
$strings .= `(ls $tablefile >/dev/null && echo yes) || echo no`;
@@ -66,6 +78,8 @@
6678
# Compare the expected and out file
6779
my $compare = PGTDE->compare_results();
6880

69-
is($compare,0,"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files.");
81+
is($compare, 0,
82+
"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files."
83+
);
7084

7185
done_testing();

‎contrib/pg_tde/t/002_rotate_key.pl

Lines changed: 87 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,84 +18,123 @@
1818

1919
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2020

21-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;');
21+
PGTDE::psql($node, 'postgres',
22+
'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
23+
);
2224

2325
PGTDE::append_to_result_file("-- server restart");
2426
$node->stop();
2527
$rt_value = $node->start();
2628
ok($rt_value == 1, "Restart Server");
2729

28-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');");
29-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_database_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2.per');");
30-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_global_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2g.per');");
31-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_global_key_provider_file('file-3','/tmp/pg_tde_test_keyring_3.per');");
32-
33-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_list_all_database_key_providers();");
34-
35-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');");
36-
37-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;');
30+
PGTDE::psql($node, 'postgres',
31+
"SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');"
32+
);
33+
PGTDE::psql($node, 'postgres',
34+
"SELECT pg_tde_add_database_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2.per');"
35+
);
36+
PGTDE::psql($node, 'postgres',
37+
"SELECT pg_tde_add_global_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2g.per');"
38+
);
39+
PGTDE::psql($node, 'postgres',
40+
"SELECT pg_tde_add_global_key_provider_file('file-3','/tmp/pg_tde_test_keyring_3.per');"
41+
);
42+
43+
PGTDE::psql($node, 'postgres',
44+
"SELECT pg_tde_list_all_database_key_providers();");
45+
46+
PGTDE::psql($node, 'postgres',
47+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');"
48+
);
49+
50+
PGTDE::psql($node, 'postgres',
51+
'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
52+
);
3853

3954
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc (k) VALUES (5),(6);');
4055

4156
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
4257

4358
# Rotate key
44-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');");
59+
PGTDE::psql($node, 'postgres',
60+
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');");
4561
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
4662

4763
PGTDE::append_to_result_file("-- server restart");
4864
$node->stop();
4965
$rt_value = $node->start();
5066
ok($rt_value == 1, "Restart Server");
5167

52-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
53-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
68+
PGTDE::psql($node, 'postgres',
69+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
70+
);
71+
PGTDE::psql($node, 'postgres',
72+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
73+
);
5474
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
5575

5676
# Again rotate key
57-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');");
77+
PGTDE::psql($node, 'postgres',
78+
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');"
79+
);
5880
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
5981

6082
PGTDE::append_to_result_file("-- server restart");
6183
$node->stop();
6284
$rt_value = $node->start();
6385
ok($rt_value == 1, "Restart Server");
6486

65-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
66-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
87+
PGTDE::psql($node, 'postgres',
88+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
89+
);
90+
PGTDE::psql($node, 'postgres',
91+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
92+
);
6793
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
6894

6995
# Again rotate key
70-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);");
96+
PGTDE::psql($node, 'postgres',
97+
"SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);"
98+
);
7199
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
72100

73101
PGTDE::append_to_result_file("-- server restart");
74102
$node->stop();
75103
$rt_value = $node->start();
76104
ok($rt_value == 1, "Restart Server");
77105

78-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
79-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
106+
PGTDE::psql($node, 'postgres',
107+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
108+
);
109+
PGTDE::psql($node, 'postgres',
110+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
111+
);
80112
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
81113

82114
# TODO: add method to query current info
83115
# And maybe debug tools to show what's in a file keyring?
84116

85117
# Again rotate key
86-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false);");
118+
PGTDE::psql($node, 'postgres',
119+
"SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false);"
120+
);
87121
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
88122

89123
PGTDE::append_to_result_file("-- server restart");
90124
$node->stop();
91125
$rt_value = $node->start();
92126
ok($rt_value == 1, "Restart Server");
93127

94-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
95-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
128+
PGTDE::psql($node, 'postgres',
129+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
130+
);
131+
PGTDE::psql($node, 'postgres',
132+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
133+
);
96134
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
97135

98-
PGTDE::psql($node, 'postgres', 'ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;');
136+
PGTDE::psql($node, 'postgres',
137+
'ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;');
99138

100139
# Things still work after a restart
101140
PGTDE::append_to_result_file("-- server restart");
@@ -104,17 +143,30 @@
104143
ok($rt_value == 1, "Restart Server");
105144

106145
# But now can't be changed to another global provider
107-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX2', 'file-2', false);");
108-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
109-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
110-
111-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');");
112-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();");
113-
PGTDE::psql($node, 'postgres', "SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();");
146+
PGTDE::psql($node, 'postgres',
147+
"SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX2', 'file-2', false);"
148+
);
149+
PGTDE::psql($node, 'postgres',
150+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
151+
);
152+
PGTDE::psql($node, 'postgres',
153+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
154+
);
155+
156+
PGTDE::psql($node, 'postgres',
157+
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');"
158+
);
159+
PGTDE::psql($node, 'postgres',
160+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"
161+
);
162+
PGTDE::psql($node, 'postgres',
163+
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
164+
);
114165

115166
PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc;');
116167

117-
PGTDE::psql($node, 'postgres', 'ALTER SYSTEM RESET pg_tde.inherit_global_providers;');
168+
PGTDE::psql($node, 'postgres',
169+
'ALTER SYSTEM RESET pg_tde.inherit_global_providers;');
118170

119171
PGTDE::append_to_result_file("-- server restart");
120172
$node->stop();
@@ -128,6 +180,8 @@
128180
# Compare the expected and out file
129181
my $compare = PGTDE->compare_results();
130182

131-
is($compare,0,"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files.");
183+
is($compare, 0,
184+
"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files."
185+
);
132186

133187
done_testing();

‎contrib/pg_tde/t/003_remote_config.pl

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,44 @@
88
use pgtde;
99

1010
{
11-
package MyWebServer;
12-
13-
use HTTP::Server::Simple::CGI;
14-
use base qw(HTTP::Server::Simple::CGI);
15-
16-
my %dispatch = (
17-
'/hello' => \&resp_hello,
18-
);
19-
20-
sub handle_request {
21-
my $self = shift;
22-
my $cgi = shift;
23-
24-
my $path = $cgi->path_info();
25-
my $handler = $dispatch{$path};
26-
27-
if (ref($handler) eq "CODE") {
28-
print "HTTP/1.0 200 OK\r\n";
29-
$handler->($cgi);
30-
31-
} else {
32-
print "HTTP/1.0 404 Not found\r\n";
33-
print $cgi->header,
34-
$cgi->start_html('Not found'),
35-
$cgi->h1('Not found'),
36-
$cgi->end_html;
37-
}
38-
}
3911

40-
sub resp_hello {
41-
my $cgi = shift;
42-
print $cgi->header,
43-
"/tmp/http_datafile\r\n";
44-
}
45-
12+
package MyWebServer;
13+
14+
use HTTP::Server::Simple::CGI;
15+
use base qw(HTTP::Server::Simple::CGI);
16+
17+
my %dispatch = ('/hello' => \&resp_hello,);
18+
19+
sub handle_request
20+
{
21+
my $self = shift;
22+
my $cgi = shift;
23+
24+
my $path = $cgi->path_info();
25+
my $handler = $dispatch{$path};
26+
27+
if (ref($handler) eq "CODE")
28+
{
29+
print "HTTP/1.0 200 OK\r\n";
30+
$handler->($cgi);
31+
32+
}
33+
else
34+
{
35+
print "HTTP/1.0 404 Not found\r\n";
36+
print $cgi->header,
37+
$cgi->start_html('Not found'),
38+
$cgi->h1('Not found'),
39+
$cgi->end_html;
40+
}
41+
}
42+
43+
sub resp_hello
44+
{
45+
my $cgi = shift;
46+
print $cgi->header, "/tmp/http_datafile\r\n";
47+
}
48+
4649
}
4750

4851
my $pid = MyWebServer->new(8888)->background();
@@ -58,10 +61,16 @@ sub resp_hello {
5861

5962
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
6063

61-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8888/hello' ));");
62-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');");
64+
PGTDE::psql($node, 'postgres',
65+
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8888/hello' ));"
66+
);
67+
PGTDE::psql($node, 'postgres',
68+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');"
69+
);
6370

64-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;');
71+
PGTDE::psql($node, 'postgres',
72+
'CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
73+
);
6574

6675
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5),(6);');
6776

@@ -85,6 +94,8 @@ sub resp_hello {
8594
# Compare the expected and out file
8695
my $compare = PGTDE->compare_results();
8796

88-
is($compare,0,"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files.");
97+
is($compare, 0,
98+
"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files."
99+
);
89100

90101
done_testing();

‎contrib/pg_tde/t/004_file_config.pl

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,16 @@
2222

2323
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2424

25-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'file', 'path' VALUE '/tmp/datafile-location' ));");
26-
PGTDE::psql($node, 'postgres', "SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');");
25+
PGTDE::psql($node, 'postgres',
26+
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'file', 'path' VALUE '/tmp/datafile-location' ));"
27+
);
28+
PGTDE::psql($node, 'postgres',
29+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');"
30+
);
2731

28-
PGTDE::psql($node, 'postgres', 'CREATE TABLE test_enc1(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;');
32+
PGTDE::psql($node, 'postgres',
33+
'CREATE TABLE test_enc1(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
34+
);
2935

3036
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc1 (k) VALUES (5),(6);');
3137

@@ -47,6 +53,8 @@
4753
# Compare the expected and out file
4854
my $compare = PGTDE->compare_results();
4955

50-
is($compare,0,"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files.");
56+
is($compare, 0,
57+
"Compare Files: $PGTDE::expected_filename_with_path and $PGTDE::out_filename_with_path files."
58+
);
5159

5260
done_testing();

0 commit comments

Comments
 (0)