From d45ccb15d1eb54d3c94de204789c34d8c0742563 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Mon, 26 Aug 2019 10:31:48 +0800 Subject: [PATCH] Test spark.sql.redaction.options.regex --- .../org/apache/spark/sql/jdbc/JDBCSuite.scala | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala index 72a564506bd2..7fe00aef56e1 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala @@ -1031,8 +1031,10 @@ class JDBCSuite extends QueryTest } test("Hide credentials in show create table") { + val userName = "testUser" val password = "testPass" val tableName = "tab1" + val dbTable = "TEST.PEOPLE" withTable(tableName) { sql( s""" @@ -1040,18 +1042,30 @@ class JDBCSuite extends QueryTest |USING org.apache.spark.sql.jdbc |OPTIONS ( | url '$urlWithUserAndPass', - | dbtable 'TEST.PEOPLE', - | user 'testUser', + | dbtable '$dbTable', + | user '$userName', | password '$password') """.stripMargin) val show = ShowCreateTableCommand(TableIdentifier(tableName)) spark.sessionState.executePlan(show).executedPlan.executeCollect().foreach { r => assert(!r.toString.contains(password)) + assert(r.toString.contains(dbTable)) + assert(r.toString.contains(userName)) } sql(s"SHOW CREATE TABLE $tableName").collect().foreach { r => - assert(!r.toString().contains(password)) + assert(!r.toString.contains(password)) + assert(r.toString.contains(dbTable)) + assert(r.toString.contains(userName)) + } + + withSQLConf(SQLConf.SQL_OPTIONS_REDACTION_PATTERN.key -> "(?i)dbtable|user") { + spark.sessionState.executePlan(show).executedPlan.executeCollect().foreach { r => + assert(!r.toString.contains(password)) + assert(!r.toString.contains(dbTable)) + assert(!r.toString.contains(userName)) + } } } }