Added missing "force" (delete) argument to google_dataform_repository resource (#13309) (#9549)

modular-magician · web-flow · commit a5514197399d · 2025-03-13T14:26:49.000-07:00
[upstream:345c14df278422388e17ac8dd61d267190cb3e5d]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/13309.txt b/.changelog/13309.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataform: added `deletion_policy` field to `google_dataform_repository` resource. Default value is `DELETE`. Setting `deletion_policy` to `FORCE` will delete any child resources of this repository as well.
+```
diff --git a/google-beta/services/dataform/iam_dataform_repository_generated_test.go b/google-beta/services/dataform/iam_dataform_repository_generated_test.go
@@ -183,6 +183,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
@@ -274,6 +275,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
@@ -382,6 +384,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
@@ -476,6 +479,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
@@ -567,6 +571,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
diff --git a/google-beta/services/dataform/resource_dataform_repository.go b/google-beta/services/dataform/resource_dataform_repository.go
@@ -31,6 +31,7 @@ import (
 
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
+	"github.com/hashicorp/terraform-provider-google-beta/google-beta/verify"
 )
 
 func ResourceDataformRepository() *schema.Resource {
@@ -190,6 +191,13 @@ Please refer to the field 'effective_labels' for all of the labels present on th
  and default labels configured on the provider.`,
 				Elem: &schema.Schema{Type: schema.TypeString},
 			},
+			"deletion_policy": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: verify.ValidateEnum([]string{"DELETE", "FORCE", ""}),
+				Description:  `Policy to control how the repository and its child resources are deleted. When set to 'FORCE', any child resources of this repository will also be deleted. Possible values: 'DELETE', 'FORCE'. Defaults to 'DELETE'. Default value: "DELETE" Possible values: ["DELETE", "FORCE"]`,
+				Default:      "DELETE",
+			},
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -342,6 +350,12 @@ func resourceDataformRepositoryRead(d *schema.ResourceData, meta interface{}) er
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("DataformRepository %q", d.Id()))
 	}
 
+	// Explicitly set virtual fields to default values if unset
+	if _, ok := d.GetOkExists("deletion_policy"); !ok {
+		if err := d.Set("deletion_policy", "DELETE"); err != nil {
+			return fmt.Errorf("Error setting deletion_policy: %s", err)
+		}
+	}
 	if err := d.Set("project", project); err != nil {
 		return fmt.Errorf("Error reading Repository: %s", err)
 	}
@@ -500,6 +514,16 @@ func resourceDataformRepositoryDelete(d *schema.ResourceData, meta interface{})
 	}
 
 	headers := make(http.Header)
+	// force delete resources
+	if v, ok := d.GetOk("deletion_policy"); ok {
+		deletion_policy := v.(string)
+		if deletion_policy == "FORCE" {
+			url, err = transport_tpg.AddQueryParams(url, map[string]string{"force": "true"})
+			if err != nil {
+				return err
+			}
+		}
+	}
 
 	log.Printf("[DEBUG] Deleting Repository %q", d.Id())
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
@@ -538,6 +562,11 @@ func resourceDataformRepositoryImport(d *schema.ResourceData, meta interface{})
 	}
 	d.SetId(id)
 
+	// Explicitly set virtual fields to default values on import
+	if err := d.Set("deletion_policy", "DELETE"); err != nil {
+		return nil, fmt.Errorf("Error setting deletion_policy: %s", err)
+	}
+
 	return []*schema.ResourceData{d}, nil
 }
 
diff --git a/google-beta/services/dataform/resource_dataform_repository_generated_meta.yaml b/google-beta/services/dataform/resource_dataform_repository_generated_meta.yaml
@@ -5,6 +5,8 @@ api_service_name: 'dataform.googleapis.com'
 api_version: 'v1beta1'
 api_resource_type_kind: 'Repository'
 fields:
+  - field: 'deletion_policy'
+    provider_only: true
   - field: 'display_name'
   - field: 'effective_labels'
     provider_only: true
diff --git a/google-beta/services/dataform/resource_dataform_repository_generated_test.go b/google-beta/services/dataform/resource_dataform_repository_generated_test.go
@@ -45,12 +45,6 @@ func TestAccDataformRepository_dataformRepositoryWithCloudsourceRepoExample(t *t
 			{
 				Config: testAccDataformRepository_dataformRepositoryWithCloudsourceRepoExample(context),
 			},
-			{
-				ResourceName:            "google_dataform_repository.dataform_repository",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "region", "terraform_labels"},
-			},
 		},
 	})
 }
@@ -113,6 +107,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "tf_test_dataform_repository%{random_suffix}"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
diff --git a/google-beta/services/dataform/resource_dataform_repository_sweeper.go b/google-beta/services/dataform/resource_dataform_repository_sweeper.go
diff --git a/website/docs/r/dataform_repository.html.markdown b/website/docs/r/dataform_repository.html.markdown
@@ -83,6 +83,7 @@ resource "google_dataform_repository" "dataform_repository" {
   display_name = "dataform_repository"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
   kms_key_name = google_kms_crypto_key.example_key.id
+  deletion_policy = "FORCE"
 
   labels = {
     label_foo1 = "label-bar1"
@@ -161,6 +162,8 @@ The following arguments are supported:
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
+* `deletion_policy` - (Optional) Policy to control how the repository and its child resources are deleted. When set to `FORCE`, any child resources of this repository will also be deleted. Possible values: `DELETE`, `FORCE`. Defaults to `DELETE`.
+
 
 <a name="nested_git_remote_settings"></a>The `git_remote_settings` block supports:
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+dataform: added `deletion_policy` field to `google_dataform_repository` resource. Default value is `DELETE`. Setting `deletion_policy` to `FORCE` will delete any child resources of this repository as well.
	`3`	+```