Remove unused DataStax Astra support

[dkropachev]

Closes #1026. Part of #1025.

What and why

Remove DataStax Astra secure-connect-bundle parsing, topology/SNI routing, public configuration, examples, and tests. ScyllaDB does not use or test this path, so deleting it reduces unverified production and test code that the team must support.

Scylla client routes/private-endpoint support is preserved.

Validation

• mvn -pl core clean test — 3,955 unit tests and 76 Reactive Streams TCK checks passed.
• mvn -pl core -DskipTests verify
• mvn -pl examples -DskipTests package
• Full fast reactor compiled through integration and OSGi modules; its distribution assembly then hit the existing -Pfast/missing-sources incompatibility.

Dependencies: none. Cherry-picked commits: none.

[coderabbitai]

Understand this PR’s impact

Explore downstream dependencies and potential security impact with Blast Radius.

View blast radius →

Important

Review skipped

We couldn't safely recover the incremental review. No full review was started, and the last reviewed checkpoint was preserved. Retry later, or explicitly request a full review by commenting @coderabbitai full review.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: QUIET

Plan: Advanced

Run ID: 15183227-8a26-4747-af4d-3ce47d0e9f48

---

📥 Commits

Reviewing files that changed from the base of the PR and between 4a44271 and 146b688.

---

📒 Files selected for processing (9)

• core/pom.xml
• core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java
• core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java
• core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java
• core/src/main/resources/reference.conf
• integration-tests/pom.xml
• manual/core/address_resolution/README.md
• pom.xml
• upgrade_guide/README.md

---

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.

---

---

📝 Walkthrough

Walkthrough

The change removes Astra secure-connect-bundle and cloud proxy APIs, configuration, runtime handling, SNI support, tests, and dependencies. Client-routes handling remains and no longer conflicts with secure-connect bundles. Protocol option tests now validate ProtocolFeatureStore behavior. Supporting documentation and examples are updated.

---

Priority: ➖ Normal

Change: Other

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 16.67% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 18 functions across 13 files. (2 skipped:…	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly identifies the main change: removal of unused DataStax Astra support.
Description check	✅ Passed	The description directly explains the removed Astra support, preserved ScyllaDB functionality, validation, and known build limitation.
Linked Issues check	✅ Passed	For [#1026], the PR removes the secure-connect-bundle options and builder APIs, cloud parsing, proxy/topology/SNI runtime classes, Astra configuration, examples, fixtures, unit and integration tests, …
Out of Scope Changes check	✅ Passed	The changes stay within [#1026]. Channel and test refactoring removes obsolete cloud assumptions or preserves Scylla protocol negotiation and client-routes coverage. The retained SNI example supports …

---

Full details: Docstring Coverage

Explanation

Docstring coverage is 16.67% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 18 functions across 13 files. (2 skipped: 2 unsupported.)

---

---

✨ Finishing Touches 💡 1

🛠️ Fix failing CI checks 💡

• Commit to this branch
• Create a new PR

---

---

---

_{Comment @coderabbitai help to get the list of available commands.}

[nikagra]

Two leftovers that have no line in the diff to anchor to:

• [Minor] 🟡 TypesafeDriverConfig.overrideDefaults() loses its only production caller here. git grep overrideDefaults now matches just the declaration and TypeSafeDriverConfigOverrideDefaultsTest — ~60 lines of mechanism plus a 150-line test go dead, yet applyDefaultOverrides() still runs on every reload().
• [Nit] 🟢 W3CContextRequestIdGenerator(String payloadKey) was added for the Astra traceparent default; after this PR its only caller is RequestIdGeneratorTest:77. The config-driven path uses the DriverContext ctor and the interface default key.

[dkropachev]

Follow-up on the two unanchored review notes:

• Keeping TypesafeDriverConfig.overrideDefaults() and its reload integration. It is generic configuration-default override machinery rather than Astra-specific runtime code; removing the mechanism and its coverage would broaden Remove DataStax Astra secure-connect-bundle support #1026 beyond the secure-bundle cleanup.
• Keeping W3CContextRequestIdGenerator(String). It remains a general constructor for choosing a custom payload key. Zero repository production callers is not sufficient reason to remove another callable constructor in this compatibility-breaking PR.

Both are intentionally unchanged; the Astra-specific caller and ASTRA_PAYLOAD_KEY are still removed.

[Copilot]

🟢 Approval recommended

Validation passed and no unresolved review issues remain.

Pull request overview

Removes unsupported DataStax Astra secure-connect-bundle functionality while preserving ScyllaDB client-routes/private-endpoint support.

Changes:

• Removes Astra APIs, configuration, SNI routing, examples, fixtures, and tests.
• Removes WireMock and replaces transitive test utilities.
• Updates channel tests, documentation, and migration guidance.

File summaries

File	Description
upgrade_guide/README.md	Documents the breaking removal.
pom.xml	Removes WireMock dependency management.
manual/core/address_resolution/README.md	Updates client-routes guidance.
integration-tests/src/test/java/com/datastax/oss/driver/api/core/cloud/SniProxyServer.java	Removes the Astra proxy fixture.
integration-tests/src/test/java/com/datastax/oss/driver/api/core/cloud/SniProxyRule.java	Removes the Astra proxy rule.
integration-tests/src/test/java/com/datastax/oss/driver/api/core/cloud/CloudIT.java	Removes Astra integration tests.
integration-tests/pom.xml	Removes the WireMock dependency.
examples/src/main/java/com/datastax/oss/driver/examples/mapper/KillrVideoMapperExample.java	Replaces Astra-specific content.
examples/src/main/java/com/datastax/oss/driver/examples/astra/AstraReadCassandraVersion.java	Removes the Astra example.
core/src/test/resources/config/cloud/metadata.json	Removes the cloud fixture.
core/src/test/java/com/datastax/oss/driver/internal/core/protocol/BytesToSegmentDecoderTest.java	Uses shaded Guava.
core/src/test/java/com/datastax/oss/driver/internal/core/metrics/TaggingMetricIdGeneratorTest.java	Uses shaded Guava.
core/src/test/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricIdTest.java	Uses shaded Guava.
core/src/test/java/com/datastax/oss/driver/internal/core/metadata/schema/TableMetadataTest.java	Uses shaded Guava.
core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java	Uses shaded Guava.
core/src/test/java/com/datastax/oss/driver/internal/core/context/DefaultDriverConfigReporterTest.java	Removes SNI assertions.
core/src/test/java/com/datastax/oss/driver/internal/core/context/ClientRoutesConfigFromFileTest.java	Removes the obsolete bundle conflict test.
core/src/test/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactoryTest.java	Removes bundle parsing tests.
core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryTestBase.java	Preserves OPTIONS negotiation.
core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactorySupportedOptionsTest.java	Tests OPTIONS negotiation on every channel.
core/src/test/java/com/datastax/oss/driver/internal/core/channel/ChannelFactoryClusterNameTest.java	Updates channel initialization expectations.
core/src/test/java/com/datastax/oss/driver/api/core/data/CqlVectorTest.java	Replaces a transitive codec utility.
core/src/main/resources/reference.conf	Removes cloud configuration.
core/src/main/java/com/datastax/oss/driver/internal/core/ssl/SniSslEngineFactory.java	Removes Astra SNI TLS support.
core/src/main/java/com/datastax/oss/driver/internal/core/metadata/SniEndPoint.java	Removes the SNI endpoint implementation.
core/src/main/java/com/datastax/oss/driver/internal/core/metadata/CloudTopologyMonitor.java	Removes cloud topology handling.
core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java	Removes cloud monitor selection.
core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverConfigReporter.java	Removes SNI reporting logic.
core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactory.java	Removes bundle parsing.
core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfig.java	Removes the cloud configuration model.
core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java	Removes Astra product handling.
core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java	Removes secure-bundle APIs.
core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java	Removes cloud proxy arguments.
core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java	Removes the typed cloud option.
core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java	Removes the cloud option definition.
core/pom.xml	Removes the core WireMock dependency.

Review details

• Files reviewed: 36/39 changed files
• Comments generated: 0
• Review effort level: Balanced

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[nikagra]

Cleanup left over from the Astra removal — none block this PR, no correctness bugs found, but worth a follow-up:

[Minor] 🟡 TypesafeDriverConfig.java:196 — the default-override subsystem (overrideDefaults(), applyDefaultOverrides(), defaultOverrides map, DEFAULT_OVERRIDES_ORIGIN, isDefault()) has no remaining callers now that ChannelFactory's Astra product-type detection is gone. reload() still iterates a permanently-empty map on every config reload, and TypeSafeDriverConfigOverrideDefaultsTest keeps testing it.

[Minor] 🟡 DriverChannel.java:184 — OPTIONS_KEY/getOptions() lost their only production reader (the deleted product-type check). ProtocolInitHandler still stashes the SUPPORTED-options map into every channel's Netty attribute for nothing now.

[Minor] 🟡 ProgrammaticArguments.java:319 — clearDatacenters() was added for the secure-connect-bundle mutual-exclusivity check this PR deletes. No remaining callers anywhere in the tree; orphaned public API on Builder.

[Nit] 🟢 EndPoint.java:30 — javadoc still uses SNI routing as the example for a non-default EndPoint. SniEndPoint/SniSslEngineFactory are gone, and the only remaining implementation (ClientRoutesEndPoint) doesn't use SNI server names.

[Nit] 🟢 ChannelFactoryClusterNameTest.java:76 — hand-copies completeSimpleChannelInit()'s SUPPORTED-frame sequence instead of reusing it (already shared by ChannelFactoryProtocolNegotiationTest/ChannelFactoryAvailableIdsTest). Same duplication in ChannelFactorySupportedOptionsTest.

[Nit] 🟢 ClientRoutesConfigFromFileTest.java:73 — the two-arg contextFromHocon() overload only had one caller (should_throw_when_secure_connect_bundle_and_client_routes_both_configured), which this PR removes. Could collapse to a single method now.

[dkropachev]

Thanks. I addressed the actionable internal/test cleanup in 4a44271b4b:

• Removed DriverChannel.OPTIONS_KEY/getOptions() and stopped retaining the raw SUPPORTED map. The OPTIONS exchange remains because it feeds ProtocolFeatureStore for Scylla feature negotiation.
• Updated the channel tests to reuse completeSimpleChannelInit().
• Collapsed ClientRoutesConfigFromFileTest to one contextFromHocon(String) helper.

I’m intentionally retaining the other items:

• overrideDefaults() is generic configuration machinery; removing it should be a separate cleanup under [Epic] Remove unused DataStax-only code from the 4.x driver #1025.
• clearDatacenters() is generic public API available to custom SessionBuilder subclasses, so removing it would add an unrelated compatibility break.
• The EndPoint SNI example remains valid for custom EndPoint/SslEngineFactory implementations; it isn’t specific to the removed Astra implementations.

[nikagra]

Needs a rebase onto scylla-4.x; the upgrade-guide entry has to move to 4.19.2.3.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.98%. Comparing base (4f11bbe) to head (7a99064).

⚠️ Current head 7a99064 differs from pull request most recent head eb04d5b

Please upload reports for the commit eb04d5b to get more accurate results.

Additional details and impacted files

@@               Coverage Diff                @@
##             scylla-4.x    #1034      +/-   ##
================================================
+ Coverage         81.76%   81.98%   +0.21%     
+ Complexity         9692     9660      -32     
================================================
  Files               980      975       -5     
  Lines             36687    36418     -269     
  Branches           5048     5015      -33     
================================================
- Hits              29997    29857     -140     
+ Misses             6690     6561     -129     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[dkropachev]

Keep working