This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push: new 24303fa [create-pull-request] automated change 24303fa is described below commit 24303fac1b25245cfc254eacaf19cc13cbe492ce Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Apr 12 03:53:43 2021 +0000 [create-pull-request] automated change --- .../generated/resources/connectors/camel-hwcloud-smn-sink.json | 8 +++++++- .../src/generated/resources/camel-hwcloud-smn-sink.json | 8 +++++++- .../src/main/docs/camel-hwcloud-smn-kafka-sink-connector.adoc | 5 +++-- .../main/docs/examples/CamelHwcloudsmnSinkConnector.properties | 2 +- .../hwcloudsmn/CamelHwcloudsmnSinkConnectorConfig.java | 6 +++++- .../pages/connectors/camel-hwcloud-smn-kafka-sink-connector.adoc | 5 +++-- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hwcloud-smn-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hwcloud-smn-sink.json index 285dc6b..3246d2a 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hwcloud-smn-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hwcloud-smn-sink.json @@ -21,6 +21,12 @@ "priority": "HIGH", "required": "true" }, + "camel.sink.endpoint.endpoint": { + "name": "camel.sink.endpoint.endpoint", + "description": "Fully qualified smn service url. Carries higher precedence than region parameter based client initialization", + "priority": "MEDIUM", + "required": "false" + }, "camel.sink.endpoint.ignoreSslVerification": { "name": "camel.sink.endpoint.ignoreSslVerification", "description": "Ignore SSL verification", @@ -80,7 +86,7 @@ }, "camel.sink.endpoint.region": { "name": "camel.sink.endpoint.region", - "description": "SMN service region", + "description": "SMN service region. This is lower precedence than endpoint based configuration", "priority": "HIGH", "required": "true" }, diff --git a/connectors/camel-hwcloud-smn-kafka-connector/src/generated/resources/camel-hwcloud-smn-sink.json b/connectors/camel-hwcloud-smn-kafka-connector/src/generated/resources/camel-hwcloud-smn-sink.json index 285dc6b..3246d2a 100644 --- a/connectors/camel-hwcloud-smn-kafka-connector/src/generated/resources/camel-hwcloud-smn-sink.json +++ b/connectors/camel-hwcloud-smn-kafka-connector/src/generated/resources/camel-hwcloud-smn-sink.json @@ -21,6 +21,12 @@ "priority": "HIGH", "required": "true" }, + "camel.sink.endpoint.endpoint": { + "name": "camel.sink.endpoint.endpoint", + "description": "Fully qualified smn service url. Carries higher precedence than region parameter based client initialization", + "priority": "MEDIUM", + "required": "false" + }, "camel.sink.endpoint.ignoreSslVerification": { "name": "camel.sink.endpoint.ignoreSslVerification", "description": "Ignore SSL verification", @@ -80,7 +86,7 @@ }, "camel.sink.endpoint.region": { "name": "camel.sink.endpoint.region", - "description": "SMN service region", + "description": "SMN service region. This is lower precedence than endpoint based configuration", "priority": "HIGH", "required": "true" }, diff --git a/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/camel-hwcloud-smn-kafka-sink-connector.adoc b/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/camel-hwcloud-smn-kafka-sink-connector.adoc index 63b4aad..d525124 100644 --- a/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/camel-hwcloud-smn-kafka-sink-connector.adoc +++ b/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/camel-hwcloud-smn-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.hwcloudsmn.CamelHwcloudsmnSinkCo ---- -The camel-hwcloud-smn sink connector supports 16 options, which are listed below. +The camel-hwcloud-smn sink connector supports 17 options, which are listed below. @@ -33,6 +33,7 @@ The camel-hwcloud-smn sink connector supports 16 options, which are listed below | Name | Description | Default | Required | Priority | *camel.sink.path.smnService* | Name of SMN service to invoke | null | true | HIGH | *camel.sink.endpoint.authKey* | Authentication key for the cloud user | null | true | HIGH +| *camel.sink.endpoint.endpoint* | Fully qualified smn service url. Carries higher precedence than region parameter based client initialization | null | false | MEDIUM | *camel.sink.endpoint.ignoreSslVerification* | Ignore SSL verification | false | false | MEDIUM | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...] | *camel.sink.endpoint.messageTtl* | TTL for published message | 3600 | false | MEDIUM @@ -42,7 +43,7 @@ The camel-hwcloud-smn sink connector supports 16 options, which are listed below | *camel.sink.endpoint.proxyPassword* | Proxy authentication password | null | false | MEDIUM | *camel.sink.endpoint.proxyPort* | Proxy server port | null | false | MEDIUM | *camel.sink.endpoint.proxyUser* | Proxy authentication user | null | false | MEDIUM -| *camel.sink.endpoint.region* | SMN service region | null | true | HIGH +| *camel.sink.endpoint.region* | SMN service region. This is lower precedence than endpoint based configuration | null | true | HIGH | *camel.sink.endpoint.secretKey* | Secret key for the cloud user | null | true | HIGH | *camel.sink.endpoint.serviceKeys* | Configuration object for cloud service authentication | null | false | MEDIUM | *camel.component.hwcloud-smn.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...] diff --git a/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/examples/CamelHwcloudsmnSinkConnector.properties b/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/examples/CamelHwcloudsmnSinkConnector.properties index b5fe8a9..635aaf3 100644 --- a/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/examples/CamelHwcloudsmnSinkConnector.properties +++ b/connectors/camel-hwcloud-smn-kafka-connector/src/main/docs/examples/CamelHwcloudsmnSinkConnector.properties @@ -34,7 +34,7 @@ camel.sink.endpoint.authKey= camel.sink.endpoint.operation= # Cloud project ID camel.sink.endpoint.projectId= -# SMN service region +# SMN service region. This is lower precedence than endpoint based configuration camel.sink.endpoint.region= # Secret key for the cloud user camel.sink.endpoint.secretKey= diff --git a/connectors/camel-hwcloud-smn-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/hwcloudsmn/CamelHwcloudsmnSinkConnectorConfig.java b/connectors/camel-hwcloud-smn-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/hwcloudsmn/CamelHwcloudsmnSinkConnectorConfig.java index 34e31da..586cdc1 100644 --- a/connectors/camel-hwcloud-smn-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/hwcloudsmn/CamelHwcloudsmnSinkConnectorConfig.java +++ b/connectors/camel-hwcloud-smn-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/hwcloudsmn/CamelHwcloudsmnSinkConnectorConfig.java @@ -32,6 +32,9 @@ public class CamelHwcloudsmnSinkConnectorConfig public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_CONF = "camel.sink.endpoint.authKey"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_DOC = "Authentication key for the cloud user"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_DEFAULT = null; + public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_CONF = "camel.sink.endpoint.endpoint"; + public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_DOC = "Fully qualified smn service url. Carries higher precedence than region parameter based client initialization"; + public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_DEFAULT = null; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_CONF = "camel.sink.endpoint.ignoreSslVerification"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_DOC = "Ignore SSL verification"; public static final Boolean CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_DEFAULT = false; @@ -60,7 +63,7 @@ public class CamelHwcloudsmnSinkConnectorConfig public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_PROXY_USER_DOC = "Proxy authentication user"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_PROXY_USER_DEFAULT = null; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region"; - public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_REGION_DOC = "SMN service region"; + public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_REGION_DOC = "SMN service region. This is lower precedence than endpoint based configuration"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_REGION_DEFAULT = null; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey"; public static final String CAMEL_SINK_HWCLOUDSMN_ENDPOINT_SECRET_KEY_DOC = "Secret key for the cloud user"; @@ -89,6 +92,7 @@ public class CamelHwcloudsmnSinkConnectorConfig ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf()); conf.define(CAMEL_SINK_HWCLOUDSMN_PATH_SMN_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HWCLOUDSMN_PATH_SMN_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_HWCLOUDSMN_PATH_SMN_SERVICE_DOC); conf.define(CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_CONF, ConfigDef.Type.PASSWORD, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_AUTH_KEY_DOC); + conf.define(CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_ENDPOINT_DOC); conf.define(CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_IGNORE_SSL_VERIFICATION_DOC); conf.define(CAMEL_SINK_HWCLOUDSMN_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_LAZY_START_PRODUCER_DOC); conf.define(CAMEL_SINK_HWCLOUDSMN_ENDPOINT_MESSAGE_TTL_CONF, ConfigDef.Type.INT, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_MESSAGE_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_HWCLOUDSMN_ENDPOINT_MESSAGE_TTL_DOC); diff --git a/docs/modules/ROOT/pages/connectors/camel-hwcloud-smn-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-hwcloud-smn-kafka-sink-connector.adoc index 63b4aad..d525124 100644 --- a/docs/modules/ROOT/pages/connectors/camel-hwcloud-smn-kafka-sink-connector.adoc +++ b/docs/modules/ROOT/pages/connectors/camel-hwcloud-smn-kafka-sink-connector.adoc @@ -24,7 +24,7 @@ connector.class=org.apache.camel.kafkaconnector.hwcloudsmn.CamelHwcloudsmnSinkCo ---- -The camel-hwcloud-smn sink connector supports 16 options, which are listed below. +The camel-hwcloud-smn sink connector supports 17 options, which are listed below. @@ -33,6 +33,7 @@ The camel-hwcloud-smn sink connector supports 16 options, which are listed below | Name | Description | Default | Required | Priority | *camel.sink.path.smnService* | Name of SMN service to invoke | null | true | HIGH | *camel.sink.endpoint.authKey* | Authentication key for the cloud user | null | true | HIGH +| *camel.sink.endpoint.endpoint* | Fully qualified smn service url. Carries higher precedence than region parameter based client initialization | null | false | MEDIUM | *camel.sink.endpoint.ignoreSslVerification* | Ignore SSL verification | false | false | MEDIUM | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...] | *camel.sink.endpoint.messageTtl* | TTL for published message | 3600 | false | MEDIUM @@ -42,7 +43,7 @@ The camel-hwcloud-smn sink connector supports 16 options, which are listed below | *camel.sink.endpoint.proxyPassword* | Proxy authentication password | null | false | MEDIUM | *camel.sink.endpoint.proxyPort* | Proxy server port | null | false | MEDIUM | *camel.sink.endpoint.proxyUser* | Proxy authentication user | null | false | MEDIUM -| *camel.sink.endpoint.region* | SMN service region | null | true | HIGH +| *camel.sink.endpoint.region* | SMN service region. This is lower precedence than endpoint based configuration | null | true | HIGH | *camel.sink.endpoint.secretKey* | Secret key for the cloud user | null | true | HIGH | *camel.sink.endpoint.serviceKeys* | Configuration object for cloud service authentication | null | false | MEDIUM | *camel.component.hwcloud-smn.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]