From 34438f5229c0bc8dbb937b0288c765e8436de936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20=C3=85strand?= Date: Wed, 7 May 2025 13:32:47 +0200 Subject: [PATCH] Fix some broken key provider test These tests did not assert what they claimed to assert. --- contrib/pg_tde/expected/key_provider.out | 24 ++++++++++++------------ contrib/pg_tde/sql/key_provider.sql | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pg_tde/expected/key_provider.out b/contrib/pg_tde/expected/key_provider.out index cc7b30be22d..29a00cd0568 100644 --- a/contrib/pg_tde/expected/key_provider.out +++ b/contrib/pg_tde/expected/key_provider.out @@ -258,16 +258,16 @@ ERROR: key provider options must be an object -- Modifying key providers fails if an external value object doesn't have all required keys SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {}}'); ERROR: external value must contain "type" in field "path" -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": null}}'); -ERROR: key provider "provider" does not exists +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": null}}'); +ERROR: external value must contain "type" in field "path" SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "remote"}}'); ERROR: external remote value must contain "url" in field "path" -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "remote", "url": null}}'); -ERROR: key provider "provider" does not exists +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "remote", "url": null}}'); +ERROR: external remote value must contain "url" in field "path" SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file"}}'); ERROR: external file value must contain "path" in field "path" -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "file", "path": null}}'); -ERROR: key provider "provider" does not exists +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": null}}'); +ERROR: external file value must contain "path" in field "path" -- Modifying key providers fails if values are array instead of scalar SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": ["array"]}'); ERROR: unexpected array in field "path" @@ -276,12 +276,12 @@ ERROR: unexpected array in field "path" SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": ["array"]}}'); ERROR: unexpected array in field "path" -- Modifying key providers fails if values are boolean -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": true}'); -ERROR: key provider "provider" does not exists -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": true}}'); -ERROR: key provider "provider" does not exists -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "file", "path": true}}'); -ERROR: key provider "provider" does not exists +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": true}'); +ERROR: unexpected boolean in field "path" +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": true}}'); +ERROR: unexpected boolean in field "path" +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": true}}'); +ERROR: unexpected boolean in field "path" -- Deleting key providers fails if key name is NULL SELECT pg_tde_delete_database_key_provider(NULL); ERROR: provider_name cannot be null diff --git a/contrib/pg_tde/sql/key_provider.sql b/contrib/pg_tde/sql/key_provider.sql index f3d594a3b9b..c777d8aaa26 100644 --- a/contrib/pg_tde/sql/key_provider.sql +++ b/contrib/pg_tde/sql/key_provider.sql @@ -119,11 +119,11 @@ SELECT pg_tde_change_database_key_provider('file', 'file-provider', 'null'); -- Modifying key providers fails if an external value object doesn't have all required keys SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {}}'); -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": null}}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": null}}'); SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "remote"}}'); -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "remote", "url": null}}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "remote", "url": null}}'); SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file"}}'); -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "file", "path": null}}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": null}}'); -- Modifying key providers fails if values are array instead of scalar SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": ["array"]}'); @@ -131,9 +131,9 @@ SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {" SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": ["array"]}}'); -- Modifying key providers fails if values are boolean -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": true}'); -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": true}}'); -SELECT pg_tde_change_database_key_provider('file', 'provider', '{"path": {"type": "file", "path": true}}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": true}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": true}}'); +SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"type": "file", "path": true}}'); -- Deleting key providers fails if key name is NULL SELECT pg_tde_delete_database_key_provider(NULL);