Read Bigtable column family from the API (#2378)

<!-- This change is generated by MagicModules. -->
/cc @rileykarson
This commit is contained in:
The Magician 2018-10-31 13:21:58 -07:00 committed by Nathan McKinley
parent 9bbcd0b0a8
commit 26ba086dbc
2 changed files with 17 additions and 4 deletions

View File

@ -130,7 +130,7 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
defer c.Close() defer c.Close()
name := d.Id() name := d.Id()
_, err = c.TableInfo(ctx, name) table, err := c.TableInfo(ctx, name)
if err != nil { if err != nil {
log.Printf("[WARN] Removing %s because it's gone", name) log.Printf("[WARN] Removing %s because it's gone", name)
d.SetId("") d.SetId("")
@ -138,6 +138,7 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
} }
d.Set("project", project) d.Set("project", project)
d.Set("column_family", flattenColumnFamily(table.Families))
return nil return nil
} }
@ -169,3 +170,15 @@ func resourceBigtableTableDestroy(d *schema.ResourceData, meta interface{}) erro
return nil return nil
} }
func flattenColumnFamily(families []string) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(families))
for _, f := range families {
data := make(map[string]interface{})
data["family"] = f
result = append(result, data)
}
return result
}

View File

@ -3,12 +3,12 @@ layout: "google"
page_title: "Google: google_bigtable_table" page_title: "Google: google_bigtable_table"
sidebar_current: "docs-google-bigtable-table" sidebar_current: "docs-google-bigtable-table"
description: |- description: |-
Creates a Google Bigtable table inside an instance. Creates a Google Cloud Bigtable table inside an instance.
--- ---
# google_bigtable_table # google_bigtable_table
Creates a Google Bigtable table inside an instance. For more information see Creates a Google Cloud Bigtable table inside an instance. For more information see
[the official documentation](https://cloud.google.com/bigtable/) and [the official documentation](https://cloud.google.com/bigtable/) and
[API](https://cloud.google.com/bigtable/docs/go/reference). [API](https://cloud.google.com/bigtable/docs/go/reference).
@ -50,7 +50,7 @@ The following arguments are supported:
`column_family` supports the following arguments: `column_family` supports the following arguments:
* `family` - (Optional) Creates a new column family in a table. * `family` - (Optional) The name of the column family.
## Attributes Reference ## Attributes Reference