diff --git a/RELEASE.md b/RELEASE.md index 7e71684a..dbc3895f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,8 @@ # Release Notes ## [4.4.0] - 2024-09-19 - Added property `spark.cdm.connect.origin.tls.isAstra` and `spark.cdm.connect.target.tls.isAstra` to allow connecting to Astra DB without using [SCB](https://docs.datastax.com/en/astra-db-serverless/drivers/secure-connect-bundle.html). This may be needed for enterprises that may find credentials packaged within SCB as a security risk. TLS properties can now be passed as params OR wrapper scripts (not included) could be used to pull sensitive credentials from a vault service in real-time & pass them to CDM. +- Switched to using Apache Cassandra® `5.0` docker image for testing +- Introduces smoke testing of `vector` CQL data type ## [4.3.10] - 2024-09-12 - Added property `spark.cdm.trackRun.runId` to support a custom unique identifier for the current run. This can be used by wrapper scripts to pass a known `runId` and then use it to query the `cdm_run_info` and `cdm_run_details` tables. diff --git a/SIT/cdm-assert.sh b/SIT/cdm-assert.sh index 8d79b873..309a9a96 100755 --- a/SIT/cdm-assert.sh +++ b/SIT/cdm-assert.sh @@ -29,6 +29,7 @@ Missing Record Count: 0 Corrected Missing Record Count: 0 Valid Record Count: 3 Skipped Record Count: 0 +Error Record Count: 0 --------------- EOF diff --git a/SIT/environment.sh b/SIT/environment.sh index 21c31517..cc7cff5d 100755 --- a/SIT/environment.sh +++ b/SIT/environment.sh @@ -68,7 +68,7 @@ fi ### # These variables are hard-coded for now SUBNET=$(echo ${CIDR} | cut -d. -f1-3) -CASS_VERSION=4 +CASS_VERSION=5.0 CDM_VERSION=latest #============================================================================================================================== # Helper Functions diff --git a/SIT/smoke_inflight/06_vector/cdm.migrateData.assert b/SIT/smoke/06_vector/cdm.migrateData.assert similarity index 100% rename from SIT/smoke_inflight/06_vector/cdm.migrateData.assert rename to SIT/smoke/06_vector/cdm.migrateData.assert diff --git a/SIT/smoke_inflight/06_vector/cdm.txt b/SIT/smoke/06_vector/cdm.txt similarity index 100% rename from SIT/smoke_inflight/06_vector/cdm.txt rename to SIT/smoke/06_vector/cdm.txt diff --git a/SIT/smoke_inflight/06_vector/cdm.validateData.assert b/SIT/smoke/06_vector/cdm.validateData.assert similarity index 89% rename from SIT/smoke_inflight/06_vector/cdm.validateData.assert rename to SIT/smoke/06_vector/cdm.validateData.assert index 0340bf26..6edc8c4d 100644 --- a/SIT/smoke_inflight/06_vector/cdm.validateData.assert +++ b/SIT/smoke/06_vector/cdm.validateData.assert @@ -5,3 +5,4 @@ Missing Record Count: 0 Corrected Missing Record Count: 0 Valid Record Count: 2 Skipped Record Count: 0 +Error Record Count: 0 diff --git a/SIT/smoke_inflight/06_vector/execute.sh b/SIT/smoke/06_vector/execute.sh similarity index 100% rename from SIT/smoke_inflight/06_vector/execute.sh rename to SIT/smoke/06_vector/execute.sh diff --git a/SIT/smoke_inflight/06_vector/expected.cql b/SIT/smoke/06_vector/expected.cql similarity index 100% rename from SIT/smoke_inflight/06_vector/expected.cql rename to SIT/smoke/06_vector/expected.cql diff --git a/SIT/smoke_inflight/06_vector/expected.out b/SIT/smoke/06_vector/expected.out similarity index 100% rename from SIT/smoke_inflight/06_vector/expected.out rename to SIT/smoke/06_vector/expected.out diff --git a/SIT/smoke_inflight/06_vector/migrate.properties b/SIT/smoke/06_vector/migrate.properties similarity index 100% rename from SIT/smoke_inflight/06_vector/migrate.properties rename to SIT/smoke/06_vector/migrate.properties diff --git a/SIT/smoke_inflight/06_vector/setup.cql b/SIT/smoke/06_vector/setup.cql similarity index 100% rename from SIT/smoke_inflight/06_vector/setup.cql rename to SIT/smoke/06_vector/setup.cql diff --git a/SIT/test.sh b/SIT/test.sh index b2c91925..9dede74e 100755 --- a/SIT/test.sh +++ b/SIT/test.sh @@ -6,7 +6,7 @@ _usage() { usage: $0 -p phase Required - -p phase: one of {$PHASES} + -p phase: one of ${PHASES} EOF exit 1 diff --git a/src/test/java/com/datastax/cdm/job/ConnectionFetcherTest.java b/src/test/java/com/datastax/cdm/job/ConnectionFetcherTest.java index 6ff4cb5f..123e3191 100644 --- a/src/test/java/com/datastax/cdm/job/ConnectionFetcherTest.java +++ b/src/test/java/com/datastax/cdm/job/ConnectionFetcherTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.datastax.cdm.job; import static org.junit.jupiter.api.Assertions.assertEquals;