Caideyipi commented on code in PR #18080:
URL: https://github.com/apache/iotdb/pull/18080#discussion_r3517854534
##########
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/protocol/IoTDBSslSyncSink.java:
##########
@@ -90,16 +97,83 @@ public void validate(final PipeParameterValidator
validator) throws Exception {
IOTDB_THRIFT_CONNECTOR.getPipePluginName())
.toLowerCase();
- validator.validate(
- args -> !((boolean) args[0]) || ((boolean) args[1] && (boolean)
args[2]),
- String.format(
- "When ssl transport is enabled, %s and %s must be specified",
- SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
-
IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName().equals(userSpecifiedConnectorName)
- ||
IOTDB_THRIFT_SSL_SINK.getPipePluginName().equals(userSpecifiedConnectorName)
- || parameters.getBooleanOrDefault(SINK_IOTDB_SSL_ENABLE_KEY,
false),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY));
+ validator
+ .validate(
+ args -> !((boolean) args[0]) || ((boolean) args[1] && (boolean)
args[2]),
+ String.format(
+ "When ssl transport is enabled, %s and %s must be specified",
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
Review Comment:
Applied in ca064a0c8ce: the trust-store validation error now mentions
connector.*, sink.*, and unprefixed aliases.
##########
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/sink/protocol/IoTDBSslSyncSink.java:
##########
@@ -90,16 +97,83 @@ public void validate(final PipeParameterValidator
validator) throws Exception {
IOTDB_THRIFT_CONNECTOR.getPipePluginName())
.toLowerCase();
- validator.validate(
- args -> !((boolean) args[0]) || ((boolean) args[1] && (boolean)
args[2]),
- String.format(
- "When ssl transport is enabled, %s and %s must be specified",
- SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
-
IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName().equals(userSpecifiedConnectorName)
- ||
IOTDB_THRIFT_SSL_SINK.getPipePluginName().equals(userSpecifiedConnectorName)
- || parameters.getBooleanOrDefault(SINK_IOTDB_SSL_ENABLE_KEY,
false),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY));
+ validator
+ .validate(
+ args -> !((boolean) args[0]) || ((boolean) args[1] && (boolean)
args[2]),
+ String.format(
+ "When ssl transport is enabled, %s and %s must be specified",
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
+
IOTDB_THRIFT_SSL_CONNECTOR.getPipePluginName().equals(userSpecifiedConnectorName)
+ ||
IOTDB_THRIFT_SSL_SINK.getPipePluginName().equals(userSpecifiedConnectorName)
+ || parameters.getBooleanOrDefault(
+ Arrays.asList(CONNECTOR_IOTDB_SSL_ENABLE_KEY,
SINK_IOTDB_SSL_ENABLE_KEY),
+ false),
+ hasCompleteAttributePair(
+ parameters,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PWD_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
+ hasNoHalfAttributePair(
+ parameters,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PWD_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY))
+ .validate(
+ args -> (boolean) args[0] == (boolean) args[1],
+ String.format(
+ "%s and %s must be specified together",
+ SINK_IOTDB_SSL_KEY_STORE_PATH_KEY,
SINK_IOTDB_SSL_KEY_STORE_PWD_KEY),
Review Comment:
Applied in ca064a0c8ce: the key-store pairing error now lists the accepted
connector.*, sink.*, and unprefixed aliases.
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/legacy/IoTDBLegacyPipeSink.java:
##########
@@ -151,9 +160,74 @@ public void validate(final PipeParameterValidator
validator) throws Exception {
SINK_IOTDB_SSL_ENABLE_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
- parameters.getBooleanOrDefault(SINK_IOTDB_SSL_ENABLE_KEY, false),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY),
- parameters.hasAttribute(SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY));
+ parameters.getBooleanOrDefault(
+ Arrays.asList(CONNECTOR_IOTDB_SSL_ENABLE_KEY,
SINK_IOTDB_SSL_ENABLE_KEY), false),
+ hasCompleteAttributePair(
+ parameters,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PWD_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
+ hasNoHalfAttributePair(
+ parameters,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ CONNECTOR_IOTDB_SSL_TRUST_STORE_PWD_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
+ SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY))
+ .validate(
+ args -> (boolean) args[0] == (boolean) args[1],
+ String.format(
+ "%s and %s must be specified together",
+ SINK_IOTDB_SSL_KEY_STORE_PATH_KEY,
SINK_IOTDB_SSL_KEY_STORE_PWD_KEY),
+ true,
Review Comment:
Applied in ca064a0c8ce: the legacy key-store pairing error now mentions
connector.*, sink.*, and unprefixed aliases.
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/legacy/IoTDBLegacyPipeSink.java:
##########
@@ -151,9 +160,74 @@ public void validate(final PipeParameterValidator
validator) throws Exception {
SINK_IOTDB_SSL_ENABLE_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PATH_KEY,
SINK_IOTDB_SSL_TRUST_STORE_PWD_KEY),
Review Comment:
Applied in ca064a0c8ce: the legacy sink SSL-enable error now reflects
connector.ssl.enable / sink.ssl.enable and the accepted trust-store aliases.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
