Skip to content
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

PG-1437 Do not duplicate frontend sources in meson.build #182

Open
wants to merge 2 commits into
base: TDE_REL_17_STABLE
Choose a base branch
from
Open

PG-1437 Do not duplicate frontend sources in meson.build #182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5b4f0
PG-1437 Do not duplicate frontend sources in meson.build
jeltz Mar 31, 2025
1945d68
Fix indentation in pg_tde/meson.build
jeltz Apr 1, 2025
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
139 changes: 59 additions & 80 deletions contrib/pg_tde/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,43 @@

curldep = dependency('libcurl')

pg_tde_sources = files(
'src/pg_tde.c',
'src/transam/pg_tde_xact_handler.c',
'src/access/pg_tde_tdemap.c',
'src/access/pg_tde_xlog.c',
'src/access/pg_tde_xlog_encrypt.c',

'src/encryption/enc_tde.c',
'src/encryption/enc_aes.c',

'src/keyring/keyring_curl.c',
'src/keyring/keyring_file.c',
'src/keyring/keyring_vault.c',
'src/keyring/keyring_kmip.c',
'src/keyring/keyring_kmip_impl.c',
'src/keyring/keyring_api.c',

'src/smgr/pg_tde_smgr.c',

'src/catalog/tde_keyring.c',
'src/catalog/tde_keyring_parse_opts.c',
'src/catalog/tde_principal_key.c',
'src/common/pg_tde_shmem.c',
'src/common/pg_tde_utils.c',
'src/pg_tde_defs.c',
'src/pg_tde_event_capture.c',
'src/pg_tde_guc.c',
'src/pg_tde.c',
tde_frontend_sources = files(
'src/access/pg_tde_tdemap.c',
'src/access/pg_tde_xlog_encrypt.c',
'src/catalog/tde_keyring.c',
'src/catalog/tde_keyring_parse_opts.c',
'src/catalog/tde_principal_key.c',
'src/common/pg_tde_utils.c',
'src/encryption/enc_aes.c',
'src/encryption/enc_tde.c',
'src/keyring/keyring_api.c',
'src/keyring/keyring_curl.c',
'src/keyring/keyring_file.c',
'src/keyring/keyring_vault.c',
'src/keyring/keyring_kmip.c',
'src/keyring/keyring_kmip_impl.c',
)

pg_tde_sources = files(
'src/access/pg_tde_xlog.c',
'src/common/pg_tde_shmem.c',
'src/smgr/pg_tde_smgr.c',
'src/transam/pg_tde_xact_handler.c',
'src/pg_tde.c',
'src/pg_tde_defs.c',
'src/pg_tde_event_capture.c',
'src/pg_tde_guc.c',
) + tde_frontend_sources

incdir = include_directories('src/include', '.', 'src/libkmip/libkmip/include/')

kmip = static_library(
'kmip',
files(
'src/libkmip/libkmip/src/kmip.c',
'src/libkmip/libkmip/src/kmip_bio.c',
'src/libkmip/libkmip/src/kmip_locate.c',
'src/libkmip/libkmip/src/kmip_memset.c'
),
files(
'src/libkmip/libkmip/src/kmip.c',
'src/libkmip/libkmip/src/kmip_bio.c',
'src/libkmip/libkmip/src/kmip_locate.c',
'src/libkmip/libkmip/src/kmip_memset.c'
),
c_args: [ '-w' ], # This is a 3rd party, disable warnings completely
include_directories: incdir
)
Expand Down Expand Up @@ -74,35 +71,35 @@ install_data(
# toast_descrypt needs to be the first test when running with pg_tde
Copy link

Choose a reason for hiding this comment

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

if we're cleaning up this file this typo should probably be fixed while at it

# preinstalled and default_principal_key needs to run after key_provider.
sql_tests = [
'toast_decrypt',
'access_control',
'alter_index',
'cache_alloc',
'change_access_method',
'insert_update_delete',
'key_provider',
'keyprovider_dependency',
'kmip_test',
'pg_tde_is_encrypted',
'relocate',
'recreate_storage',
'subtransaction',
'tablespace',
'vault_v2_test',
'default_principal_key',
'toast_decrypt',
'access_control',
'alter_index',
'cache_alloc',
'change_access_method',
'insert_update_delete',
'key_provider',
'keyprovider_dependency',
'kmip_test',
'pg_tde_is_encrypted',
'relocate',
'recreate_storage',
'subtransaction',
'tablespace',
'vault_v2_test',
'default_principal_key',
]

tap_tests = [
't/001_basic.pl',
't/002_rotate_key.pl',
't/003_remote_config.pl',
't/004_file_config.pl',
't/005_multiple_extensions.pl',
't/006_remote_vault_config.pl',
't/007_tde_heap.pl',
't/008_key_rotate_tablespace.pl',
't/009_wal_encrypt.pl',
't/010_change_key_provider.pl',
't/001_basic.pl',
't/002_rotate_key.pl',
't/003_remote_config.pl',
't/004_file_config.pl',
't/005_multiple_extensions.pl',
't/006_remote_vault_config.pl',
't/007_tde_heap.pl',
't/008_key_rotate_tablespace.pl',
't/009_wal_encrypt.pl',
't/010_change_key_provider.pl',
]

tests += {
Expand All @@ -118,28 +115,10 @@ tests += {
'tests': tap_tests },
}

# TODO: do not duplicate
tde_decrypt_sources = files(
'src/access/pg_tde_tdemap.c',
'src/access/pg_tde_xlog_encrypt.c',
'src/catalog/tde_keyring.c',
'src/catalog/tde_keyring_parse_opts.c',
'src/catalog/tde_principal_key.c',
'src/common/pg_tde_utils.c',
'src/encryption/enc_aes.c',
'src/encryption/enc_tde.c',
'src/keyring/keyring_api.c',
'src/keyring/keyring_curl.c',
'src/keyring/keyring_file.c',
'src/keyring/keyring_vault.c',
'src/keyring/keyring_kmip.c',
'src/keyring/keyring_kmip_impl.c',
)

pg_tde_inc = incdir

pg_tde_frontend = static_library('pg_tde_frontend',
tde_decrypt_sources,
tde_frontend_sources,
c_pch: pch_postgres_h,
c_args: ['-DFRONTEND'],
kwargs: mod_args,
Expand Down