8000 Merge branch 'TDE_REL_17_STABLE' into DOCS-create-replication.md · percona/postgres@2652ab2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2652ab2

Browse files
AndriciucAndriciuc
authored
Merge branch 'TDE_REL_17_STABLE' into DOCS-create-replication.md
2 parents c736a0d + d37fa69 commit 2652ab2

33 files changed

+311
-316
lines changed

‎.github/workflows/codechecker.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: CodeChecker
2+
on:
3+
push:
4+
branches:
5+
- TDE_REL_17_STABLE
6+
7+
env:
8+
CC: clang
9+
LD: clang
10+
11+
jobs:
12+
run:
13+
name: Run
14+
runs-on: ubuntu-22.04
15+
steps:
16+
- name: Clone repository
17+
uses: actions/checkout@v4
18+
with:
19+
submodules: recursive
20+
21+
- name: Install dependencies
22+
run: ci_scripts/ubuntu-deps.sh
23+
24+
- name: Install CodeChecker
25+
run: |
26+
## CodeChecker version should match version installed on server side.
27+
pip3 install codechecker==6.21
28+
29+
- name: Configure CodeChecker
30+
run: |
31+
echo "::add-mask::${{ secrets.CODECHECKER_ENDPOINT }}"
32+
echo "::add-mask::${{ secrets.CODECHECKER_ENGINEERING_CREDENTIALS }}"
33+
cat > ~/.codechecker.passwords.json << EOL
34+
{
35+
"client_autologin": true,
36+
"credentials": {
37+
"${{secrets.CODECHECKER_ENDPOINT}}": "${{secrets.CODECHECKER_ENGINEERING_CREDENTIALS}}"
38+
}
39+
}
40+
EOL
41+
42+
- name: Set cc alternative
43+
run: |
44+
sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
45+
sudo update-alternatives --set cc /usr/bin/clang
46+
47+
- name: Build postgres
48+
run: ci_scripts/meson-build.sh debug
49+
50+
- name: Run CodeChecker
51+
run: CodeChecker analyze build/compile_commands.json --enable sensitive --output ./reports --file ${{ github.workspace }}/contrib/pg_tde
52+
53+
- name: Upload CodeChecker reports
54+
run: |
55+
CodeChecker store ./reports --url=https://codechecker.percona.com/pg_tde --name=${GITHUB_REF_NAME} --tag=${GITHUB_SHA} --force

‎contrib/pg_tde/expected/default_principal_key.out

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ ERROR: principal key not configured for current database
1212
-- Should fail: no default principal key for the server yet
1313
SELECT key_provider_id, key_provider_name, key_name
1414
FROM pg_tde_default_key_info();
15-
ERROR: Principal key does not exists for the database
16-
HINT: Use set_key interface to set the principal key
15+
key_provider_id | key_provider_name | key_name
16+
-----------------+-------------------+----------
17+
| |
18+
(1 row)
19+
1720
SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'file-provider', false);
1821
pg_tde_set_default_key_using_global_key_provider
1922
--------------------------------------------------
@@ -48,8 +51,11 @@ SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
4851
-- Should fail: no principal key for the database yet
4952
SELECT key_provider_id, key_provider_name, key_name
5053
FROM pg_tde_key_info();
51-
ERROR: Principal key does not exists for the database
52-
HINT: Use set_key interface to set the principal key
54+
key_provider_id | key_provider_name | key_name
55+
-----------------+-------------------+----------
56+
| |
57+
(1 row)
58+
5359
-- Should succeed: "localizes" the default principal key for the database
5460
CREATE TABLE test_enc(
5561
id SERIAL,
@@ -74,8 +80,11 @@ CREATE EXTENSION pg_buffercache;
7480
-- Should fail: no principal key for the database yet
7581
SELECT key_provider_id, key_provider_name, key_name
7682
FROM pg_tde_key_info();
77-
ERROR: Principal key does not exists for the database
78-
HINT: Use set_key interface to set the principal key
83+
key_provider_id | key_provider_name | key_name
84+
-----------------+-------------------+----------
85+
| |
86+
(1 row)
87+
7988
-- Should succeed: "localizes" the default principal key for the database
8089
CREATE TABLE test_enc(
8190
id SERIAL,

‎contrib/pg_tde/expected/key_provider.out

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT * FROM pg_tde_key_info();
3-
ERROR: Principal key does not exists for the database
4-
HINT: Use set_key interface to set the principal key
3+
key_name | key_provider_name | key_provider_id | key_creation_time
4+
----------+-------------------+-----------------+-------------------
5+
| | |
6+
(1 row)
7+
58
SELECT pg_tde_add_database_key_provider_file('incorrect-file-provider', json_object('foo' VALUE '/tmp/pg_tde_test_keyring.per'));
69
ERROR: key provider value cannot be an object
710
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');

‎contrib/pg_tde/meson.build

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,19 @@ sql_tests = [
103103
]
104104

105105
tap_tests = [
106-
't/001_basic.pl',
107-
't/002_rotate_key.pl',
108-
't/003_multiple_extensions.pl',
109-
't/004_tde_heap.pl',
110-
't/005_key_rotate_tablespace.pl',
111-
't/006_wal_encrypt.pl',
112-
't/007_change_key_provider.pl',
113-
't/008_unlogged_tables.pl',
114-
't/009_replication.pl',
115-
't/010_crash_recovery.pl',
116-
't/011_pg_waldump_basic.pl',
117-
't/012_pg_waldump_fullpage.pl',
118-
't/013_pg_tde_change_key_provider.pl',
106+
't/basic.pl',
107+
't/change_key_provider.pl',
108+
't/crash_recovery.pl',
109+
't/key_rotate_tablespace.pl',
110+
't/multiple_extensions.pl',
111+
't/pg_tde_change_key_provider.pl',
112+
't/pg_waldump_basic.pl',
113+
't/pg_waldump_fullpage.pl',
114+
't/replication.pl',
115+
't/rotate_key.pl',
116+
't/tde_heap.pl',
117+
't/unlogged_tables.pl',
118+
't/wal_encrypt.pl',
119119
]
120120

121121
tests += {

0 commit comments

Comments
 (0)
0