Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote support for BigQuery dataset resource tags to GA #7718

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/11122.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
bigquery: added `resource_tags` field to `google_bigquery_dataset` resource (ga)
```
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ func TestAccBigQueryDataset_bigqueryDatasetResourceTagsExample(t *testing.T) {

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccCheckBigQueryDatasetDestroyProducer(t),
Steps: []resource.TestStep{
{
Expand All @@ -479,36 +479,29 @@ func TestAccBigQueryDataset_bigqueryDatasetResourceTagsExample(t *testing.T) {
func testAccBigQueryDataset_bigqueryDatasetResourceTagsExample(context map[string]interface{}) string {
return acctest.Nprintf(`
data "google_project" "project" {
provider = "google-beta"
}

resource "google_tags_tag_key" "tag_key1" {
provider = "google-beta"
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key1%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value1" {
provider = "google-beta"
parent = "tagKeys/${google_tags_tag_key.tag_key1.name}"
short_name = "tf_test_tag_value1%{random_suffix}"
}

resource "google_tags_tag_key" "tag_key2" {
provider = "google-beta"
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key2%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value2" {
provider = "google-beta"
parent = "tagKeys/${google_tags_tag_key.tag_key2.name}"
short_name = "tf_test_tag_value2%{random_suffix}"
}

resource "google_bigquery_dataset" "dataset" {
provider = google-beta

dataset_id = "dataset%{random_suffix}"
friendly_name = "test"
description = "This is a test description"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ func TestAccBigQueryDataset_bigqueryDatasetResourceTags_update(t *testing.T) {

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccCheckBigQueryDatasetDestroyProducer(t),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -777,36 +777,29 @@ resource "google_bigquery_dataset" "test" {
func testAccBigQueryDataset_bigqueryDatasetResourceTags_basic(context map[string]interface{}) string {
return acctest.Nprintf(`
data "google_project" "project" {
provider = "google-beta"
}

resource "google_tags_tag_key" "tag_key1" {
provider = google-beta
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key1%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value1" {
provider = google-beta
parent = "tagKeys/${google_tags_tag_key.tag_key1.name}"
short_name = "tf_test_tag_value1%{random_suffix}"
}

resource "google_tags_tag_key" "tag_key2" {
provider = google-beta
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key2%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value2" {
provider = google-beta
parent = "tagKeys/${google_tags_tag_key.tag_key2.name}"
short_name = "tf_test_tag_value2%{random_suffix}"
}

resource "google_bigquery_dataset" "dataset" {
provider = google-beta

dataset_id = "dataset%{random_suffix}"
friendly_name = "test"
description = "This is a test description"
Expand All @@ -823,36 +816,29 @@ resource "google_bigquery_dataset" "dataset" {
func testAccBigQueryDataset_bigqueryDatasetResourceTags_update(context map[string]interface{}) string {
return acctest.Nprintf(`
data "google_project" "project" {
provider = "google-beta"
}

resource "google_tags_tag_key" "tag_key1" {
provider = google-beta
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key1%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value1" {
provider = google-beta
parent = "tagKeys/${google_tags_tag_key.tag_key1.name}"
short_name = "tf_test_tag_value1%{random_suffix}"
}

resource "google_tags_tag_key" "tag_key2" {
provider = google-beta
parent = "projects/${data.google_project.project.number}"
short_name = "tf_test_tag_key2%{random_suffix}"
}

resource "google_tags_tag_value" "tag_value2" {
provider = google-beta
parent = "tagKeys/${google_tags_tag_key.tag_key2.name}"
short_name = "tf_test_tag_value2%{random_suffix}"
}

resource "google_bigquery_dataset" "dataset" {
provider = google-beta

dataset_id = "dataset%{random_suffix}"
friendly_name = "test"
description = "This is a test description"
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/bigquery_dataset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ The following arguments are supported:
LOGICAL is the default if this flag isn't specified.

* `resource_tags` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
(Optional)
The tags attached to this table. Tag keys are globally unique. Tag key is expected to be
in the namespaced format, for example "123456789012/environment" where 123456789012 is the
ID of the parent organization or project resource for this tag key. Tag value is expected
Expand Down