oscerd opened a new pull request, #1809:
URL: https://github.com/apache/camel-kafka-connector/pull/1809
Addresses the first half of #1798. **Deliberately does not close it** — see
"What this does not do".
## What
Five checked-in connector config classes declared a kamelet property as
`ConfigDef.Type.STRING`
although the kamelet YAML bundled in the same module declares it `format:
password`:
| Module | Option |
|---|---|
| `camel-jms-pooled-apache-artemis-sink-kafka-connector` |
`camel.kamelet.jms-pooled-apache-artemis-sink.password` |
| `camel-jms-pooled-apache-artemis-source-kafka-connector` |
`camel.kamelet.jms-pooled-apache-artemis-source.password` |
| `camel-scp-sink-kafka-connector` |
`camel.kamelet.scp-sink.privateKeyPassphrase` |
| `camel-sftp-sink-kafka-connector` |
`camel.kamelet.sftp-sink.privateKeyPassphrase` |
| `camel-sftp-source-kafka-connector` |
`camel.kamelet.sftp-source.privateKeyPassphrase` |
`camel-sftp-sink` shows it most plainly — `password` was already
`PASSWORD`-typed while
`privateKeyPassphrase`, three lines below it in the same method, was not.
These are stale generated output, not a generator defect:
`CamelKafkaConnectorKameletUpdateMojo.addConnectorOptions` already emits
`PASSWORD` for
`format: password`. Running `./mvnw clean install` over the tree regenerates
these five files to
exactly the state in this PR — the diff here is what the generator produces.
## Verification
Cross-checked *every* kamelet property in the catalog declaring `format:
password` against the
`ConfigDef.Type` of the matching `conf.define(...)` in the generated config
class:
```
before: checked=275 mismatches=5
after: checked=275 mismatches=0
```
The five above were the only ones, and no other option regressed.
Full reactor build from the repository root (`./mvnw clean install`, all
tests): BUILD SUCCESS. The
generator ran as part of it and left these five files unchanged, confirming
the edit matches its
output.
## What this does not do
The second half of #1798 — closing the drift so it cannot recur — is **not**
in this PR, because one
part of it needs a decision rather than a patch:
- `YamlKameletMapper` does not parse `x-descriptors`, so the catalog's other
credential marker
(`urn:camel:group:credentials`) is invisible to the generator. Treating it
as a `PASSWORD` signal
would also re-type options that carry the descriptor but not `format:
password` — usernames, for
instance — across a large number of connectors. That is a user-visible
change to the config
surface and should be decided deliberately, probably with a release note.
- A build/CI check that fails when the checked-in generated tree diverges
from what the generator
produces would have caught this (and would also flag the unrelated
regeneration drift currently
sitting on `main`). Worth doing, but separate from this fix.
#1798 stays open for both.
## Note on unrelated drift
The root build also regenerates a number of other files on a clean `main` —
connector configs,
catalog JSON, a couple of poms, docs nav — from newer kamelet descriptions
and dependency versions.
That is pre-existing and unrelated; it is excluded from this PR and is part
of what the drift check
above would surface.
--
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]
