Skip to content

Remove hardcoding of private connectivity in tests #3668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sm745052 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove hardcoding of private connectivity in tests #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff7075
initial commit
sm745052 Apr 10, 2026
a31deb6
updated
sm745052 Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,4 +841,8 @@ private static void cleanUpTemplates(String metafileName) {
LOG.warn("Error during clean up staged template.", e);
}
}

protected String getPrivateConnectivity() {
return System.getProperty("privateConnectivity", "datastream-connect-2");
}
}
2 changes: 1 addition & 1 deletion ...bigquery/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToBigQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();

bigQueryResourceManager =
Expand Down
2 changes: 1 addition & 1 deletion ...o-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();

gcsResourceManager = setUpSpannerITGcsResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion .../cloud/teleport/v2/templates/DataStreamToSpannerWideRowForMax16KeyTablePerDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
spannerResourceManager = setUpSpannerResourceManager();
pubsubResourceManager = setUpPubSubResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion ...e/cloud/teleport/v2/templates/DataStreamToSpannerWideRowForMax9MibTablePerDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
spannerResourceManager = setUpSpannerResourceManager();
pubsubResourceManager = setUpPubSubResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion ...oogle/cloud/teleport/v2/templates/DataStreamToSpannerWideRowForMaxColumnsPerTablesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
spannerResourceManager = setUpSpannerResourceManager();
pubsubResourceManager = setUpPubSubResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/google/cloud/teleport/v2/templates/DataStreamToSpannerWideRowForMaxTableNameIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
spannerResourceManager = setUpSpannerResourceManager();
pubsubResourceManager = setUpPubSubResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion ...d/teleport/v2/templates/DataStreamToSpannerWideRowForMaxTableNameWithMaxColumnNameIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
spannerResourceManager = setUpSpannerResourceManager();
pubsubResourceManager = setUpPubSubResourceManager();
Expand Down
2 changes: 1 addition & 1 deletion ...va/com/google/cloud/teleport/v2/templates/DatastreamToSpannerReservedKeywordsMySqlIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");
}
Expand Down
2 changes: 1 addition & 1 deletion ...com/google/cloud/teleport/v2/templates/DatastreamToSpannerReservedKeywordsPostgresIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/cloud/teleport/v2/templates/MySQLDatastreamToPGDialectSpannerTableAndIndexLimitsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion .../google/cloud/teleport/v2/templates/MySQLDatastreamToSpannerDataTypesAndExpressionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion ...com/google/cloud/teleport/v2/templates/MySQLDatastreamToSpannerTableAndIndexLimitsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion ...ud/teleport/v2/templates/PostgreSQLDatastreamToPGDialectSpannerTableAndIndexLimitsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion ...java/com/google/cloud/teleport/v2/templates/PostgreSQLDatastreamToSpannerDataTypesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion ...oogle/cloud/teleport/v2/templates/PostgreSQLDatastreamToSpannerTableAndIndexLimitsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
LOG.info("Datastream resource manager created");

Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/com/google/cloud/teleport/v2/templates/endtoend/EndToEndTestingITBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public PipelineLauncher.LaunchInfo launchFwdDataflowJob(
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
Stream stream =
createDataStreamResources(
Expand Down
2 changes: 1 addition & 1 deletion ...google/cloud/teleport/v2/templates/failureinjectiontesting/DataStreamToSpannerFTBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public PipelineLauncher.LaunchInfo launchFwdDataflowJob(
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
Stream stream =
createDataStreamResources(
Expand Down
2 changes: 1 addition & 1 deletion ...ud/teleport/v2/templates/failureinjectiontesting/DataStreamToSpannerMySQLSrcPubsubFT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void pubsubDuplicateMessageDeliveryFITest() throws IOException, Interrupt
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();
Stream stream =
createDataStreamResources(
Expand Down
2 changes: 1 addition & 1 deletion ...m-to-sql/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToPostgresIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2") // Use the parameter
.setPrivateConnectivity(getPrivateConnectivity())
.build();

cloudSqlSourceResourceManager =
Expand Down
2 changes: 1 addition & 1 deletion ...stream-to-sql/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSQLIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void setUp() throws IOException {
datastreamResourceManager =
DatastreamResourceManager.builder(testName, PROJECT, REGION)
.setCredentialsProvider(credentialsProvider)
.setPrivateConnectivity("datastream-connect-2")
.setPrivateConnectivity(getPrivateConnectivity())
.build();

String password = System.getProperty("cloudOracleSysPassword");
Expand Down
Loading