feat(bigtable): Add support for creating Instance with tags (#13459)

dohun-dev · web-flow · commit 1bce843ee44d · 2026-02-25T10:12:02.000-08:00
diff --git a/bigtable/admin.go b/bigtable/admin.go
@@ -1384,6 +1384,10 @@ type InstanceConf struct {
 	// latency and more throughput by removing node boundaries. It is optional,
 	// with the default being 1X.
 	NodeScalingFactor NodeScalingFactor
+
+	// Tags maps TagKey resource names (e.g., "tagKeys/123") to TagValue
+	// resource names (e.g., "tagValues/456") to be associated with the instance.
+	Tags map[string]string
 }
 
 // InstanceWithClustersConfig contains the information necessary to create an Instance
@@ -1392,6 +1396,9 @@ type InstanceWithClustersConfig struct {
 	Clusters                []ClusterConfig
 	InstanceType            InstanceType
 	Labels                  map[string]string
+	// Tags maps TagKey resource names (e.g., "tagKeys/123") to TagValue
+	// resource names (e.g., "tagValues/456") to be associated with the instance.
+	Tags map[string]string
 }
 
 var instanceNameRegexp = regexp.MustCompile(`^projects/([^/]+)/instances/([a-z][-a-z0-9]*)$`)
@@ -1405,6 +1412,7 @@ func (iac *InstanceAdminClient) CreateInstance(ctx context.Context, conf *Instan
 		DisplayName:  conf.DisplayName,
 		InstanceType: conf.InstanceType,
 		Labels:       conf.Labels,
+		Tags:         conf.Tags,
 		Clusters: []ClusterConfig{
 			{
 				InstanceID:        conf.InstanceId,
@@ -1436,6 +1444,7 @@ func (iac *InstanceAdminClient) CreateInstanceWithClusters(ctx context.Context,
 			DisplayName: conf.DisplayName,
 			Type:        btapb.Instance_Type(conf.InstanceType),
 			Labels:      conf.Labels,
+			Tags:        conf.Tags,
 		},
 		Clusters: clusters,
 	}
diff --git a/bigtable/admin_test.go b/bigtable/admin_test.go
@@ -1223,6 +1223,27 @@ func TestInstanceAdmin_CreateInstance_WithAutoscaling(t *testing.T) {
 	}
 }
 
+// Test that CreateInstance with a tags argument completes without error.
+// We cannot verify tag creation itself, as tags are not stored in the Instance metadata
+// and thus are not observable here.
+func TestInstanceAdmin_CreateInstance_WithTags(t *testing.T) {
+	mock := &mockAdminClock{}
+	c := setupClient(t, mock)
+
+	err := c.CreateInstance(context.Background(), &InstanceConf{
+		InstanceId:   "myinst",
+		DisplayName:  "myinst",
+		InstanceType: PRODUCTION,
+		ClusterId:    "mycluster",
+		Zone:         "us-central1-a",
+		StorageType:  SSD,
+		Tags:         map[string]string{"tagKeys/123": "tagValues/456"},
+	})
+	if err != nil {
+		t.Fatalf("CreateInstance failed: %v", err)
+	}
+}
+
 func TestInstanceAdmin_CreateInstanceWithClusters_WithAutoscaling(t *testing.T) {
 	mock := &mockAdminClock{}
 	c := setupClient(t, mock)
diff --git a/bigtable/integration_test.go b/bigtable/integration_test.go
@@ -2269,6 +2269,7 @@ func TestIntegration_AdminCreateInstance(t *testing.T) {
 		Zone:         instanceToCreateZone,
 		InstanceType: DEVELOPMENT,
 		Labels:       map[string]string{"test-label-key": "test-label-value"},
+		Tags:         map[string]string{"tagKeys/12345": "tagValues/6789"},
 	}
 
 	// CreateInstance can be flaky; retry before marking as failing.
@@ -2297,6 +2298,7 @@ func TestIntegration_AdminCreateInstance(t *testing.T) {
 		DisplayName:  "new display name",
 		InstanceType: PRODUCTION,
 		Labels:       map[string]string{"new-label-key": "new-label-value"},
+		Tags:         map[string]string{"tagKeys/12345": "tagValues/6789"},
 		Clusters: []ClusterConfig{
 			{ClusterID: clusterID, NumNodes: 5},
 		},
