From 02108d45849283a8f6569fcf535d7c0897890c43 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 27 Feb 2023 21:32:36 +0200 Subject: [PATCH] datacatalog - bump Taxonomy and PolicyTag to ga (#6989) * update Taxonomy and PolicyTag to ga * update Taxonomy and PolicyTag to ga * refactor * refactor --- mmv1/products/datacatalog/api.yaml | 6 ++---- mmv1/products/datacatalog/terraform.yaml | 2 +- .../data_catalog_taxonomies_policy_tag_basic.tf.erb | 3 --- ...data_catalog_taxonomies_policy_tag_child_policies.tf.erb | 5 ----- .../terraform/examples/data_catalog_taxonomy_basic.tf.erb | 2 -- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mmv1/products/datacatalog/api.yaml b/mmv1/products/datacatalog/api.yaml index dabe16ab7600..64f26bac6741 100644 --- a/mmv1/products/datacatalog/api.yaml +++ b/mmv1/products/datacatalog/api.yaml @@ -504,7 +504,6 @@ objects: name: Taxonomy base_url: projects/{{project}}/locations/{{region}}/taxonomies self_link: "{{name}}" - min_version: beta update_verb: :PATCH update_mask: true description: | @@ -512,7 +511,7 @@ objects: references: !ruby/object:Api::Resource::ReferenceLinks guides: 'Official Documentation': https://cloud.google.com/data-catalog/docs - api: https://cloud.google.com/data-catalog/docs/reference/rest/v1beta1/projects.locations.taxonomies + api: https://cloud.google.com/data-catalog/docs/reference/rest/v1/projects.locations.taxonomies iam_policy: !ruby/object:Api::Resource::IamPolicy skip_import_test: true method_name_separator: ':' @@ -563,7 +562,6 @@ objects: name: PolicyTag base_url: "{{taxonomy}}/policyTags" self_link: "{{name}}" - min_version: beta update_verb: :PATCH update_mask: true description: | @@ -571,7 +569,7 @@ objects: references: !ruby/object:Api::Resource::ReferenceLinks guides: 'Official Documentation': https://cloud.google.com/data-catalog/docs - api: https://cloud.google.com/data-catalog/docs/reference/rest/v1beta1/projects.locations.taxonomies.policyTags + api: https://cloud.google.com/data-catalog/docs/reference/rest/v1/projects.locations.taxonomies.policyTags iam_policy: !ruby/object:Api::Resource::IamPolicy skip_import_test: true method_name_separator: ':' diff --git a/mmv1/products/datacatalog/terraform.yaml b/mmv1/products/datacatalog/terraform.yaml index 72f7f49ef9da..0830dd0833f6 100644 --- a/mmv1/products/datacatalog/terraform.yaml +++ b/mmv1/products/datacatalog/terraform.yaml @@ -208,7 +208,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides primary_resource_id: "basic_taxonomy" primary_resource_name: "fmt.Sprintf(\"tf_test_my_taxonomy%s\", context[\"random_suffix\"])" vars: - display_name: "my_display_name" + display_name: "my_taxonomy" properties: region: !ruby/object:Overrides::Terraform::PropertyOverride required: false diff --git a/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_basic.tf.erb b/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_basic.tf.erb index 609725a4946c..3b1b452615bc 100644 --- a/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_basic.tf.erb +++ b/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_basic.tf.erb @@ -1,13 +1,10 @@ resource "google_data_catalog_policy_tag" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta taxonomy = google_data_catalog_taxonomy.my_taxonomy.id display_name = "Low security" description = "A policy tag normally associated with low security items" } resource "google_data_catalog_taxonomy" "my_taxonomy" { - provider = google-beta - region = "us" display_name = "<%= ctx[:vars]['taxonomy_display_name'] %>" description = "A collection of policy tags" activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"] diff --git a/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_child_policies.tf.erb b/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_child_policies.tf.erb index c504e1bd3b2b..e9875997b179 100644 --- a/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_child_policies.tf.erb +++ b/mmv1/templates/terraform/examples/data_catalog_taxonomies_policy_tag_child_policies.tf.erb @@ -1,12 +1,10 @@ resource "google_data_catalog_policy_tag" "parent_policy" { - provider = google-beta taxonomy = google_data_catalog_taxonomy.my_taxonomy.id display_name = "High" description = "A policy tag category used for high security access" } resource "google_data_catalog_policy_tag" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta taxonomy = google_data_catalog_taxonomy.my_taxonomy.id display_name = "ssn" description = "A hash of the users ssn" @@ -14,7 +12,6 @@ resource "google_data_catalog_policy_tag" "<%= ctx[:primary_resource_id] %>" { } resource "google_data_catalog_policy_tag" "child_policy2" { - provider = google-beta taxonomy = google_data_catalog_taxonomy.my_taxonomy.id display_name = "dob" description = "The users date of birth" @@ -24,8 +21,6 @@ resource "google_data_catalog_policy_tag" "child_policy2" { } resource "google_data_catalog_taxonomy" "my_taxonomy" { - provider = google-beta - region = "us" display_name = "<%= ctx[:vars]['taxonomy_display_name'] %>" description = "A collection of policy tags" activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"] diff --git a/mmv1/templates/terraform/examples/data_catalog_taxonomy_basic.tf.erb b/mmv1/templates/terraform/examples/data_catalog_taxonomy_basic.tf.erb index 5a07ce699fe8..58b51b59ab52 100644 --- a/mmv1/templates/terraform/examples/data_catalog_taxonomy_basic.tf.erb +++ b/mmv1/templates/terraform/examples/data_catalog_taxonomy_basic.tf.erb @@ -1,6 +1,4 @@ resource "google_data_catalog_taxonomy" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta - region = "us" display_name = "<%= ctx[:vars]['display_name'] %>" description = "A collection of policy tags" activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]