raise astra version to 2.1.4

v2/astradb-to-bigquery/pom.xml

@@ -29,10 +29,6 @@
     <name>AstraDB To BigQuery</name>
     <description>Copy a Table hosted in DataStax AstraDb (Cassandra) to BigQuery</description>
 
-    <properties>
-        <astra-io.version>4.18.1</astra-io.version>
-        <astra-sdk.version>0.6.3</astra-sdk.version>
-    </properties>
 
     <dependencies>
 

v2/astradb-to-bigquery/src/main/java/com/google/cloud/teleport/v2/astradb/templates/AstraDbToBigQuery.java

@@ -16,7 +16,7 @@
 package com.google.cloud.teleport.v2.astradb.templates;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableSchema;
 import com.google.cloud.bigquery.BigQuery;
@@ -197,7 +197,7 @@ private static AbstractMap.SimpleImmutableEntry<String, byte[]> parseAstraCreden
     /*
      * Accessing the devops Api to retrieve the secure bundle.
      */
-    DatabaseClient astraDbClient = new DatabaseClient(astraToken, options.getAstraDatabaseId());
+    DbOpsClient astraDbClient = new DbOpsClient(astraToken, options.getAstraDatabaseId());
     if (!astraDbClient.exist()) {
       throw new RuntimeException(
           "Astra Database does not exist, please check your Astra Token and Database ID");

v2/astradb-to-bigquery/src/test/java/com/google/cloud/teleport/v2/astradb/templates/AstraDbToBigQueryIT.java

@@ -19,8 +19,8 @@
 import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatPipeline;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.dtsx.astra.sdk.db.AstraDbClient;
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.AstraDBOpsClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.dtsx.astra.sdk.db.domain.Database;
 import com.dtsx.astra.sdk.db.domain.DatabaseCreationRequest;
 import com.dtsx.astra.sdk.db.domain.DatabaseStatusType;
@@ -78,7 +78,7 @@ public class AstraDbToBigQueryIT extends TemplateTestBase implements Serializabl
 
   private static final String ASTRA_TOKEN_COUNTS = "18";
 
-  private static DatabaseClient dbClient;
+  private static DbOpsClient dbClient;
 
   private BigQueryResourceManager bigQueryClient;
 
@@ -142,7 +142,7 @@ private static String test() {
 
   @SuppressWarnings("BusyWait")
   private void createOrResumeAstraDatabase() throws InterruptedException {
-    AstraDbClient databasesClient = new AstraDbClient(test());
+    AstraDBOpsClient databasesClient = new AstraDBOpsClient(test());
     if (databasesClient.findByName(ASTRA_DB).findAny().isEmpty()) {
       LOGGER.debug("Create a new Database {}", ASTRA_DB);
       databasesClient.create(

v2/pom.xml

@@ -42,6 +42,8 @@
         <base-container-image>gcr.io/dataflow-templates-base/java${java.version}-template-launcher-base</base-container-image>
         <base-container-image.version>latest</base-container-image.version>
         <excluded.spanner.tests>com.google.cloud.teleport.v2.spanner.IntegrationTest</excluded.spanner.tests>
+        <astra-sdk.version>2.1.4</astra-sdk.version>
+        <astra-io.version>4.18.1</astra-io.version>
 
         <licenseHeaderFile>../JAVA_LICENSE_HEADER</licenseHeaderFile>
     </properties>

v2/sourcedb-to-spanner/pom.xml

@@ -212,13 +212,13 @@
         <dependency>
             <groupId>com.datastax.astra</groupId>
             <artifactId>beam-sdks-java-io-astra</artifactId>
-            <version>4.18.1</version>
+            <version>${astra-io.version}</version>
         </dependency>
         <!-- Downloading Secure Bundle -->
         <dependency>
             <groupId>com.datastax.astra</groupId>
             <artifactId>astra-sdk-devops</artifactId>
-            <version>0.6.3</version>
+            <version>${astra-sdk.version}</version>
         </dependency>
 
         <!-- test dependencies for localCassandraIO end -->

v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/AstraDbDataSource.java

@@ -15,7 +15,7 @@
  */
 package com.google.cloud.teleport.v2.source.reader.io.cassandra.iowrapper;
 
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.google.auto.value.AutoValue;
 import com.google.auto.value.extension.memoized.Memoized;
 import com.google.cloud.teleport.v2.source.reader.auth.dbauth.GuardedStringValueProvider;
@@ -75,7 +75,7 @@ private byte[] downloadAstraSecureBundle() {
     /*
      * Accessing the devops Api to retrieve the secure bundle.
      */
-    DatabaseClient astraDbClient = new DatabaseClient(astraToken, databaseId());
+    DbOpsClient astraDbClient = new DbOpsClient(astraToken, databaseId());
     if (!astraDbClient.exist()) {
       throw new AstraDBNotFoundException(
           "Astra Database does not exist, please check your Astra Token and Database ID. Please ensure that the database is active.");

v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/AstraDbDataSourceTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.exception.AstraDBNotFoundException;
 import com.google.cloud.teleport.v2.utils.SecretManagerUtils;
 import org.junit.Test;
@@ -44,9 +44,9 @@ public void testAstraDbDataSourceBasic() {
     byte[] testSecureBundleWithRegion = "Secure-Bundle-With-Region".getBytes();
     byte[] testSecureBundleWithoutRegion = "Secure-Bundle-Default".getBytes();
 
-    try (MockedConstruction<DatabaseClient> mockedConstruction =
+    try (MockedConstruction<DbOpsClient> mockedConstruction =
         mockConstruction(
-            DatabaseClient.class,
+            DbOpsClient.class,
             (mock, context) -> {
               when(mock.exist()).thenReturn(true);
               when(mock.downloadSecureConnectBundle(testRegion))
@@ -86,9 +86,9 @@ public void testAstraDbDataSourceSecretManager() {
     byte[] testSecureBundleWithRegion = "Secure-Bundle-With-Region".getBytes();
     try (MockedStatic<SecretManagerUtils> mockedStatic = mockStatic(SecretManagerUtils.class)) {
       mockedStatic.when(() -> SecretManagerUtils.getSecret(testToken)).thenReturn(testToken);
-      try (MockedConstruction<DatabaseClient> mockedConstruction =
+      try (MockedConstruction<DbOpsClient> mockedConstruction =
           mockConstruction(
-              DatabaseClient.class,
+              DbOpsClient.class,
               (mock, context) -> {
                 when(mock.exist()).thenReturn(true);
                 when(mock.downloadSecureConnectBundle(testRegion))
@@ -123,9 +123,9 @@ public void testAstraDbDataSourceNonExistant() {
     byte[] testSecureBundleWithRegion = "Secure-Bundle-With-Region".getBytes();
     byte[] testSecureBundleWithoutRegion = "Secure-Bundle-Default".getBytes();
 
-    try (MockedConstruction<DatabaseClient> mockedConstruction =
+    try (MockedConstruction<DbOpsClient> mockedConstruction =
         mockConstruction(
-            DatabaseClient.class,
+            DbOpsClient.class,
             (mock, context) -> {
               when(mock.exist()).thenReturn(false);
               when(mock.downloadSecureConnectBundle(testRegion))

v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraConnectorTest.java

@@ -24,7 +24,7 @@
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.OptionsMap;
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.google.cloud.teleport.v2.source.reader.auth.dbauth.GuardedStringValueProvider;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.testutils.SharedEmbeddedCassandra;
@@ -109,9 +109,9 @@ public void testAstra() {
         ValueProvider.StaticValueProvider.of("testKeySpace");
     String testAstraDbRegion = "testRegion";
     String testAstraDBID = "testID";
-    try (MockedConstruction<DatabaseClient> mockedConstruction =
+    try (MockedConstruction<DbOpsClient> mockedConstruction =
         mockConstruction(
-            DatabaseClient.class,
+            DbOpsClient.class,
             (mock, context) -> {
               when(mock.exist()).thenReturn(true);
               when(mock.downloadSecureConnectBundle(testAstraDbRegion))

v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraTableReaderFactoryCassandraIoImplTest.java

@@ -38,7 +38,7 @@
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.config.OptionsMap;
 import com.datastax.oss.driver.api.core.config.TypedDriverOption;
-import com.dtsx.astra.sdk.db.DatabaseClient;
+import com.dtsx.astra.sdk.db.DbOpsClient;
 import com.google.cloud.teleport.v2.source.reader.auth.dbauth.GuardedStringValueProvider;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaDiscovery;
 import com.google.cloud.teleport.v2.source.reader.io.cassandra.schema.CassandraSchemaReference;
@@ -306,9 +306,9 @@ public void testCassandraTableReaderFactoryAstraBasic() throws RetriableSchemaDi
     SourceSchemaReference sourceSchemaReference =
         SourceSchemaReference.ofCassandra(
             CassandraSchemaReference.builder().setKeyspaceName(TEST_KEYSPACE).build());
-    try (MockedConstruction<DatabaseClient> mockedConstruction =
+    try (MockedConstruction<DbOpsClient> mockedConstruction =
         mockConstruction(
-            DatabaseClient.class,
+            DbOpsClient.class,
             (mock, context) -> {
               when(mock.exist()).thenReturn(true);
               when(mock.downloadSecureConnectBundle(testAstraDbRegion))