Skip to content

Commit 832cbb4

Browse files
jeltzjeltz
committed
Convert output of TAP tests to be more like pg_regress
This improves readbility of diffs a lot.
1 parent 908d077 commit 832cbb4

11 files changed

+547
-135
lines changed

‎contrib/pg_tde/t/expected/001_basic.out

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,43 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT extname, extversion FROM pg_extension WHERE extname = 'pg_tde';
3-
pg_tde|1.0-rc
3+
extname | extversion
4+
---------+------------
5+
pg_tde | 1.0-rc
6+
(1 row)
7+
48
CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;
59
psql:<stdin>:1: ERROR: principal key not configured
610
HINT: create one using pg_tde_set_key before using encrypted tables
711
-- server restart
812
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
9-
1
13+
pg_tde_add_database_key_provider_file
14+
---------------------------------------
15+
1
16+
(1 row)
17+
1018
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
19+
pg_tde_set_key_using_database_key_provider
20+
--------------------------------------------
21+
22+
(1 row)
1123

1224
CREATE TABLE test_enc(id SERIAL,k VARCHAR(32),PRIMARY KEY (id)) USING tde_heap;
1325
INSERT INTO test_enc (k) VALUES ('foobar'),('barfoo');
1426
SELECT * FROM test_enc ORDER BY id ASC;
15-
1|foobar
16-
2|barfoo
27+
id | k
28+
----+--------
29+
1 | foobar
30+
2 | barfoo
31+
(2 rows)
32+
1733
-- server restart
1834
SELECT * FROM test_enc ORDER BY id ASC;
19-
1|foobar
20-
2|barfoo
35+
id | k
36+
----+--------
37+
1 | foobar
38+
2 | barfoo
39+
(2 rows)
40+
2141
TABLEFILE FOUND: yes
2242

2343
CONTAINS FOO (should be empty):

‎contrib/pg_tde/t/expected/002_rotate_key.out

Lines changed: 134 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,92 +4,196 @@ psql:<stdin>:1: ERROR: principal key not configured
44
HINT: create one using pg_tde_set_key before using encrypted tables
55
-- server restart
66
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
7-
1
7+
pg_tde_add_database_key_provider_file
8+
---------------------------------------
9+
1
10+
(1 row)
11+
812
SELECT pg_tde_add_database_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2.per');
9-
2
13+
pg_tde_add_database_key_provider_file
14+
---------------------------------------
15+
2
16+
(1 row)
17+
1018
SELECT pg_tde_add_global_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2g.per');
11-
-1
19+
pg_tde_add_global_key_provider_file
20+
-------------------------------------
21+
-1
22+
(1 row)
23+
1224
SELECT pg_tde_add_global_key_provider_file('file-3','/tmp/pg_tde_test_keyring_3.per');
13-
-2
25+
pg_tde_add_global_key_provider_file
26+
-------------------------------------
27+
-2
28+
(1 row)
29+
1430
SELECT pg_tde_list_all_database_key_providers();
15-
(1,file-vault,file,"{""type"" : ""file"", ""path"" : ""/tmp/pg_tde_test_keyring.per""}")
16-
(2,file-2,file,"{""type"" : ""file"", ""path"" : ""/tmp/pg_tde_test_keyring_2.per""}")
31+
pg_tde_list_all_database_key_providers
32+
------------------------------------------------------------------------------------------
33+
(1,file-vault,file,"{""type"" : ""file"", ""path"" : ""/tmp/pg_tde_test_keyring.per""}")
34+
(2,file-2,file,"{""type"" : ""file"", ""path"" : ""/tmp/pg_tde_test_keyring_2.per""}")
35+
(2 rows)
36+
1737
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
38+
pg_tde_set_key_using_database_key_provider
39+
--------------------------------------------
40+
41+
(1 row)
1842

1943
CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;
2044
INSERT INTO test_enc (k) VALUES (5),(6);
2145
SELECT * FROM test_enc ORDER BY id ASC;
22-
1|5
23-
2|6
46+
id | k
47+
----+---
48+
1 | 5
49+
2 | 6
50+
(2 rows)
51+
2452
SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');
53+
pg_tde_set_key_using_database_key_provider
54+
--------------------------------------------
55+
56+
(1 row)
2557

2658
SELECT * FROM test_enc ORDER BY id ASC;
27-
1|5
28-
2|6
59+
id | k
60+
----+---
61+
1 | 5
62+
2 | 6
63+
(2 rows)
64+
2965
-- server restart
3066
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
31-
1|file-vault|rotated-key1
67+
key_provider_id | key_provider_name | key_name
68+
-----------------+-------------------+--------------
69+
1 | file-vault | rotated-key1
70+
(1 row)
71+
3272
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
3373
psql:<stdin>:1: ERROR: Principal key does not exists for the database
3474
HINT: Use set_key interface to set the principal key
3575
SELECT * FROM test_enc ORDER BY id ASC;
36-
1|5
37-
2|6
76+
id | k
77+
----+---
78+
1 | 5
79+
2 | 6
80+
(2 rows)
81+
3882
SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');
83+
pg_tde_set_key_using_database_key_provider
84+
--------------------------------------------
85+
86+
(1 row)
3987

4088
SELECT * FROM test_enc ORDER BY id ASC;
41-
1|5
42-
2|6
89+
id | k
90+
----+---
91+
1 | 5
92+
2 | 6
93+
(2 rows)
94+
4395
-- server restart
4496
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
45-
2|file-2|rotated-key2
97+
key_provider_id | key_provider_name | key_name
98+
-----------------+-------------------+--------------
99+
2 | file-2 | rotated-key2
100+
(1 row)
101+
46102
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
47103
psql:<stdin>:1: ERROR: Principal key does not exists for the database
48104
HINT: Use set_key interface to set the principal key
49105
SELECT * FROM test_enc ORDER BY id ASC;
50-
1|5
51-
2|6
106+
id | k
107+
----+---
108+
1 | 5
109+
2 | 6
110+
(2 rows)
111+
52112
SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);
113+
pg_tde_set_key_using_global_key_provider
114+
------------------------------------------
115+
116+
(1 row)
53117

54118
SELECT * FROM test_enc ORDER BY id ASC;
55-
1|5
56-
2|6
119+
id | k
120+
----+---
121+
1 | 5
122+
2 | 6
123+
(2 rows)
124+
57125
-- server restart
58126
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
59-
-2|file-3|rotated-key
127+
key_provider_id | key_provider_name | key_name
128+
-----------------+-------------------+-------------
129+
-2 | file-3 | rotated-key
130+
(1 row)
131+
60132
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
61133
psql:<stdin>:1: ERROR: Principal key does not exists for the database
62134
HINT: Use set_key interface to set the principal key
63135
SELECT * FROM test_enc ORDER BY id ASC;
64-
1|5
65-
2|6
136+
id | k
137+
----+---
138+
1 | 5
139+
2 | 6
140+
(2 rows)
141+
66142
SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false);
143+
pg_tde_set_key_using_global_key_provider
144+
------------------------------------------
145+
146+
(1 row)
67147

68148
SELECT * FROM test_enc ORDER BY id ASC;
69-
1|5
70-
2|6
149+
id | k
150+
----+---
151+
1 | 5
152+
2 | 6
153+
(2 rows)
154+
71155
-- server restart
72156
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
73-
-1|file-2|rotated-keyX
157+
key_provider_id | key_provider_name | key_name
158+
-----------------+-------------------+--------------
159+
-1 | file-2 | rotated-keyX
160+
(1 row)
161+
74162
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
75163
psql:<stdin>:1: ERROR: Principal key does not exists for the database
76164
HINT: Use set_key interface to set the principal key
77165
SELECT * FROM test_enc ORDER BY id ASC;
78-
1|5
79-
2|6
166+
id | k
167+
----+---
168+
1 | 5
169+
2 | 6
170+
(2 rows)
171+
80172
ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;
81173
-- server restart
82174
SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX2', 'file-2', false);
83175
psql:<stdin>:1: ERROR: Usage of global key providers is disabled. Enable it with pg_tde.inherit_global_providers = ON
84176
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
85-
-1|file-2|rotated-keyX
177+
key_provider_id | key_provider_name | key_name
178+
-----------------+-------------------+--------------
179+
-1 | file-2 | rotated-keyX
180+
(1 row)
181+
86182
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
87183
psql:<stdin>:1: ERROR: Principal key does not exists for the database
88184
HINT: Use set_key interface to set the principal key
89185
SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');
186+
pg_tde_set_key_using_database_key_provider
187+
--------------------------------------------
188+
189+
(1 row)
90190

91191
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
92-
2|file-2|rotated-key2
192+
key_provider_id | key_provider_name | key_name
193+
-----------------+-------------------+--------------
194+
2 | file-2 | rotated-key2
195+
(1 row)
196+
93197
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
94198
psql:<stdin>:1: ERROR: Principal key does not exists for the database
95199
HINT: Use set_key interface to set the principal key

‎contrib/pg_tde/t/expected/003_remote_config.out

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8888/hello' ));
3-
1
3+
pg_tde_add_database_key_provider_file
4+
---------------------------------------
5+
1
6+
(1 row)
7+
48
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');
9+
pg_tde_set_key_using_database_key_provider
10+
--------------------------------------------
11+
12+
(1 row)
513

614
CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;
715
INSERT INTO test_enc2 (k) VALUES (5),(6);
816
SELECT * FROM test_enc2 ORDER BY id ASC;
9-
1|5
10-
2|6
17+
id | k
18+
----+---
19+
1 | 5
20+
2 | 6
21+
(2 rows)
22+
1123
-- server restart
1224
SELECT * FROM test_enc2 ORDER BY id ASC;
13-
1|5
14-
2|6
25+
id | k
26+
----+---
27+
1 | 5
28+
2 | 6
29+
(2 rows)
30+
1531
DROP TABLE test_enc2;
1632
DROP EXTENSION pg_tde;

‎contrib/pg_tde/t/expected/004_file_config.out

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'file', 'path' VALUE '/tmp/datafile-location' ));
3-
1
3+
pg_tde_add_database_key_provider_file
4+
---------------------------------------
5+
1
6+
(1 row)
7+
48
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');
9+
pg_tde_set_key_using_database_key_provider
10+
--------------------------------------------
11+
12+
(1 row)
513

614
CREATE TABLE test_enc1(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;
715
INSERT INTO test_enc1 (k) VALUES (5),(6);
816
SELECT * FROM test_enc1 ORDER BY id ASC;
9-
1|5
10-
2|6
17+
id | k
18+
----+---
19+
1 | 5
20+
2 | 6
21+
(2 rows)
22+
1123
-- server restart
1224
SELECT * FROM test_enc1 ORDER BY id ASC;
13-
1|5
14-
2|6
25+
id | k
26+
----+---
27+
1 | 5
28+
2 | 6
29+
(2 rows)
30+
1531
DROP TABLE test_enc1;
1632
DROP EXTENSION pg_tde;

‎contrib/pg_tde/t/expected/006_remote_vault_config.out

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT pg_tde_add_database_key_provider_vault_v2('vault-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/token' ), json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/url' ), to_json('secret'::text), NULL);
3-
1
3+
pg_tde_add_database_key_provider_vault_v2
4+
-------------------------------------------
5+
1
6+
(1 row)
7+
48
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','vault-provider');
9+
pg_tde_set_key_using_database_key_provider
10+
--------------------------------------------
11+
12+
(1 row)
513

614
CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;
715
INSERT INTO test_enc2 (k) VALUES (5),(6);
816
SELECT * FROM test_enc2 ORDER BY id ASC;
9-
1|5
10-
2|6
17+
id | k
18+
----+---
19+
1 | 5
20+
2 | 6
21+
(2 rows)
22+
1123
-- server restart
1224
SELECT * FROM test_enc2 ORDER BY id ASC;
13-
1|5
14-
2|6
25+
id | k
26+
----+---
27+
1 | 5
28+
2 | 6
29+
(2 rows)
30+
1531
DROP TABLE test_enc2;
1632
DROP EXTENSION pg_tde;

0 commit comments

Comments
 (0)