From 101bc37c6de16f306a8b1843238bc9ffa2cdcfa1 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 16 Jul 2018 12:08:31 -0400 Subject: [PATCH 1/3] bigtable: fix hardcoded admin test integration target --- .../admin/v2/it/TableAdminClientIT.java | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java index 7cd8bff9854e..24198a342e1f 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java @@ -20,10 +20,16 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + +import com.google.api.client.util.Preconditions; +import com.google.bigtable.admin.v2.Instance; import java.io.IOException; import java.util.List; import org.junit.AfterClass; +import org.junit.AssumptionViolatedException; +import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.threeten.bp.Duration; import com.google.bigtable.admin.v2.InstanceName; @@ -41,20 +47,42 @@ import com.google.protobuf.ByteString; public class TableAdminClientIT { + // TODO(igorbernstein2): remove these properties once admin is split from data client + private static final String ENV_PROPERTY = "bigtable.env"; + private static final String TABLE_PROPERTY_NAME = "bigtable.table"; + static TableAdminClient tableAdmin; @BeforeClass public static void createClient() throws IOException { - tableAdmin = TableAdminClient.create(InstanceName.of("sduskis-hello-shakespear", "beam-test")); + if (!"prod".equals(System.getProperty(ENV_PROPERTY))) { + tableAdmin = null; + return; + } + + TableName tableName = TableName.parse(System.getProperty(TABLE_PROPERTY_NAME)); + InstanceName instanceName = InstanceName.of(tableName.getProject(), tableName.getInstance()); + + tableAdmin = TableAdminClient.create(instanceName); } @AfterClass - public static void closeClient() throws Exception { - tableAdmin.close(); + public static void closeClient() { + if (tableAdmin != null) { + tableAdmin.close(); + } + } + + @Before + public void setup() { + // TODO(igorbernstein2): remove this check once admin is split + if (tableAdmin == null) { + throw new AssumptionViolatedException("Tests can only run against prod environment"); + } } @Test - public void createTable() throws Exception { + public void createTable() { String tableId = "adminCreateTest"; CreateTable createTableReq = TableAdminRequests.createTable(tableId) @@ -83,7 +111,7 @@ public void createTable() throws Exception { public void modifyFamilies() { String tableId = "adminModifyFamTest"; ModifyFamilies modifyFamiliesReq = TableAdminRequests.modifyFamilies(tableId); - Duration.ofSeconds(1000); + modifyFamiliesReq .addFamily("mf1") .addFamily("mf2", GCRULES.maxAge(Duration.ofSeconds(1000, 20000))) From 7f5d2128dd0c2bc7d5491f06ad6733c2e3f903bc Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 16 Jul 2018 12:15:15 -0400 Subject: [PATCH 2/3] remove unused imports --- .../admin/v2/it/TableAdminClientIT.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java index 24198a342e1f..84b4491b0839 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java @@ -21,17 +21,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.google.api.client.util.Preconditions; -import com.google.bigtable.admin.v2.Instance; -import java.io.IOException; -import java.util.List; -import org.junit.AfterClass; -import org.junit.AssumptionViolatedException; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.threeten.bp.Duration; import com.google.bigtable.admin.v2.InstanceName; import com.google.bigtable.admin.v2.TableName; import com.google.cloud.bigtable.admin.v2.TableAdminClient; @@ -45,6 +34,14 @@ import com.google.cloud.bigtable.admin.v2.models.TableAdminResponses.ConsistencyToken; import com.google.cloud.bigtable.admin.v2.models.TableAdminResponses.Table; import com.google.protobuf.ByteString; +import java.io.IOException; +import java.util.List; +import org.junit.AfterClass; +import org.junit.AssumptionViolatedException; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.threeten.bp.Duration; public class TableAdminClientIT { // TODO(igorbernstein2): remove these properties once admin is split from data client From 3359b1ce6705222fd4731767b72773b615be372c Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 16 Jul 2018 12:15:47 -0400 Subject: [PATCH 3/3] whitspace --- .../google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java index 84b4491b0839..882f1c163ed9 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import com.google.bigtable.admin.v2.InstanceName; import com.google.bigtable.admin.v2.TableName; import com.google.cloud.bigtable.admin.v2.TableAdminClient;