fix redaction issue

duckdb · Feb 13, 2024 · f67e840 · f67e840
1 parent a882a23
commit f67e840
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/duckdb b/duckdb
diff --git a/src/aws_secret.cpp b/src/aws_secret.cpp
@@ -28,7 +28,7 @@ static void ParseCoreS3Config(CreateSecretInput &input, KeyValueSecret &secret)
 static unique_ptr<KeyValueSecret> ConstructBaseS3Secret(vector<string> &prefix_paths_p, string &type, string &provider,
                                                         string &name) {
 	auto return_value = make_uniq<KeyValueSecret>(prefix_paths_p, type, provider, name);
-	return_value->redact_keys = {"secret_access_key", "session_token"};
+	return_value->redact_keys = {"secret", "session_token"};
 	return return_value;
 }
 

diff --git a/test/sql/aws_secret.test b/test/sql/aws_secret.test
@@ -40,4 +40,9 @@ set secret_directory='__TEST_DIR__/aws_secret'
 query IIIIIII
 SELECT * from duckdb_secrets(redact=false);
 ----
-aws_all_s3_params_set	s3	credential_chain	1	local_file	[]	name=aws_all_s3_params_set;type=s3;provider=credential_chain;serializable=true;scope;endpoint=endpoint_override;key_id=key_override;region=region_override;secret=secret_override;session_token=session_override;url_style=style_override;use_ssl=true
+aws_all_s3_params_set	s3	credential_chain	1	local_file	[]	name=aws_all_s3_params_set;type=s3;provider=credential_chain;serializable=true;scope;endpoint=endpoint_override;key_id=key_override;region=region_override;secret=secret_override;session_token=session_override;url_style=style_override;use_ssl=true
+
+query IIIIIII
+SELECT * from duckdb_secrets();
+----
+aws_all_s3_params_set	s3	credential_chain	1	local_file	[]	name=aws_all_s3_params_set;type=s3;provider=credential_chain;serializable=true;scope;endpoint=endpoint_override;key_id=key_override;region=region_override;secret=redacted;session_token=redacted;url_style=style_override;use_ssl=true