This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.13 by this push:
new 195d50b Revert "[FLINK-24381][table] Hiden sensitive config values"
195d50b is described below
commit 195d50be0242cc1eae5576dbf6ec79da67232db8
Author: Chesnay Schepler <[email protected]>
AuthorDate: Tue Nov 2 12:55:09 2021 +0100
Revert "[FLINK-24381][table] Hiden sensitive config values"
This reverts commit 50121c301ac24a04a470c3653f2877c22e5862e7.
---
.../apache/flink/table/factories/FactoryUtil.java | 6 ------
.../flink/table/factories/FactoryUtilTest.java | 22 ----------------------
.../table/factories/TestDynamicTableFactory.java | 4 ----
3 files changed, 32 deletions(-)
diff --git
a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/FactoryUtil.java
b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/FactoryUtil.java
index b01e94a..c7c8c82 100644
---
a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/FactoryUtil.java
+++
b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/factories/FactoryUtil.java
@@ -23,7 +23,6 @@ import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.DelegatingConfiguration;
-import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.table.api.NoMatchingTableFactoryException;
import org.apache.flink.table.api.TableException;
@@ -57,8 +56,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static
org.apache.flink.configuration.GlobalConfiguration.HIDDEN_CONTENT;
-
/** Utility for working with {@link Factory}s. */
@PublicEvolving
public final class FactoryUtil {
@@ -512,9 +509,6 @@ public final class FactoryUtil {
}
private static String stringifyOption(String key, String value) {
- if (GlobalConfiguration.isSensitive(key)) {
- value = HIDDEN_CONTENT;
- }
return String.format(
"'%s'='%s'",
EncodingUtils.escapeSingleQuotes(key),
EncodingUtils.escapeSingleQuotes(value));
diff --git
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/FactoryUtilTest.java
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/FactoryUtilTest.java
index 0a95d49..47c3d98 100644
---
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/FactoryUtilTest.java
+++
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/FactoryUtilTest.java
@@ -146,27 +146,6 @@ public class FactoryUtilTest {
}
@Test
- public void testSecretOption() {
- expectError(
- "Table options are:\n"
- + "\n"
- + "'buffer-size'='1000'\n"
- + "'connector'='test-connector'\n"
- + "'key.format'='test-format'\n"
- + "'key.test-format.delimiter'=','\n"
- + "'password'='******'\n"
- + "'property-version'='1'\n"
- + "'value.format'='test-format'\n"
- + "'value.test-format.delimiter'='|'\n"
- + "'value.test-format.fail-on-missing'='true'");
- testError(
- options -> {
- options.remove("target");
- options.put("password", "123");
- });
- }
-
- @Test
public void testUnconsumedOption() {
expectError(
"Unsupported options found for 'test-connector'.\n\n"
@@ -182,7 +161,6 @@ public class FactoryUtilTest {
+ "key.test-format.delimiter\n"
+ "key.test-format.fail-on-missing\n"
+ "key.test-format.readable-metadata\n"
- + "password\n"
+ "property-version\n"
+ "target\n"
+ "value.format\n"
diff --git
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TestDynamicTableFactory.java
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TestDynamicTableFactory.java
index f552742..4bdd5c0 100644
---
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TestDynamicTableFactory.java
+++
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/factories/TestDynamicTableFactory.java
@@ -55,9 +55,6 @@ public final class TestDynamicTableFactory
public static final ConfigOption<Long> BUFFER_SIZE =
ConfigOptions.key("buffer-size").longType().defaultValue(100L);
- public static final ConfigOption<String> PASSWORD =
- ConfigOptions.key("password").stringType().noDefaultValue();
-
public static final ConfigOption<String> KEY_FORMAT =
ConfigOptions.key("key" +
FORMAT_SUFFIX).stringType().noDefaultValue();
@@ -123,7 +120,6 @@ public final class TestDynamicTableFactory
options.add(KEY_FORMAT);
options.add(FORMAT);
options.add(VALUE_FORMAT);
- options.add(PASSWORD);
return options;
}
