datacatalog - bump Taxonomy and PolicyTag to ga

.changelog/6989.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+datacatalog - bump Taxonomy and PolicyTag to ga
+```

google/iam_data_catalog_policy_tag.go

@@ -0,0 +1,167 @@
+// ----------------------------------------------------------------------------
+//
+//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+//
+// ----------------------------------------------------------------------------
+//
+//     This file is automatically generated by Magic Modules and manual
+//     changes will be clobbered when the file is regenerated.
+//
+//     Please read more about how to change this file in
+//     .github/CONTRIBUTING.md.
+//
+// ----------------------------------------------------------------------------
+
+package google
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/errwrap"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"google.golang.org/api/cloudresourcemanager/v1"
+)
+
+var DataCatalogPolicyTagIamSchema = map[string]*schema.Schema{
+	"policy_tag": {
+		Type:             schema.TypeString,
+		Required:         true,
+		ForceNew:         true,
+		DiffSuppressFunc: compareSelfLinkOrResourceName,
+	},
+}
+
+type DataCatalogPolicyTagIamUpdater struct {
+	policyTag string
+	d         TerraformResourceData
+	Config    *Config
+}
+
+func DataCatalogPolicyTagIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
+	values := make(map[string]string)
+
+	if v, ok := d.GetOk("policy_tag"); ok {
+		values["policy_tag"] = v.(string)
+	}
+
+	// We may have gotten either a long or short name, so attempt to parse long name if possible
+	m, err := getImportIdQualifiers([]string{"(?P<policy_tag>.+)"}, d, config, d.Get("policy_tag").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	for k, v := range m {
+		values[k] = v
+	}
+
+	u := &DataCatalogPolicyTagIamUpdater{
+		policyTag: values["policy_tag"],
+		d:         d,
+		Config:    config,
+	}
+
+	if err := d.Set("policy_tag", u.GetResourceId()); err != nil {
+		return nil, fmt.Errorf("Error setting policy_tag: %s", err)
+	}
+
+	return u, nil
+}
+
+func DataCatalogPolicyTagIdParseFunc(d *schema.ResourceData, config *Config) error {
+	values := make(map[string]string)
+
+	m, err := getImportIdQualifiers([]string{"(?P<policy_tag>.+)"}, d, config, d.Id())
+	if err != nil {
+		return err
+	}
+
+	for k, v := range m {
+		values[k] = v
+	}
+
+	u := &DataCatalogPolicyTagIamUpdater{
+		policyTag: values["policy_tag"],
+		d:         d,
+		Config:    config,
+	}
+	if err := d.Set("policy_tag", u.GetResourceId()); err != nil {
+		return fmt.Errorf("Error setting policy_tag: %s", err)
+	}
+	d.SetId(u.GetResourceId())
+	return nil
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
+	url, err := u.qualifyPolicyTagUrl("getIamPolicy")
+	if err != nil {
+		return nil, err
+	}
+
+	var obj map[string]interface{}
+
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return nil, err
+	}
+
+	policy, err := sendRequest(u.Config, "POST", "", url, userAgent, obj)
+	if err != nil {
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
+	}
+
+	out := &cloudresourcemanager.Policy{}
+	err = Convert(policy, out)
+	if err != nil {
+		return nil, errwrap.Wrapf("Cannot convert a policy to a resource manager policy: {{err}}", err)
+	}
+
+	return out, nil
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
+	json, err := ConvertToMap(policy)
+	if err != nil {
+		return err
+	}
+
+	obj := make(map[string]interface{})
+	obj["policy"] = json
+
+	url, err := u.qualifyPolicyTagUrl("setIamPolicy")
+	if err != nil {
+		return err
+	}
+
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return err
+	}
+
+	_, err = sendRequestWithTimeout(u.Config, "POST", "", url, userAgent, obj, u.d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
+	}
+
+	return nil
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) qualifyPolicyTagUrl(methodIdentifier string) (string, error) {
+	urlTemplate := fmt.Sprintf("{{DataCatalogBasePath}}%s:%s", fmt.Sprintf("%s", u.policyTag), methodIdentifier)
+	url, err := replaceVars(u.d, u.Config, urlTemplate)
+	if err != nil {
+		return "", err
+	}
+	return url, nil
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) GetResourceId() string {
+	return fmt.Sprintf("%s", u.policyTag)
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) GetMutexKey() string {
+	return fmt.Sprintf("iam-datacatalog-policytag-%s", u.GetResourceId())
+}
+
+func (u *DataCatalogPolicyTagIamUpdater) DescribeResource() string {
+	return fmt.Sprintf("datacatalog policytag %q", u.GetResourceId())
+}

google/iam_data_catalog_policy_tag_generated_test.go

@@ -0,0 +1,204 @@
+// ----------------------------------------------------------------------------
+//
+//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+//
+// ----------------------------------------------------------------------------
+//
+//     This file is automatically generated by Magic Modules and manual
+//     changes will be clobbered when the file is regenerated.
+//
+//     Please read more about how to change this file in
+//     .github/CONTRIBUTING.md.
+//
+// ----------------------------------------------------------------------------
+
+package google
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccDataCatalogPolicyTagIamBindingGenerated(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": randString(t, 10),
+		"role":          "roles/viewer",
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataCatalogPolicyTagIamBinding_basicGenerated(context),
+			},
+			{
+				// Test Iam Binding update
+				Config: testAccDataCatalogPolicyTagIamBinding_updateGenerated(context),
+			},
+		},
+	})
+}
+
+func TestAccDataCatalogPolicyTagIamMemberGenerated(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": randString(t, 10),
+		"role":          "roles/viewer",
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				// Test Iam Member creation (no update for member, no need to test)
+				Config: testAccDataCatalogPolicyTagIamMember_basicGenerated(context),
+			},
+		},
+	})
+}
+
+func TestAccDataCatalogPolicyTagIamPolicyGenerated(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": randString(t, 10),
+		"role":          "roles/viewer",
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataCatalogPolicyTagIamPolicy_basicGenerated(context),
+			},
+			{
+				Config: testAccDataCatalogPolicyTagIamPolicy_emptyBinding(context),
+			},
+		},
+	})
+}
+
+func testAccDataCatalogPolicyTagIamMember_basicGenerated(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_data_catalog_policy_tag" "basic_policy_tag" {
+  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" {
+  display_name =  "tf_test_taxonomy_display_name%{random_suffix}"
+  description = "A collection of policy tags"
+  activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]
+}
+
+resource "google_data_catalog_policy_tag_iam_member" "foo" {
+  policy_tag = google_data_catalog_policy_tag.basic_policy_tag.name
+  role = "%{role}"
+  member = "user:admin@hashicorptest.com"
+}
+`, context)
+}
+
+func testAccDataCatalogPolicyTagIamPolicy_basicGenerated(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_data_catalog_policy_tag" "basic_policy_tag" {
+  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" {
+  display_name =  "tf_test_taxonomy_display_name%{random_suffix}"
+  description = "A collection of policy tags"
+  activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]
+}
+
+data "google_iam_policy" "foo" {
+  binding {
+    role = "%{role}"
+    members = ["user:admin@hashicorptest.com"]
+  }
+}
+
+resource "google_data_catalog_policy_tag_iam_policy" "foo" {
+  policy_tag = google_data_catalog_policy_tag.basic_policy_tag.name
+  policy_data = data.google_iam_policy.foo.policy_data
+}
+`, context)
+}
+
+func testAccDataCatalogPolicyTagIamPolicy_emptyBinding(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_data_catalog_policy_tag" "basic_policy_tag" {
+  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" {
+  display_name =  "tf_test_taxonomy_display_name%{random_suffix}"
+  description = "A collection of policy tags"
+  activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]
+}
+
+data "google_iam_policy" "foo" {
+}
+
+resource "google_data_catalog_policy_tag_iam_policy" "foo" {
+  policy_tag = google_data_catalog_policy_tag.basic_policy_tag.name
+  policy_data = data.google_iam_policy.foo.policy_data
+}
+`, context)
+}
+
+func testAccDataCatalogPolicyTagIamBinding_basicGenerated(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_data_catalog_policy_tag" "basic_policy_tag" {
+  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" {
+  display_name =  "tf_test_taxonomy_display_name%{random_suffix}"
+  description = "A collection of policy tags"
+  activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]
+}
+
+resource "google_data_catalog_policy_tag_iam_binding" "foo" {
+  policy_tag = google_data_catalog_policy_tag.basic_policy_tag.name
+  role = "%{role}"
+  members = ["user:admin@hashicorptest.com"]
+}
+`, context)
+}
+
+func testAccDataCatalogPolicyTagIamBinding_updateGenerated(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_data_catalog_policy_tag" "basic_policy_tag" {
+  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" {
+  display_name =  "tf_test_taxonomy_display_name%{random_suffix}"
+  description = "A collection of policy tags"
+  activated_policy_types = ["FINE_GRAINED_ACCESS_CONTROL"]
+}
+
+resource "google_data_catalog_policy_tag_iam_binding" "foo" {
+  policy_tag = google_data_catalog_policy_tag.basic_policy_tag.name
+  role = "%{role}"
+  members = ["user:admin@hashicorptest.com", "user:gterraformtest1@gmail.com"]
+}
+`, context)
+}