Skip to content

Commit c4e3605

Browse files
msmygitmsmygit
committed
Reuse CONNECT_PASSWORD as opposed to new Astra token properties
1 parent ec65be7 commit c4e3605

File tree

4 files changed

+179
-14
lines changed

4 files changed

+179
-14
lines changed

‎src/main/java/com/datastax/cdm/data/AstraDevOpsClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@ public String downloadSecureBundle(PKFactory.Side side) throws IOException {
113113
}
114114

115115
/**
116-
* Gets the Astra token for the specified side.
116+
* Gets the Astra token for the specified side. Uses the database password as the token for Astra.
117117
*
118118
* @param side
119119
* The side (ORIGIN or TARGET)
120120
*
121121
* @return The Astra token
122122
*/
123123
private String getAstraToken(PKFactory.Side side) {
124-
String property = PKFactory.Side.ORIGIN.equals(side) ? KnownProperties.ORIGIN_ASTRA_TOKEN
125-
: KnownProperties.TARGET_ASTRA_TOKEN;
124+
String property = PKFactory.Side.ORIGIN.equals(side) ? KnownProperties.CONNECT_ORIGIN_PASSWORD
125+
: KnownProperties.CONNECT_TARGET_PASSWORD;
126126

127127
return propertyHelper.getAsString(property);
128128
}

‎src/main/java/com/datastax/cdm/properties/KnownProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public enum PropertyType {
5151
// ==========================================================================
5252
// Astra DevOps API Parameters
5353
// ==========================================================================
54+
// Note: CONNECT_ORIGIN_PASSWORD and CONNECT_TARGET_PASSWORD properties are used for Astra tokens
5455
public static final String ORIGIN_ASTRA_TOKEN = "spark.cdm.connect.origin.astra.token";
5556
public static final String ORIGIN_ASTRA_DATABASE_ID = "spark.cdm.connect.origin.astra.database.id";
5657
public static final String ORIGIN_ASTRA_AUTO_DOWNLOAD_SCB = "spark.cdm.connect.origin.astra.auto.download.scb";

‎src/resources/cdm-detailed.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,23 @@ spark.cdm.connect.target.password cassandra
6565
#
6666
# spark.cdm.connect.origin.astra
6767
# spark.cdm.connect.target.astra
68-
# .token : The Astra DevOps API token. Required if auto-download is enabled.
6968
# .database.id : The Astra Database ID. Required if auto-download is enabled.
7069
# .auto.download.scb : Default is false. Set to true to enable auto-download of the SCB.
7170
# .scb.type : Default is 'default'. Can be 'default', 'region', or 'custom'.
7271
# .scb.region : The region name for regional secure bundles. Required when scb.type is 'region'.
7372
# .scb.custom.domain : The custom domain for custom secure bundles. Required when scb.type is 'custom'.
73+
#
74+
# Note: CONNECT_ORIGIN_PASSWORD and CONNECT_TARGET_PASSWORD properties are used for Astra tokens
7475
#-----------------------------------------------------------------------------------------------------------
7576

7677
# Origin Astra DevOps API configuration
77-
#spark.cdm.connect.origin.astra.token your-astra-devops-api-token
7878
#spark.cdm.connect.origin.astra.database.id your-astra-database-id
7979
#spark.cdm.connect.origin.astra.auto.download.scb false
8080
#spark.cdm.connect.origin.astra.scb.type default
8181
#spark.cdm.connect.origin.astra.scb.region us-east-1
8282
#spark.cdm.connect.origin.astra.scb.custom.domain your-custom-domain.example.com
8383

8484
# Target Astra DevOps API configuration
85-
#spark.cdm.connect.target.astra.token your-astra-devops-api-token
8685
#spark.cdm.connect.target.astra.database.id your-astra-database-id
8786
#spark.cdm.connect.target.astra.auto.download.scb false
8887
#spark.cdm.connect.target.astra.scb.type default

‎src/test/java/com/datastax/cdm/data/AstraDevOpsClientTest.java

Lines changed: 173 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,48 +71,48 @@ void setUp() throws Exception {
7171
@Test
7272
void testDownloadSecureBundleWithNullToken() throws IOException {
7373
// Setup
74-
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN)).thenReturn(null);
74+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn(null);
7575

7676
// Test
7777
String result = client.downloadSecureBundle(PKFactory.Side.ORIGIN);
7878

7979
// Verify
8080
assertNull(result);
81-
verify(propertyHelper).getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN);
81+
verify(propertyHelper).getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD);
8282
}
8383

8484
@Test
8585
void testDownloadSecureBundleWithEmptyToken() throws IOException {
8686
// Setup
87-
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN)).thenReturn("");
87+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("");
8888

8989
// Test
9090
String result = client.downloadSecureBundle(PKFactory.Side.ORIGIN);
9191

9292
// Verify
9393
assertNull(result);
94-
verify(propertyHelper).getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN);
94+
verify(propertyHelper).getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD);
9595
}
9696

9797
@Test
9898
void testDownloadSecureBundleWithNullDatabaseId() throws IOException {
9999
// Setup
100-
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN)).thenReturn("test-token");
100+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("test-token");
101101
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_DATABASE_ID)).thenReturn(null);
102102

103103
// Test
104104
String result = client.downloadSecureBundle(PKFactory.Side.ORIGIN);
105105

106106
// Verify
107107
assertNull(result);
108-
verify(propertyHelper).getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN);
108+
verify(propertyHelper).getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD);
109109
verify(propertyHelper).getAsString(KnownProperties.ORIGIN_ASTRA_DATABASE_ID);
110110
}
111111

112112
@Test
113113
void testGetAstraToken() throws Exception {
114114
// Setup
115-
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN)).thenReturn("test-token");
115+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("test-token");
116116

117117
// Use reflection to access the private method
118118
Method getAstraTokenMethod = AstraDevOpsClient.class.getDeclaredMethod("getAstraToken", PKFactory.Side.class);
@@ -492,7 +492,7 @@ void testDownloadSecureBundleSuccess() throws Exception {
492492
doReturn(httpResponseStream).when(httpClient).send(any(), eq(HttpResponse.BodyHandlers.ofInputStream()));
493493

494494
// Mock the property helper
495-
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_TOKEN)).thenReturn("test-token");
495+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("test-token");
496496
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_DATABASE_ID)).thenReturn("test-db-id");
497497
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_SCB_TYPE)).thenReturn("default");
498498

@@ -503,4 +503,169 @@ void testDownloadSecureBundleSuccess() throws Exception {
503503
assertNotNull(filePath);
504504
assertTrue(filePath.contains("origin-secure-bundle.zip"));
505505
}
506+
507+
@Test
508+
void testExtractDownloadUrlMalformedJson() throws Exception {
509+
// We'll examine the AstraDevOpsClient class implementation directly by looking at the code
510+
// Skipping this test as we've already covered JSON parsing errors in other tests
511+
// The JsonParseException is properly caught in the implementation
512+
}
513+
514+
@Test
515+
void testDownloadBundleFileWithIOException() throws Exception {
516+
// Mock the HTTP client to throw IOException when sending the request
517+
when(httpClient.send(any(), eq(HttpResponse.BodyHandlers.ofInputStream())))
518+
.thenThrow(new IOException("Network error"));
519+
520+
// Use reflection to access the private method
521+
Method downloadBundleFileMethod = AstraDevOpsClient.class.getDeclaredMethod(
522+
"downloadBundleFile", String.class, PKFactory.Side.class);
523+
downloadBundleFileMethod.setAccessible(true);
524+
525+
try {
526+
// Test - should throw an IOException
527+
downloadBundleFileMethod.invoke(client, "https://example.com/bundle.zip", PKFactory.Side.ORIGIN);
528+
fail("Expected an exception to be thrown");
529+
} catch (java.lang.reflect.InvocationTargetException e) {
530+
// Extract the actual exception that was wrapped
531+
assertTrue(e.getCause() instanceof IOException);
532+
assertEquals("Network error", e.getCause().getMessage());
533+
}
534+
}
535+
536+
@Test
537+
void testDownloadSecureBundleWithEmptyJsonResponse() throws Exception {
538+
// Setup
539+
when(httpResponse.statusCode()).thenReturn(200);
540+
when(httpResponse.body()).thenReturn("{}");
541+
542+
// Configure the HTTP client to return our mocked response
543+
when(httpClient.send(any(), eq(HttpResponse.BodyHandlers.ofString()))).thenReturn(httpResponse);
544+
545+
// Mock the property helper
546+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("test-token");
547+
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_DATABASE_ID)).thenReturn("test-db-id");
548+
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_SCB_TYPE)).thenReturn("default");
549+
550+
// Test
551+
String result = client.downloadSecureBundle(PKFactory.Side.ORIGIN);
552+
553+
// Verify
554+
assertNull(result);
555+
}
556+
557+
@Test
558+
void testDownloadSecureBundleWithRegionalSCB() throws Exception {
559+
// Setup - mock all the components for a successful download with regional SCB
560+
561+
// Step 1: Mock the API response for fetching the SCB URL with regional data
562+
String jsonResponse = "{ \"downloadURLs\": ["
563+
+ "{ \"region\": \"us-east-1\", \"downloadURL\": \"https://us-east-1.example.com/bundle.zip\" },"
564+
+ "{ \"region\": \"us-west-2\", \"downloadURL\": \"https://us-west-2.example.com/bundle.zip\" },"
565+
+ "{ \"region\": \"eu-central-1\", \"downloadURL\": \"https://eu-central-1.example.com/bundle.zip\" }"
566+
+ "]}";
567+
568+
when(httpResponse.statusCode()).thenReturn(200);
569+
when(httpResponse.body()).thenReturn(jsonResponse);
570+
571+
// Step 2: Mock the binary download
572+
byte[] mockData = new byte[100]; // Mock some binary data
573+
ByteArrayInputStream inputStream = new ByteArrayInputStream(mockData);
574+
575+
// Mock the HTTP response
576+
when(httpResponseStream.statusCode()).thenReturn(200);
577+
when(httpResponseStream.body()).thenReturn(inputStream);
578+
579+
// Configure the HTTP client to return responses based on different handler types
580+
doReturn(httpResponse).when(httpClient).send(any(), eq(HttpResponse.BodyHandlers.ofString()));
581+
doReturn(httpResponseStream).when(httpClient).send(any(), eq(HttpResponse.BodyHandlers.ofInputStream()));
582+
583+
// Mock the property helper
584+
when(propertyHelper.getAsString(KnownProperties.CONNECT_ORIGIN_PASSWORD)).thenReturn("test-token");
585+
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_DATABASE_ID)).thenReturn("test-db-id");
586+
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_SCB_TYPE)).thenReturn("region");
587+
when(propertyHelper.getAsString(KnownProperties.ORIGIN_ASTRA_SCB_REGION)).thenReturn("us-west-2");
588+
589+
// Test
590+
String filePath = client.downloadSecureBundle(PKFactory.Side.ORIGIN);
591+
592+
// Verify
593+
assertNotNull(filePath);
594+
assertTrue(filePath.contains("origin-secure-bundle.zip"));
595+
596+
// Verify that the URL request included all=true parameter
597+
ArgumentCaptor<HttpRequest> requestCaptor = ArgumentCaptor.forClass(HttpRequest.class);
598+
verify(httpClient, atLeastOnce()).send(requestCaptor.capture(), eq(HttpResponse.BodyHandlers.ofString()));
599+
600+
boolean foundAllParam = false;
601+
for (HttpRequest capturedRequest : requestCaptor.getAllValues()) {
602+
if (capturedRequest.uri().toString().contains("all=true")) {
603+
foundAllParam = true;
604+
break;
605+
}
606+
}
607+
assertTrue(foundAllParam, "The request URL should include all=true parameter for regional SCB");
608+
}
609+
610+
@Test
611+
void testDownloadSecureBundleWithCustomDomainSCB() throws Exception {
612+
// Setup - mock all the components for a successful download with custom domain SCB
613+
614+
// Step 1: Mock the API response for fetching the SCB URL with custom domain data
615+
String jsonResponse = "{ \"customDomainBundles\": ["
616+
+ "{ \"domain\": \"db1.example.com\", \"downloadURL\": \"https://db1.example.com/bundle.zip\" },"
617+
+ "{ \"domain\": \"my-custom-domain.example.com\", \"downloadURL\": \"https://my-custom-domain.example.com/bundle.zip\" }"
618+
+ "]}";
619+
620+
when(httpResponse.statusCode()).thenReturn(200);
621+
when(httpResponse.body()).thenReturn(jsonResponse);
622+
623+
// Step 2: Mock the binary download
624+
byte[] mockData = new byte[100]; // Mock some binary data
625+
ByteArrayInputStream inputStream = new ByteArrayInputStream(mockData);
626+
627+
// Mock the HTTP response
628+
when(httpResponseStream.statusCode()).thenReturn(200);
629+
when(httpResponseStream.body()).thenReturn(inputStream);
630+
631+
// Configure the HTTP client to return responses based on different handler types
632+
doReturn(httpResponse).when(httpClient).send(any(), eq(HttpResponse.BodyHandlers.ofString()));
633+
doReturn(httpResponseStream).when(httpClient).send(any(), eq(HttpResponse.BodyHandlers.ofInputStream()));
634+
635+
// Mock the property helper
636+
when(propertyHelper.getAsString(KnownProperties.CONNECT_TARGET_PASSWORD)).thenReturn("test-token");
637+
when(propertyHelper.getAsString(KnownProperties.TARGET_ASTRA_DATABASE_ID)).thenReturn("test-db-id");
638+
when(propertyHelper.getAsString(KnownProperties.TARGET_ASTRA_SCB_TYPE)).thenReturn("custom");
639+
when(propertyHelper.getAsString(KnownProperties.TARGET_ASTRA_SCB_CUSTOM_DOMAIN))
640+
.thenReturn("my-custom-domain.example.com");
641+
642+
// Test
643+
String filePath = client.downloadSecureBundle(PKFactory.Side.TARGET);
644+
645+
// Verify
646+
assertNotNull(filePath);
647+
assertTrue(filePath.contains("target-secure-bundle.zip"));
648+
}
649+
650+
@Test
651+
void testDownloadBundleFileInterrupted() throws Exception {
652+
// Mock the HTTP client to throw InterruptedException when sending the request
653+
when(httpClient.send(any(), eq(HttpResponse.BodyHandlers.ofInputStream())))
654+
.thenThrow(new InterruptedException("Download interrupted"));
655+
656+
// Use reflection to access the private method
657+
Method downloadBundleFileMethod = AstraDevOpsClient.class.getDeclaredMethod(
658+
"downloadBundleFile", String.class, PKFactory.Side.class);
659+
downloadBundleFileMethod.setAccessible(true);
660+
661+
try {
662+
// Test - should throw an InterruptedException wrapped in an InvocationTargetException
663+
downloadBundleFileMethod.invoke(client, "https://example.com/bundle.zip", PKFactory.Side.ORIGIN);
664+
fail("Expected an exception to be thrown");
665+
} catch (java.lang.reflect.InvocationTargetException e) {
666+
// Extract the actual exception that was wrapped
667+
assertTrue(e.getCause() instanceof InterruptedException);
668+
assertEquals("Download interrupted", e.getCause().getMessage());
669+
}
670+
}
506671
}

0 commit comments

Comments
 (0)