diff --git a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/DeleteConnection.java b/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/DeleteConnection.java deleted file mode 100644 index 0461a771acf..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/DeleteConnection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -// [START bigqueryconnection_delete_connection] -import com.google.cloud.bigquery.connection.v1.ConnectionName; -import com.google.cloud.bigquery.connection.v1.DeleteConnectionRequest; -import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; -import java.io.IOException; - -// Sample to delete a connection -public class DeleteConnection { - - public static void main(String[] args) throws IOException { - // TODO(developer): Replace these variables before running the sample. - String projectId = "MY_PROJECT_ID"; - String location = "MY_LOCATION"; - String connectionName = "MY_CONNECTION_NAME"; - deleteConnection(projectId, location, connectionName); - } - - static void deleteConnection(String projectId, String location, String connectionName) - throws IOException { - try (ConnectionServiceClient client = ConnectionServiceClient.create()) { - ConnectionName name = ConnectionName.of(projectId, location, connectionName); - DeleteConnectionRequest request = - DeleteConnectionRequest.newBuilder().setName(name.toString()).build(); - client.deleteConnection(request); - System.out.println("Connection deleted successfully"); - } - } -} -// [END bigqueryconnection_delete_connection] diff --git a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/GetConnection.java b/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/GetConnection.java deleted file mode 100644 index ceb9eba63ad..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/GetConnection.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -// [START bigqueryconnection_get_connection] -import com.google.cloud.bigquery.connection.v1.Connection; -import com.google.cloud.bigquery.connection.v1.ConnectionName; -import com.google.cloud.bigquery.connection.v1.GetConnectionRequest; -import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; -import java.io.IOException; - -// Sample to get connection -public class GetConnection { - - public static void main(String[] args) throws IOException { - // TODO(developer): Replace these variables before running the sample. - String projectId = "MY_PROJECT_ID"; - String location = "MY_LOCATION"; - String connectionId = "MY_CONNECTION_ID"; - getConnection(projectId, location, connectionId); - } - - static void getConnection(String projectId, String location, String connectionId) - throws IOException { - try (ConnectionServiceClient client = ConnectionServiceClient.create()) { - ConnectionName name = ConnectionName.of(projectId, location, connectionId); - GetConnectionRequest request = - GetConnectionRequest.newBuilder().setName(name.toString()).build(); - Connection response = client.getConnection(request); - System.out.println("Connection info retrieved successfully :" + response.getName()); - } - } -} -// [END bigqueryconnection_get_connection] diff --git a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/ListConnections.java b/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/ListConnections.java deleted file mode 100644 index 1fbfad530b8..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/ListConnections.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -// [START bigqueryconnection_list_connections] -import com.google.cloud.bigquery.connection.v1.ListConnectionsRequest; -import com.google.cloud.bigquery.connection.v1.LocationName; -import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; -import java.io.IOException; - -// Sample to get list of connections -public class ListConnections { - - public static void main(String[] args) throws IOException { - // TODO(developer): Replace these variables before running the sample. - String projectId = "MY_PROJECT_ID"; - String location = "MY_LOCATION"; - listConnections(projectId, location); - } - - static void listConnections(String projectId, String location) throws IOException { - try (ConnectionServiceClient client = ConnectionServiceClient.create()) { - LocationName parent = LocationName.of(projectId, location); - int pageSize = 10; - ListConnectionsRequest request = - ListConnectionsRequest.newBuilder() - .setParent(parent.toString()) - .setPageSize(pageSize) - .build(); - client - .listConnections(request) - .iterateAll() - .forEach(con -> System.out.println("Connection Id :" + con.getName())); - } - } -} -// [END bigqueryconnection_list_connections] diff --git a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/UpdateConnection.java b/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/UpdateConnection.java deleted file mode 100644 index 2f4c5d5771b..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/main/java/com/example/bigqueryconnection/UpdateConnection.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -// [START bigqueryconnection_update_connection] -import com.google.cloud.bigquery.connection.v1.Connection; -import com.google.cloud.bigquery.connection.v1.ConnectionName; -import com.google.cloud.bigquery.connection.v1.UpdateConnectionRequest; -import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; -import com.google.protobuf.FieldMask; -import com.google.protobuf.util.FieldMaskUtil; -import java.io.IOException; - -// Sample to update connection -public class UpdateConnection { - - public static void main(String[] args) throws IOException { - // TODO(developer): Replace these variables before running the sample. - String projectId = "MY_PROJECT_ID"; - String location = "MY_LOCATION"; - String connectionId = "MY_CONNECTION_ID"; - String description = "MY_DESCRIPTION"; - Connection connection = Connection.newBuilder().setDescription(description).build(); - updateConnection(projectId, location, connectionId, connection); - } - - static void updateConnection( - String projectId, String location, String connectionId, Connection connection) - throws IOException { - try (ConnectionServiceClient client = ConnectionServiceClient.create()) { - ConnectionName name = ConnectionName.of(projectId, location, connectionId); - FieldMask updateMask = FieldMaskUtil.fromString("description"); - UpdateConnectionRequest request = - UpdateConnectionRequest.newBuilder() - .setName(name.toString()) - .setConnection(connection) - .setUpdateMask(updateMask) - .build(); - Connection response = client.updateConnection(request); - System.out.println("Connection updated successfully :" + response.getDescription()); - } - } -} -// [END bigqueryconnection_update_connection] diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java index f4e1125e269..1d9b357ee6d 100644 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java +++ b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateAwsConnectionIT.java @@ -22,6 +22,9 @@ import com.google.cloud.bigquery.connection.v1.AwsAccessRole; import com.google.cloud.bigquery.connection.v1.AwsProperties; import com.google.cloud.bigquery.connection.v1.Connection; +import com.google.cloud.bigquery.connection.v1.ConnectionName; +import com.google.cloud.bigquery.connection.v1.DeleteConnectionRequest; +import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -73,11 +76,18 @@ public void setUp() { @After public void tearDown() throws IOException { // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); + try (ConnectionServiceClient client = ConnectionServiceClient.create()) { + ConnectionName name = ConnectionName.of(PROJECT_ID, LOCATION, connectionId); + DeleteConnectionRequest request = + DeleteConnectionRequest.newBuilder().setName(name.toString()).build(); + client.deleteConnection(request); + System.out.println("Connection deleted successfully"); + } finally { + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); + } } @Test diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateConnectionIT.java index 0012d2c7910..8b0674f207e 100644 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateConnectionIT.java +++ b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/CreateConnectionIT.java @@ -22,6 +22,9 @@ import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; import com.google.cloud.bigquery.connection.v1.Connection; +import com.google.cloud.bigquery.connection.v1.ConnectionName; +import com.google.cloud.bigquery.connection.v1.DeleteConnectionRequest; +import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -78,11 +81,18 @@ public void setUp() { @After public void tearDown() throws IOException { // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); + try (ConnectionServiceClient client = ConnectionServiceClient.create()) { + ConnectionName name = ConnectionName.of(PROJECT_ID, LOCATION, connectionId); + DeleteConnectionRequest request = + DeleteConnectionRequest.newBuilder().setName(name.toString()).build(); + client.deleteConnection(request); + System.out.println("Connection deleted successfully"); + } finally { + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); + } } @Test diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/DeleteConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/DeleteConnectionIT.java deleted file mode 100644 index 6ea2a8f721a..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/DeleteConnectionIT.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; -import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; -import com.google.cloud.bigquery.connection.v1.Connection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class DeleteConnectionIT { - - private static final Logger LOG = Logger.getLogger(DeleteConnectionIT.class.getName()); - private static final String LOCATION = "US"; - private static final String REGION = "us-central1"; - private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); - private static final String MY_SQL_DATABASE = requireEnvVar("MY_SQL_DATABASE"); - private static final String MY_SQL_INSTANCE = requireEnvVar("MY_SQL_INSTANCE"); - private static final String DB_USER = requireEnvVar("DB_USER"); - private static final String DB_PWD = requireEnvVar("DB_PWD"); - - private String connectionId; - private ByteArrayOutputStream bout; - private PrintStream out; - private PrintStream originalPrintStream; - - private static String requireEnvVar(String varName) { - String value = System.getenv(varName); - assertNotNull( - "Environment variable " + varName + " is required to perform these tests.", - System.getenv(varName)); - return value; - } - - @BeforeClass - public static void checkRequirements() { - requireEnvVar("GOOGLE_CLOUD_PROJECT"); - requireEnvVar("MY_SQL_DATABASE"); - requireEnvVar("MY_SQL_INSTANCE"); - requireEnvVar("DB_USER"); - requireEnvVar("DB_PWD"); - } - - @Before - public void setUp() throws IOException { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - originalPrintStream = System.out; - System.setOut(out); - // create a temporary connection - connectionId = "DELETE_CONNECTION_TEST_" + UUID.randomUUID().toString().substring(0, 8); - String instanceId = String.format("%s:%s:%s", PROJECT_ID, REGION, MY_SQL_INSTANCE); - CloudSqlCredential cloudSqlCredential = - CloudSqlCredential.newBuilder().setUsername(DB_USER).setPassword(DB_PWD).build(); - CloudSqlProperties cloudSqlProperties = - CloudSqlProperties.newBuilder() - .setType(CloudSqlProperties.DatabaseType.MYSQL) - .setDatabase(MY_SQL_DATABASE) - .setInstanceId(instanceId) - .setCredential(cloudSqlCredential) - .build(); - Connection connection = Connection.newBuilder().setCloudSql(cloudSqlProperties).build(); - CreateConnection.createConnection(PROJECT_ID, LOCATION, connectionId, connection); - } - - @After - public void tearDown() { - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); - } - - @Test - public void testDeleteConnection() throws IOException { - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - assertThat(bout.toString()).contains("Connection deleted successfully"); - } -} diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/GetConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/GetConnectionIT.java deleted file mode 100644 index 49dcf6386a8..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/GetConnectionIT.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; -import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; -import com.google.cloud.bigquery.connection.v1.Connection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class GetConnectionIT { - - private static final Logger LOG = Logger.getLogger(GetConnectionIT.class.getName()); - private static final String LOCATION = "US"; - private static final String REGION = "us-central1"; - private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); - private static final String MY_SQL_DATABASE = requireEnvVar("MY_SQL_DATABASE"); - private static final String MY_SQL_INSTANCE = requireEnvVar("MY_SQL_INSTANCE"); - private static final String DB_USER = requireEnvVar("DB_USER"); - private static final String DB_PWD = requireEnvVar("DB_PWD"); - - private String connectionId; - private ByteArrayOutputStream bout; - private PrintStream out; - private PrintStream originalPrintStream; - - private static String requireEnvVar(String varName) { - String value = System.getenv(varName); - assertNotNull( - "Environment variable " + varName + " is required to perform these tests.", - System.getenv(varName)); - return value; - } - - @BeforeClass - public static void checkRequirements() { - requireEnvVar("GOOGLE_CLOUD_PROJECT"); - requireEnvVar("MY_SQL_DATABASE"); - requireEnvVar("MY_SQL_INSTANCE"); - requireEnvVar("DB_USER"); - requireEnvVar("DB_PWD"); - } - - @Before - public void setUp() throws IOException { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - originalPrintStream = System.out; - System.setOut(out); - // create a temporary connection - connectionId = "GET_CONNECTION_TEST_" + UUID.randomUUID().toString().substring(0, 8); - String instanceId = String.format("%s:%s:%s", PROJECT_ID, REGION, MY_SQL_INSTANCE); - CloudSqlCredential cloudSqlCredential = - CloudSqlCredential.newBuilder().setUsername(DB_USER).setPassword(DB_PWD).build(); - CloudSqlProperties cloudSqlProperties = - CloudSqlProperties.newBuilder() - .setType(CloudSqlProperties.DatabaseType.MYSQL) - .setDatabase(MY_SQL_DATABASE) - .setInstanceId(instanceId) - .setCredential(cloudSqlCredential) - .build(); - Connection connection = Connection.newBuilder().setCloudSql(cloudSqlProperties).build(); - CreateConnection.createConnection(PROJECT_ID, LOCATION, connectionId, connection); - } - - @After - public void tearDown() throws IOException { - // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); - } - - @Test - public void testGetConnection() throws IOException { - GetConnection.getConnection(PROJECT_ID, LOCATION, connectionId); - assertThat(bout.toString()).contains("Connection info retrieved successfully :"); - } -} diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ListConnectionsIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ListConnectionsIT.java deleted file mode 100644 index 47001b94558..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ListConnectionsIT.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertNotNull; - -import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; -import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; -import com.google.cloud.bigquery.connection.v1.Connection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ListConnectionsIT { - - private static final Logger LOG = Logger.getLogger(ListConnectionsIT.class.getName()); - private static final String LOCATION = "US"; - private static final String REGION = "us-central1"; - private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); - private static final String MY_SQL_DATABASE = requireEnvVar("MY_SQL_DATABASE"); - private static final String MY_SQL_INSTANCE = requireEnvVar("MY_SQL_INSTANCE"); - private static final String DB_USER = requireEnvVar("DB_USER"); - private static final String DB_PWD = requireEnvVar("DB_PWD"); - - private String connectionId; - private ByteArrayOutputStream bout; - private PrintStream out; - private PrintStream originalPrintStream; - - private static String requireEnvVar(String varName) { - String value = System.getenv(varName); - assertNotNull( - "Environment variable " + varName + " is required to perform these tests.", - System.getenv(varName)); - return value; - } - - @BeforeClass - public static void checkRequirements() { - requireEnvVar("GOOGLE_CLOUD_PROJECT"); - requireEnvVar("MY_SQL_DATABASE"); - requireEnvVar("MY_SQL_INSTANCE"); - requireEnvVar("DB_USER"); - requireEnvVar("DB_PWD"); - } - - @Before - public void setUp() throws IOException { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - originalPrintStream = System.out; - System.setOut(out); - // create a temporary connection - connectionId = "LIST_CONNECTIONS_TEST_" + UUID.randomUUID().toString().substring(0, 8); - String instanceId = String.format("%s:%s:%s", PROJECT_ID, REGION, MY_SQL_INSTANCE); - CloudSqlCredential cloudSqlCredential = - CloudSqlCredential.newBuilder().setUsername(DB_USER).setPassword(DB_PWD).build(); - CloudSqlProperties cloudSqlProperties = - CloudSqlProperties.newBuilder() - .setType(CloudSqlProperties.DatabaseType.MYSQL) - .setDatabase(MY_SQL_DATABASE) - .setInstanceId(instanceId) - .setCredential(cloudSqlCredential) - .build(); - Connection connection = Connection.newBuilder().setCloudSql(cloudSqlProperties).build(); - CreateConnection.createConnection(PROJECT_ID, LOCATION, connectionId, connection); - } - - @After - public void tearDown() throws IOException { - // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); - } - - @Test - public void testListConnections() throws IOException { - ListConnections.listConnections(PROJECT_ID, LOCATION); - assertThat(bout.toString()).contains("Connection Id :"); - } -} diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ShareConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ShareConnectionIT.java index 8daf09bb2de..2a47ef806e0 100644 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ShareConnectionIT.java +++ b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/ShareConnectionIT.java @@ -22,6 +22,9 @@ import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; import com.google.cloud.bigquery.connection.v1.Connection; +import com.google.cloud.bigquery.connection.v1.ConnectionName; +import com.google.cloud.bigquery.connection.v1.DeleteConnectionRequest; +import com.google.cloud.bigqueryconnection.v1.ConnectionServiceClient; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -91,11 +94,18 @@ public void setUp() throws IOException { @After public void tearDown() throws IOException { // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); + try (ConnectionServiceClient client = ConnectionServiceClient.create()) { + ConnectionName name = ConnectionName.of(PROJECT_ID, LOCATION, connectionId); + DeleteConnectionRequest request = + DeleteConnectionRequest.newBuilder().setName(name.toString()).build(); + client.deleteConnection(request); + System.out.println("Connection deleted successfully"); + } finally { + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); + } } @Test diff --git a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/UpdateConnectionIT.java b/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/UpdateConnectionIT.java deleted file mode 100644 index ff3dc50dd2b..00000000000 --- a/bigquery/bigqueryconnection/snippets/src/test/java/com/example/bigqueryconnection/UpdateConnectionIT.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2020 Google LLC - * - * 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.example.bigqueryconnection; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import com.google.cloud.bigquery.connection.v1.CloudSqlCredential; -import com.google.cloud.bigquery.connection.v1.CloudSqlProperties; -import com.google.cloud.bigquery.connection.v1.Connection; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class UpdateConnectionIT { - - private static final Logger LOG = Logger.getLogger(UpdateConnectionIT.class.getName()); - private static final String LOCATION = "US"; - private static final String REGION = "us-central1"; - private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); - private static final String MY_SQL_DATABASE = requireEnvVar("MY_SQL_DATABASE"); - private static final String MY_SQL_INSTANCE = requireEnvVar("MY_SQL_INSTANCE"); - private static final String DB_USER = requireEnvVar("DB_USER"); - private static final String DB_PWD = requireEnvVar("DB_PWD"); - - private String connectionId; - private ByteArrayOutputStream bout; - private PrintStream out; - private PrintStream originalPrintStream; - - private static String requireEnvVar(String varName) { - String value = System.getenv(varName); - assertNotNull( - "Environment variable " + varName + " is required to perform these tests.", - System.getenv(varName)); - return value; - } - - @BeforeClass - public static void checkRequirements() { - requireEnvVar("GOOGLE_CLOUD_PROJECT"); - requireEnvVar("MY_SQL_DATABASE"); - requireEnvVar("MY_SQL_INSTANCE"); - requireEnvVar("DB_USER"); - requireEnvVar("DB_PWD"); - } - - @Before - public void setUp() throws IOException { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - originalPrintStream = System.out; - System.setOut(out); - // create a temporary connection - connectionId = "UPDATE_CONNECTION_TEST_" + UUID.randomUUID().toString().substring(0, 8); - String instanceId = String.format("%s:%s:%s", PROJECT_ID, REGION, MY_SQL_INSTANCE); - CloudSqlCredential cloudSqlCredential = - CloudSqlCredential.newBuilder().setUsername(DB_USER).setPassword(DB_PWD).build(); - CloudSqlProperties cloudSqlProperties = - CloudSqlProperties.newBuilder() - .setType(CloudSqlProperties.DatabaseType.MYSQL) - .setDatabase(MY_SQL_DATABASE) - .setInstanceId(instanceId) - .setCredential(cloudSqlCredential) - .build(); - Connection connection = Connection.newBuilder().setCloudSql(cloudSqlProperties).build(); - CreateConnection.createConnection(PROJECT_ID, LOCATION, connectionId, connection); - } - - @After - public void tearDown() throws IOException { - // Clean up - DeleteConnection.deleteConnection(PROJECT_ID, LOCATION, connectionId); - // restores print statements in the original method - System.out.flush(); - System.setOut(originalPrintStream); - LOG.log(Level.INFO, bout.toString()); - } - - @Test - public void testUpdateConnection() throws IOException { - String description = "MY_DESCRIPTION"; - Connection connection = Connection.newBuilder().setDescription(description).build(); - UpdateConnection.updateConnection(PROJECT_ID, LOCATION, connectionId, connection); - assertThat(bout.toString()).contains("Connection updated successfully :"); - } -}