feat(bigtable): Add support for creating instance with tags

Author: dohun-dev

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/CreateInstanceRequest.java

@@ -118,6 +118,22 @@ public CreateInstanceRequest addLabel(@Nonnull String key, @Nonnull String value
     return this;
   }
 
+  /**
+   * Adds a tag to the instance.
+   *
+   * <p>Tags are a way to organize and govern resources across Google Cloud. Unlike labels,
+   * Tags are standalone resources created and managed through the Resource Manager API.
+   *
+   * @see <a href="https://https://cloud.google.com/bigtable/docs/tags">For more details</a>
+   */
+  @SuppressWarnings("WeakerAccess")
+  public CreateInstanceRequest addTag(@Nonnull String key, @Nonnull String value) {
+    Preconditions.checkNotNull(key, "Key can't be null");
+    Preconditions.checkNotNull(value, "Value can't be null");
+    builder.getInstanceBuilder().putTags(key, value);
+    return this;
+  }
+
   /**
    * Adds a cluster to the instance request with manual scaling enabled.
    *

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/Instance.java

@@ -150,6 +150,12 @@ public String getDisplayName() {
     return proto.getDisplayName();
   }
 
+  /** Gets the instance's tags. */
+  @SuppressWarnings("WeakerAccess")
+  public Map<String,String> getTags() {
+    return proto.getTagsMap();
+  }
+
   /** Gets the instance's current type. Can be DEVELOPMENT or PRODUCTION. */
   @SuppressWarnings("WeakerAccess")
   public Type getType() {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java

@@ -334,7 +334,8 @@ public void testCreateInstance() {
             .setInstance(
                 com.google.bigtable.admin.v2.Instance.newBuilder()
                     .setType(com.google.bigtable.admin.v2.Instance.Type.DEVELOPMENT)
-                    .setDisplayName(INSTANCE_ID))
+                    .setDisplayName(INSTANCE_ID)
+                    .putTags("tagKeys/123", "tagValues/456"))
             .putClusters(
                 "cluster1",
                 com.google.bigtable.admin.v2.Cluster.newBuilder()

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/CreateClusterRequestTest.java

@@ -128,6 +128,7 @@ public void testOptionalFields() {
             .setDisplayName("custom display name")
             .addLabel("my label", "with some value")
             .addLabel("my other label", "with some value")
+            .addTag("tagKeys/123", "tagValues/456")
             .setType(Instance.Type.DEVELOPMENT)
             .addCluster("cluster1", "us-east1-c", 1, StorageType.SSD);
 
@@ -142,6 +143,7 @@ public void testOptionalFields() {
                     .setDisplayName("custom display name")
                     .putLabels("my label", "with some value")
                     .putLabels("my other label", "with some value")
+                    .putTags("tagKeys/123", "tagValues/456")
                     .setType(com.google.bigtable.admin.v2.Instance.Type.DEVELOPMENT))
             .putClusters(
                 "cluster1",

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/InstanceTest.java

@@ -28,15 +28,16 @@ public class InstanceTest {
 
   @Test
   public void testFromProto() {
-    com.google.bigtable.admin.v2.Instance proto =
-        com.google.bigtable.admin.v2.Instance.newBuilder()
-            .setName("projects/my-project/instances/my-instance")
-            .setDisplayName("my display name")
-            .setType(com.google.bigtable.admin.v2.Instance.Type.PRODUCTION)
-            .setState(com.google.bigtable.admin.v2.Instance.State.READY)
-            .putLabels("label1", "value1")
-            .putLabels("label2", "value2")
-            .build();
+    com.google.bigtable.admin.v2.Instance proto = com.google.bigtable.admin.v2.Instance.newBuilder()
+        .setName("projects/my-project/instances/my-instance")
+        .setDisplayName("my display name")
+        .setType(com.google.bigtable.admin.v2.Instance.Type.PRODUCTION)
+        .setState(com.google.bigtable.admin.v2.Instance.State.READY)
+        .putLabels("label1", "value1")
+        .putLabels("label2", "value2")
+        .putTags("tagKeys/123", "tagValues/456")
+        .putTags("tagKeys/234", "tagValues/567")
+        .build();
 
     Instance result = Instance.fromProto(proto);
 
@@ -48,18 +49,19 @@ public void testFromProto() {
         .containsExactly(
             "label1", "value1",
             "label2", "value2");
+    assertThat(result.getTags()).containsExactly("tagKeys/123", "tagValues/456", "tagKeys/234", "tagValues/567");
   }
 
   @Test
   public void testRequiresName() {
-    com.google.bigtable.admin.v2.Instance proto =
-        com.google.bigtable.admin.v2.Instance.newBuilder()
-            .setDisplayName("my display name")
-            .setType(com.google.bigtable.admin.v2.Instance.Type.PRODUCTION)
-            .setState(com.google.bigtable.admin.v2.Instance.State.READY)
-            .putLabels("label1", "value1")
-            .putLabels("label2", "value2")
-            .build();
+    com.google.bigtable.admin.v2.Instance proto = com.google.bigtable.admin.v2.Instance.newBuilder()
+        .setDisplayName("my display name")
+        .setType(com.google.bigtable.admin.v2.Instance.Type.PRODUCTION)
+        .setState(com.google.bigtable.admin.v2.Instance.State.READY)
+        .putLabels("label1", "value1")
+        .putLabels("label2", "value2")
+        .putTags("tagKeys/123", "tagValues/456")
+        .build();
 
     Exception actualException = null;
 
@@ -74,8 +76,8 @@ public void testRequiresName() {
 
   @Test
   public void testTypeEnumUpToDate() {
-    List<com.google.bigtable.admin.v2.Instance.Type> validProtoValues =
-        Lists.newArrayList(com.google.bigtable.admin.v2.Instance.Type.values());
+    List<com.google.bigtable.admin.v2.Instance.Type> validProtoValues = Lists
+        .newArrayList(com.google.bigtable.admin.v2.Instance.Type.values());
 
     // TYPE_UNSPECIFIED is not surfaced
     validProtoValues.remove(com.google.bigtable.admin.v2.Instance.Type.TYPE_UNSPECIFIED);
@@ -100,8 +102,8 @@ public void testTypeEnumUpToDate() {
 
   @Test
   public void testStateEnumUpToDate() {
-    List<com.google.bigtable.admin.v2.Instance.State> validProtoValues =
-        Lists.newArrayList(com.google.bigtable.admin.v2.Instance.State.values());
+    List<com.google.bigtable.admin.v2.Instance.State> validProtoValues = Lists
+        .newArrayList(com.google.bigtable.admin.v2.Instance.State.values());
 
     List<Instance.State> validModelValues = Lists.newArrayList(Instance.State.values());