Skip to content

Commit 1d4431a

Browse files
authored
Auto-download Astra DB SCB (#360)
* Auto-download Astra DB SCB * add more unit test coverage * Reuse CONNECT_PASSWORD as opposed to new Astra token properties * simplify
1 parent 2bb9451 commit 1d4431a

File tree

11 files changed

+1213
-12
lines changed

11 files changed

+1213
-12
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ SIT/**/output/*
1313
.settings/*
1414
src/main/main.iml
1515
src/test/test.iml
16+
17+
**/.claude/settings.local.json

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ spark-submit --properties-file cdm.properties \
155155
- Fully containerized (Docker and K8s friendly)
156156
- SSL Support (including custom cipher algorithms)
157157
- Migrate from any Cassandra `Origin` ([Apache Cassandra®](https://cassandra.apache.org) / [DataStax Enterprise™](https://www.datastax.com/products/datastax-enterprise) / [DataStax Astra DB™](https://www.datastax.com/products/datastax-astra)) to any Cassandra `Target` ([Apache Cassandra®](https://cassandra.apache.org) / [DataStax Enterprise™](https://www.datastax.com/products/datastax-enterprise) / [DataStax Astra DB™](https://www.datastax.com/products/datastax-astra))
158+
- Automatic download of Secure Connect Bundles for Astra DB using the DevOps API
158159
- Supports migration/validation from and to [Azure Cosmos Cassandra](https://learn.microsoft.com/en-us/azure/cosmos-db/cassandra)
159160
- Validate migration accuracy and performance using a smaller randomized data-set
160161
- Supports adding custom fixed `writetime` and/or `ttl`

RELEASE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Release Notes
22

3+
## [5.3.0] - 2025-05-05
4+
- Auto-download Astra DB Secure Connect Bundle (SCB) when connecting to Astra DB.
5+
36
## [5.2.3] - 2025-04-15
47
- Randomized the pending token-range list returned by the `trackRun` feature (when rerunning a previously incomplete job) for better load distribution across the cluster.
58

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@
175175
<version>${mockito.version}</version>
176176
<scope>test</scope>
177177
</dependency>
178+
<dependency>
179+
<groupId>org.mockito</groupId>
180+
<artifactId>mockito-junit-jupiter</artifactId>
181+
<version>${mockito.version}</version>
182+
<scope>test</scope>
183+
</dependency>
178184
</dependencies>
179185

180186
<scm>

src/main/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatement.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,8 @@ public Collection<PartitionRange> getPendingPartitions(long prevRunId, JobType j
114114

115115
final List<PartitionRange> pendingParts = new ArrayList<PartitionRange>();
116116
// Use an array of statuses for iteration
117-
String[] statuses = {
118-
TrackRun.RUN_STATUS.NOT_STARTED.toString(),
119-
TrackRun.RUN_STATUS.STARTED.toString(),
120-
TrackRun.RUN_STATUS.FAIL.toString(),
121-
TrackRun.RUN_STATUS.DIFF.toString()
122-
};
117+
String[] statuses = { TrackRun.RUN_STATUS.NOT_STARTED.toString(), TrackRun.RUN_STATUS.STARTED.toString(),
118+
TrackRun.RUN_STATUS.FAIL.toString(), TrackRun.RUN_STATUS.DIFF.toString() };
123119
for (String status : statuses) {
124120
pendingParts.addAll(getPartitionsByStatus(prevRunId, status, jobType));
125121
}

0 commit comments

Comments
 (0)