From 33404e6ab51971726d805c342b72572aaa2d2546 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Tue, 6 May 2025 18:49:43 +0200 Subject: [PATCH 1/4] Fix whitespace at end of file Every text file (with the exception of test output) should end in exactly one newline. --- .github/workflows/coverage.yml | 2 -- README.md | 1 - contrib/pg_tde/documentation/_resource/overrides/main.html | 3 --- .../documentation/_resource/overrides/partials/banner.html | 2 +- .../documentation/_resource/overrides/partials/copyright.html | 2 +- .../documentation/_resource/overrides/partials/header.html | 2 +- contrib/pg_tde/documentation/_resource/templates/styles.scss | 2 +- contrib/pg_tde/documentation/docs/css/design.css | 2 +- contrib/pg_tde/documentation/docs/css/extra.css | 2 +- contrib/pg_tde/documentation/docs/css/landing.css | 2 +- contrib/pg_tde/documentation/docs/css/osano.css | 2 +- contrib/pg_tde/documentation/docs/css/postgresql.css | 2 +- contrib/pg_tde/documentation/docs/js/consent.js | 2 +- contrib/pg_tde/documentation/docs/js/promptremover.js | 4 ---- contrib/pg_tde/documentation/mkdocs-pdf.yml | 1 - contrib/pg_tde/documentation/mkdocs.yml | 2 -- contrib/pg_tde/documentation/requirements.txt | 2 +- src/libtde/Makefile | 2 +- 18 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 805be41ba7ac0..10b58784bdc7e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -61,5 +61,3 @@ jobs: src/test/*/results src/test/*/tmp_check retention-days: 3 - - diff --git a/README.md b/README.md index 4501f53904c77..afb02c0f108b2 100644 --- a/README.md +++ b/README.md @@ -35,4 +35,3 @@ Specific - include as much detail as possible, such as which version, which envi Unique - do not duplicate existing tickets Scoped to a single issue - only one issue per report - diff --git a/contrib/pg_tde/documentation/_resource/overrides/main.html b/contrib/pg_tde/documentation/_resource/overrides/main.html index 6aef80e6c1bd3..7e90c9be7724c 100644 --- a/contrib/pg_tde/documentation/_resource/overrides/main.html +++ b/contrib/pg_tde/documentation/_resource/overrides/main.html @@ -64,6 +64,3 @@ posthog.init('phc_7unoI9J6Fm0SMrfDp35xNOpCRTkOAibbffQwdGWbHnL',{api_host:'https://eu.posthog.com'}) {% endblock %} - - - diff --git a/contrib/pg_tde/documentation/_resource/overrides/partials/banner.html b/contrib/pg_tde/documentation/_resource/overrides/partials/banner.html index fb26631493f1a..1553c0301cc1f 100644 --- a/contrib/pg_tde/documentation/_resource/overrides/partials/banner.html +++ b/contrib/pg_tde/documentation/_resource/overrides/partials/banner.html @@ -6,4 +6,4 @@ Get help from Percona - \ No newline at end of file + diff --git a/contrib/pg_tde/documentation/_resource/overrides/partials/copyright.html b/contrib/pg_tde/documentation/_resource/overrides/partials/copyright.html index dd0f101fad6df..95c8eaf6cf73d 100644 --- a/contrib/pg_tde/documentation/_resource/overrides/partials/copyright.html +++ b/contrib/pg_tde/documentation/_resource/overrides/partials/copyright.html @@ -11,4 +11,4 @@ Material for MkDocs {% endif %} - \ No newline at end of file + diff --git a/contrib/pg_tde/documentation/_resource/overrides/partials/header.html b/contrib/pg_tde/documentation/_resource/overrides/partials/header.html index 2d0d6e7401a04..1983ab1baef50 100644 --- a/contrib/pg_tde/documentation/_resource/overrides/partials/header.html +++ b/contrib/pg_tde/documentation/_resource/overrides/partials/header.html @@ -132,4 +132,4 @@ {% include "partials/tabs.html" %} {% endif %} {% endif %} - \ No newline at end of file + diff --git a/contrib/pg_tde/documentation/_resource/templates/styles.scss b/contrib/pg_tde/documentation/_resource/templates/styles.scss index fc9bc9fce52e9..ccbbe96de6e37 100644 --- a/contrib/pg_tde/documentation/_resource/templates/styles.scss +++ b/contrib/pg_tde/documentation/_resource/templates/styles.scss @@ -115,4 +115,4 @@ article div.tabbed-content--wrap * { .md-typeset details.note { color: #00162b; border-color: #fff; -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/css/design.css b/contrib/pg_tde/documentation/docs/css/design.css index 2e14d20e5853a..f4861d6db7a7d 100644 --- a/contrib/pg_tde/documentation/docs/css/design.css +++ b/contrib/pg_tde/documentation/docs/css/design.css @@ -732,4 +732,4 @@ i[warning] [class*="moji"] { padding: 1em; } } -/**/ \ No newline at end of file +/**/ diff --git a/contrib/pg_tde/documentation/docs/css/extra.css b/contrib/pg_tde/documentation/docs/css/extra.css index c857532bb8797..f5a28052fc9b9 100644 --- a/contrib/pg_tde/documentation/docs/css/extra.css +++ b/contrib/pg_tde/documentation/docs/css/extra.css @@ -10,4 +10,4 @@ .md-sidebar__inner { font-size: 0.65rem; /* Font size */ line-height: 1.6; -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/css/landing.css b/contrib/pg_tde/documentation/docs/css/landing.css index df69386e85e9a..1e6eddc72aedf 100644 --- a/contrib/pg_tde/documentation/docs/css/landing.css +++ b/contrib/pg_tde/documentation/docs/css/landing.css @@ -298,4 +298,4 @@ a.splash-card img { [data-news] [data-article] { flex: 1 1 100%; } -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/css/osano.css b/contrib/pg_tde/documentation/docs/css/osano.css index b89fa6ac21069..79565a16100b9 100644 --- a/contrib/pg_tde/documentation/docs/css/osano.css +++ b/contrib/pg_tde/documentation/docs/css/osano.css @@ -203,4 +203,4 @@ .osano-cm-dialog--type_bar .osano-cm-dialog__buttons { max-width: 20em; } -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/css/postgresql.css b/contrib/pg_tde/documentation/docs/css/postgresql.css index e5d70d97d7e6b..f0931b48906e5 100644 --- a/contrib/pg_tde/documentation/docs/css/postgresql.css +++ b/contrib/pg_tde/documentation/docs/css/postgresql.css @@ -58,4 +58,4 @@ .superNav, .md-nav__source { background-color: var(--night500); -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/js/consent.js b/contrib/pg_tde/documentation/docs/js/consent.js index b6f8a8ac0a3ac..4ff680d8a79e0 100644 --- a/contrib/pg_tde/documentation/docs/js/consent.js +++ b/contrib/pg_tde/documentation/docs/js/consent.js @@ -3,4 +3,4 @@ if (consent && consent.custom) { /* The user accepted the cookie */ } else { /* The user rejected the cookie */ -} \ No newline at end of file +} diff --git a/contrib/pg_tde/documentation/docs/js/promptremover.js b/contrib/pg_tde/documentation/docs/js/promptremover.js index aef117323fbe0..a6241fd80d221 100644 --- a/contrib/pg_tde/documentation/docs/js/promptremover.js +++ b/contrib/pg_tde/documentation/docs/js/promptremover.js @@ -38,7 +38,3 @@ document.addEventListener("DOMContentLoaded", function(){ commandButtonElement.item(0).setAttribute("data-clipboard-text", trueCommand); } }); - - - - diff --git a/contrib/pg_tde/documentation/mkdocs-pdf.yml b/contrib/pg_tde/documentation/mkdocs-pdf.yml index fc87289bae446..990732fb25072 100644 --- a/contrib/pg_tde/documentation/mkdocs-pdf.yml +++ b/contrib/pg_tde/documentation/mkdocs-pdf.yml @@ -13,4 +13,3 @@ extra_css: markdown_extensions: pymdownx.tabbed: {} admonition: {} - diff --git a/contrib/pg_tde/documentation/mkdocs.yml b/contrib/pg_tde/documentation/mkdocs.yml index 91ac69b6bfbe7..d5bd75513b4eb 100644 --- a/contrib/pg_tde/documentation/mkdocs.yml +++ b/contrib/pg_tde/documentation/mkdocs.yml @@ -185,5 +185,3 @@ nav: - release-notes/mvp.md - uninstall.md - contribute.md - - diff --git a/contrib/pg_tde/documentation/requirements.txt b/contrib/pg_tde/documentation/requirements.txt index b3ee7d78e7043..6e1ce1300850c 100644 --- a/contrib/pg_tde/documentation/requirements.txt +++ b/contrib/pg_tde/documentation/requirements.txt @@ -16,4 +16,4 @@ mkdocs-meta-descriptions-plugin mike mkdocs-glightbox Pillow > 10.1.0 -mkdocs-open-in-new-tab \ No newline at end of file +mkdocs-open-in-new-tab diff --git a/src/libtde/Makefile b/src/libtde/Makefile index 57c72e1d6bb86..fbe8d7db04960 100644 --- a/src/libtde/Makefile +++ b/src/libtde/Makefile @@ -7,4 +7,4 @@ include $(top_srcdir)/contrib/pg_tde/Makefile.tools all: tdelibs -install: all \ No newline at end of file +install: all From ede06368f640de0484baef10d22ab459de575bf7 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Tue, 6 May 2025 18:50:39 +0200 Subject: [PATCH 2/4] Remove newlines at beginning of files No text file should begin with a newline. --- contrib/pg_tde/documentation/docs/css/landing.css | 1 - contrib/pg_tde/documentation/requirements.txt | 1 - contrib/pg_tde/src/include/smgr/pg_tde_smgr.h | 1 - contrib/pg_tde/src/pg_tde_change_key_provider.c | 1 - contrib/pg_tde/src/smgr/pg_tde_smgr.c | 1 - src/libtde/Makefile | 1 - 6 files changed, 6 deletions(-) diff --git a/contrib/pg_tde/documentation/docs/css/landing.css b/contrib/pg_tde/documentation/docs/css/landing.css index 1e6eddc72aedf..d80a0fea33229 100644 --- a/contrib/pg_tde/documentation/docs/css/landing.css +++ b/contrib/pg_tde/documentation/docs/css/landing.css @@ -1,4 +1,3 @@ - /* Type */ .landing h1, diff --git a/contrib/pg_tde/documentation/requirements.txt b/contrib/pg_tde/documentation/requirements.txt index 6e1ce1300850c..5c5cb4d1bea6e 100644 --- a/contrib/pg_tde/documentation/requirements.txt +++ b/contrib/pg_tde/documentation/requirements.txt @@ -1,4 +1,3 @@ - Markdown mkdocs mkdocs-versioning diff --git a/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h b/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h index d56c9ac04e138..65b54e5a5e9fd 100644 --- a/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h +++ b/contrib/pg_tde/src/include/smgr/pg_tde_smgr.h @@ -1,4 +1,3 @@ - /*------------------------------------------------------------------------- * * pg_tde_smgr.h diff --git a/contrib/pg_tde/src/pg_tde_change_key_provider.c b/contrib/pg_tde/src/pg_tde_change_key_provider.c index 87db2c5d819b9..fa4c1d69171c6 100644 --- a/contrib/pg_tde/src/pg_tde_change_key_provider.c +++ b/contrib/pg_tde/src/pg_tde_change_key_provider.c @@ -1,4 +1,3 @@ - #include "postgres_fe.h" #include "pg_tde.h" diff --git a/contrib/pg_tde/src/smgr/pg_tde_smgr.c b/contrib/pg_tde/src/smgr/pg_tde_smgr.c index de28eb1cb7f48..5e312c1912dc8 100644 --- a/contrib/pg_tde/src/smgr/pg_tde_smgr.c +++ b/contrib/pg_tde/src/smgr/pg_tde_smgr.c @@ -1,4 +1,3 @@ - #include "smgr/pg_tde_smgr.h" #include "postgres.h" #include "storage/smgr.h" diff --git a/src/libtde/Makefile b/src/libtde/Makefile index fbe8d7db04960..4ed386e20ee58 100644 --- a/src/libtde/Makefile +++ b/src/libtde/Makefile @@ -1,4 +1,3 @@ - subdir = src/libtde top_builddir = ../.. From b75fd346809b61f59074a56e8a7c3dd3f1b5666e Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Tue, 6 May 2025 18:54:23 +0200 Subject: [PATCH 3/4] Only ever have one empty line as separator While in theory it could be useful to separate blocks with double empty lines nobody does that consistently so we might as well only ever use one empty line. --- contrib/pg_tde/documentation/mkdocs.yml | 4 ---- contrib/pg_tde/pg_tde--1.0-rc.sql | 1 - contrib/pg_tde/src/access/pg_tde_tdemap.c | 5 ----- contrib/pg_tde/src/catalog/tde_keyring.c | 1 - contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c | 3 --- contrib/pg_tde/src/include/access/pg_tde_tdemap.h | 1 - contrib/pg_tde/src/include/catalog/tde_principal_key.h | 1 - contrib/pg_tde/src/include/pg_tde_guc.h | 1 - contrib/pg_tde/src/pg_tde.c | 1 - contrib/pg_tde/src/pg_tde_change_key_provider.c | 2 -- contrib/pg_tde/t/014_pg_waldump_basic.pl | 1 - 11 files changed, 21 deletions(-) diff --git a/contrib/pg_tde/documentation/mkdocs.yml b/contrib/pg_tde/documentation/mkdocs.yml index d5bd75513b4eb..bbc8b604fc6a8 100644 --- a/contrib/pg_tde/documentation/mkdocs.yml +++ b/contrib/pg_tde/documentation/mkdocs.yml @@ -6,7 +6,6 @@ site_author: Percona LLC copyright: > Percona LLC and/or its affiliates © 2025 — Cookie Consent - repo_name: percona/postgres repo_url: https://github.com/percona/postgres edit_uri: edit/TDE_REL_17_STABLE/contrib/pg_tde/documentation/docs @@ -54,8 +53,6 @@ theme: - navigation.tracking - navigation.indexes - - extra_css: - https://unicons.iconscout.com/release/v3.0.3/css/line.css - https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css @@ -100,7 +97,6 @@ markdown_extensions: custom_icons: - _resource/.icons - plugins: - search: separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;' diff --git a/contrib/pg_tde/pg_tde--1.0-rc.sql b/contrib/pg_tde/pg_tde--1.0-rc.sql index 19668c072cedf..8584090541690 100644 --- a/contrib/pg_tde/pg_tde--1.0-rc.sql +++ b/contrib/pg_tde/pg_tde--1.0-rc.sql @@ -97,7 +97,6 @@ BEGIN ATOMIC 'certPath' VALUE kmip_cert_path)); END; - CREATE FUNCTION pg_tde_list_all_database_key_providers (OUT id INT, OUT provider_name TEXT, diff --git a/contrib/pg_tde/src/access/pg_tde_tdemap.c b/contrib/pg_tde/src/access/pg_tde_tdemap.c index 35bc7229d29cb..b870683618436 100644 --- a/contrib/pg_tde/src/access/pg_tde_tdemap.c +++ b/contrib/pg_tde/src/access/pg_tde_tdemap.c @@ -55,7 +55,6 @@ #define PG_TDE_FILEMAGIC 0x02454454 /* version ID value = TDE 02 */ - #define MAP_ENTRY_SIZE sizeof(TDEMapEntry) #define TDE_FILE_HEADER_SIZE sizeof(TDEFileHeader) @@ -100,7 +99,6 @@ RelKeyCache tde_rel_key_cache = { .cap = 0, }; - /* * TODO: WAL should have its own RelKeyCache */ @@ -911,7 +909,6 @@ tde_decrypt_rel_key(TDEPrincipalKey *principal_key, TDEMapEntry *map_entry) ereport(ERROR, errmsg("Failed to decrypt key, incorrect principal key or corrupted key file")); - return rel_key_data; } @@ -963,7 +960,6 @@ pg_tde_open_file_basic(const char *tde_filename, int fileFlags, bool ignore_miss return fd; } - /* * Read TDE file header from a TDE file and fill in the fheader data structure. */ @@ -989,7 +985,6 @@ pg_tde_file_header_read(const char *tde_filename, int fd, TDEFileHeader *fheader } } - /* * Returns true if a map entry if found or false if we have reached the end of * the file. diff --git a/contrib/pg_tde/src/catalog/tde_keyring.c b/contrib/pg_tde/src/catalog/tde_keyring.c index d8c0bb0c897f5..c11fd3c21463a 100644 --- a/contrib/pg_tde/src/catalog/tde_keyring.c +++ b/contrib/pg_tde/src/catalog/tde_keyring.c @@ -811,7 +811,6 @@ load_keyring_provider_from_record(KeyringProviderRecord *provider) return keyring; } - static GenericKeyring * load_keyring_provider_options(ProviderType provider_type, char *keyring_options) { diff --git a/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c b/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c index c8a1f2721ded2..a4a19d2aedb81 100644 --- a/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c +++ b/contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c @@ -41,7 +41,6 @@ /* * JSON parser state */ - typedef enum JsonKeyringSemState { JK_EXPECT_TOP_FIELD, @@ -138,7 +137,6 @@ static JsonParseErrorType json_kring_assign_scalar(JsonKeyringState *parse, Json static char *get_remote_kring_value(const char *url, const char *field_name); static char *get_file_kring_value(const char *path, const char *field_name); - /* * Parses json input for the given provider type and sets the provided options. * out_opts should be a palloc'd keyring object matching the provider_type. @@ -186,7 +184,6 @@ ParseKeyringJSONOptions(ProviderType provider_type, GenericKeyring *out_opts, ch ereport(ERROR, errmsg("parsing of keyring options failed: %s", json_errdetail(jerr, jlex))); - } #if PG_VERSION_NUM >= 170000 freeJsonLexContext(jlex); diff --git a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h index 72a1ea4ad62a7..0955569b00cdc 100644 --- a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h +++ b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h @@ -89,7 +89,6 @@ typedef struct WALKeyCacheRec struct WALKeyCacheRec *next; } WALKeyCacheRec; - extern InternalKey *pg_tde_read_last_wal_key(void); extern WALKeyCacheRec *pg_tde_get_last_wal_key(void); diff --git a/contrib/pg_tde/src/include/catalog/tde_principal_key.h b/contrib/pg_tde/src/include/catalog/tde_principal_key.h index d83c8bdaeaeee..ee5870ccf7b3c 100644 --- a/contrib/pg_tde/src/include/catalog/tde_principal_key.h +++ b/contrib/pg_tde/src/include/catalog/tde_principal_key.h @@ -10,7 +10,6 @@ #ifndef PG_TDE_PRINCIPAL_KEY_H #define PG_TDE_PRINCIPAL_KEY_H - #include "postgres.h" #include "catalog/tde_keyring.h" #ifndef FRONTEND diff --git a/contrib/pg_tde/src/include/pg_tde_guc.h b/contrib/pg_tde/src/include/pg_tde_guc.h index 472a00bb2791e..c3f95f3313c77 100644 --- a/contrib/pg_tde/src/include/pg_tde_guc.h +++ b/contrib/pg_tde/src/include/pg_tde_guc.h @@ -11,7 +11,6 @@ #ifndef TDE_GUC_H #define TDE_GUC_H - #include "postgres.h" #ifndef FRONTEND diff --git a/contrib/pg_tde/src/pg_tde.c b/contrib/pg_tde/src/pg_tde.c index 92cf0d9892d73..3127c2c4cff09 100644 --- a/contrib/pg_tde/src/pg_tde.c +++ b/contrib/pg_tde/src/pg_tde.c @@ -39,7 +39,6 @@ #include - PG_MODULE_MAGIC; static void pg_tde_init_data_dir(void); diff --git a/contrib/pg_tde/src/pg_tde_change_key_provider.c b/contrib/pg_tde/src/pg_tde_change_key_provider.c index fa4c1d69171c6..489dbcdad339f 100644 --- a/contrib/pg_tde/src/pg_tde_change_key_provider.c +++ b/contrib/pg_tde/src/pg_tde_change_key_provider.c @@ -63,7 +63,6 @@ build_json(char *buffer, int count,...) ptr = strcat(ptr, ","); } - ptr = strcat(ptr, "\""); ptr = strcat(ptr, key); ptr = strcat(ptr, "\":"); @@ -146,7 +145,6 @@ main(int argc, char *argv[]) argstart += 2; } - if (datadir == NULL || strlen(datadir) == 0) { help(); diff --git a/contrib/pg_tde/t/014_pg_waldump_basic.pl b/contrib/pg_tde/t/014_pg_waldump_basic.pl index ec798cd765bb1..7b37b909dee41 100644 --- a/contrib/pg_tde/t/014_pg_waldump_basic.pl +++ b/contrib/pg_tde/t/014_pg_waldump_basic.pl @@ -40,7 +40,6 @@ }); $node->restart; - my ($start_lsn, $start_walfile) = split /\|/, $node->safe_psql('postgres', q{SELECT pg_current_wal_insert_lsn(), pg_walfile_name(pg_current_wal_insert_lsn())} From 7d06b136347e57838437a2f34d53d479f2f4a083 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Tue, 6 May 2025 18:55:24 +0200 Subject: [PATCH 4/4] Remove trailing whitespace at end of line With the exception of test output files no text file should have extra whitesapce and the end of line. --- .../pg_tde/documentation/_resource/overrides/main.html | 8 ++++---- contrib/pg_tde/documentation/docs/css/design.css | 2 +- contrib/pg_tde/documentation/docs/css/extra.css | 2 +- contrib/pg_tde/documentation/docs/css/landing.css | 2 +- contrib/pg_tde/documentation/docs/css/osano.css | 2 +- contrib/pg_tde/documentation/mkdocs.yml | 8 ++++---- contrib/pg_tde/expected/change_access_method.out | 4 +--- contrib/pg_tde/expected/default_principal_key.out | 5 ++--- contrib/pg_tde/sql/change_access_method.sql | 6 +++--- contrib/pg_tde/sql/default_principal_key.sql | 6 +++--- 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/contrib/pg_tde/documentation/_resource/overrides/main.html b/contrib/pg_tde/documentation/_resource/overrides/main.html index 7e90c9be7724c..8e523a7d493bc 100644 --- a/contrib/pg_tde/documentation/_resource/overrides/main.html +++ b/contrib/pg_tde/documentation/_resource/overrides/main.html @@ -4,7 +4,7 @@ {% extends "base.html" %} {% block announce %} - This is a Release Candidate of Percona Transparent Data Encryption extension and it is + This is a Release Candidate of Percona Transparent Data Encryption extension and it is not recommended for production environments yet. We encourage you to test it and give your feedback. This will help us improve the product and make it production-ready faster. {% endblock %} @@ -13,7 +13,7 @@ {{ super() }} {% endblock %} - + {% block extrahead %} {{ super() }} {% set title = config.site_name %} @@ -27,7 +27,7 @@ {% endblock %} - + {% block site_nav %} {% if nav %} {% if page.meta and page.meta.hide %} @@ -39,7 +39,7 @@ {% include "partials/nav.html" %}
+ diff --git a/contrib/pg_tde/documentation/docs/css/design.css b/contrib/pg_tde/documentation/docs/css/design.css index f4861d6db7a7d..d2a6c3cb59bf6 100644 --- a/contrib/pg_tde/documentation/docs/css/design.css +++ b/contrib/pg_tde/documentation/docs/css/design.css @@ -93,7 +93,7 @@ /* Accent */ --md-accent-fg-color: var(--sky500); - + /* Footer */ --md-footer-fg-color: var(--stone900); --md-footer-fg-color--light: rgba(44,50,62,0.72); diff --git a/contrib/pg_tde/documentation/docs/css/extra.css b/contrib/pg_tde/documentation/docs/css/extra.css index f5a28052fc9b9..38b682c08a883 100644 --- a/contrib/pg_tde/documentation/docs/css/extra.css +++ b/contrib/pg_tde/documentation/docs/css/extra.css @@ -5,7 +5,7 @@ left: 0.6rem; } -} +} .md-sidebar__inner { font-size: 0.65rem; /* Font size */ diff --git a/contrib/pg_tde/documentation/docs/css/landing.css b/contrib/pg_tde/documentation/docs/css/landing.css index d80a0fea33229..f8a16c5e62519 100644 --- a/contrib/pg_tde/documentation/docs/css/landing.css +++ b/contrib/pg_tde/documentation/docs/css/landing.css @@ -249,7 +249,7 @@ a.splash-card img { line-height: 1.4; display: -webkit-box; -webkit-line-clamp: 3; - -webkit-box-orient: vertical; + -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; max-height: 2.8em; diff --git a/contrib/pg_tde/documentation/docs/css/osano.css b/contrib/pg_tde/documentation/docs/css/osano.css index 79565a16100b9..c937cb503e8e5 100644 --- a/contrib/pg_tde/documentation/docs/css/osano.css +++ b/contrib/pg_tde/documentation/docs/css/osano.css @@ -14,7 +14,7 @@ .osano-cm-dialog { font-size: 0.75em; padding: 2em 1em; - color: var(--md-typeset-color); + color: var(--md-typeset-color); background: var(--md-footer-bg-color--dark); } .osano-cm-header, diff --git a/contrib/pg_tde/documentation/mkdocs.yml b/contrib/pg_tde/documentation/mkdocs.yml index bbc8b604fc6a8..bdac5f4823963 100644 --- a/contrib/pg_tde/documentation/mkdocs.yml +++ b/contrib/pg_tde/documentation/mkdocs.yml @@ -125,7 +125,7 @@ plugins: debug_html: false # two_columns_level: 3 custom_template_path: _resource/templates - enabled_if_env: ENABLE_PDF_EXPORT + enabled_if_env: ENABLE_PDF_EXPORT extra: version: @@ -144,8 +144,8 @@ extra: - icon: material/emoticon-sad-outline name: This page could be improved data: 0 - note: >- - Thank you for your feedback! Help us improve by using our + note: >- + Thank you for your feedback! Help us improve by using our feedback form. @@ -156,7 +156,7 @@ nav: - Get started: - "1. Install": "install.md" - "Via apt": apt.md - - "Via yum": yum.md + - "Via yum": yum.md - "2. Set up": "setup.md" - "3. Configure WAL encryption (tech preview)": wal-encryption.md - "4. Test TDE": "test.md" diff --git a/contrib/pg_tde/expected/change_access_method.out b/contrib/pg_tde/expected/change_access_method.out index ce8f54af7067d..d4841ee890c83 100644 --- a/contrib/pg_tde/expected/change_access_method.out +++ b/contrib/pg_tde/expected/change_access_method.out @@ -16,7 +16,6 @@ CREATE TABLE country_table ( country_name varchar(32) unique not null, continent varchar(32) not null ) USING tde_heap; - INSERT INTO country_table (country_name, continent) VALUES ('Japan', 'Asia'), ('UK', 'Europe'), @@ -49,7 +48,7 @@ SELECT pg_tde_is_encrypted('country_table_pkey'); -- Try changing the encrypted table to an unencrypted table ALTER TABLE country_table SET ACCESS METHOD heap; --- Insert some more data +-- Insert some more data INSERT INTO country_table (country_name, continent) VALUES ('France', 'Europe'), ('Germany', 'Europe'), @@ -158,7 +157,6 @@ CREATE TABLE country_table3 ( continent text not null ) USING heap; ERROR: pg_tde.enforce_encryption is ON, only the tde_heap access method is allowed. - ALTER TABLE country_table SET ACCESS METHOD heap; ERROR: pg_tde.enforce_encryption is ON, only the tde_heap access method is allowed. ALTER TABLE country_table2 SET ACCESS METHOD tde_heap; diff --git a/contrib/pg_tde/expected/default_principal_key.out b/contrib/pg_tde/expected/default_principal_key.out index 8569aab5b42a0..00ccd625194a5 100644 --- a/contrib/pg_tde/expected/default_principal_key.out +++ b/contrib/pg_tde/expected/default_principal_key.out @@ -10,7 +10,7 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regressi SELECT pg_tde_verify_default_key(); ERROR: principal key not configured for current database -- Should fail: no default principal key for the server yet -SELECT key_provider_id, key_provider_name, key_name +SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_default_key_info(); ERROR: Principal key does not exists for the database HINT: Use set_key interface to set the principal key @@ -26,7 +26,7 @@ SELECT pg_tde_verify_default_key(); (1 row) -SELECT key_provider_id, key_provider_name, key_name +SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_default_key_info(); key_provider_id | key_provider_name | key_name -----------------+-------------------+------------- @@ -48,7 +48,6 @@ SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info(); ERROR: Principal key does not exists for the database HINT: Use set_key interface to set the principal key - -- Should succeed: "localizes" the default principal key for the database CREATE TABLE test_enc( id SERIAL, diff --git a/contrib/pg_tde/sql/change_access_method.sql b/contrib/pg_tde/sql/change_access_method.sql index dc01fbed8955a..cc3f2eb153f5d 100644 --- a/contrib/pg_tde/sql/change_access_method.sql +++ b/contrib/pg_tde/sql/change_access_method.sql @@ -8,7 +8,7 @@ CREATE TABLE country_table ( country_name varchar(32) unique not null, continent varchar(32) not null ) USING tde_heap; - + INSERT INTO country_table (country_name, continent) VALUES ('Japan', 'Asia'), ('UK', 'Europe'), @@ -22,7 +22,7 @@ SELECT pg_tde_is_encrypted('country_table_pkey'); -- Try changing the encrypted table to an unencrypted table ALTER TABLE country_table SET ACCESS METHOD heap; --- Insert some more data +-- Insert some more data INSERT INTO country_table (country_name, continent) VALUES ('France', 'Europe'), ('Germany', 'Europe'), @@ -78,7 +78,7 @@ CREATE TABLE country_table3 ( country_name text unique not null, continent text not null ) USING heap; - + ALTER TABLE country_table SET ACCESS METHOD heap; ALTER TABLE country_table2 SET ACCESS METHOD tde_heap; diff --git a/contrib/pg_tde/sql/default_principal_key.sql b/contrib/pg_tde/sql/default_principal_key.sql index 9a100a2a0d3ab..be4183566c7fa 100644 --- a/contrib/pg_tde/sql/default_principal_key.sql +++ b/contrib/pg_tde/sql/default_principal_key.sql @@ -7,13 +7,13 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regressi SELECT pg_tde_verify_default_key(); -- Should fail: no default principal key for the server yet -SELECT key_provider_id, key_provider_name, key_name +SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_default_key_info(); SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'file-provider', false); SELECT pg_tde_verify_default_key(); -SELECT key_provider_id, key_provider_name, key_name +SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_default_key_info(); -- fails @@ -23,7 +23,7 @@ SELECT id, provider_name FROM pg_tde_list_all_global_key_providers(); -- Should fail: no principal key for the database yet SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info(); - + -- Should succeed: "localizes" the default principal key for the database CREATE TABLE test_enc( id SERIAL,