From 7fbe2a1509fac553a54130dd50892533c7da25db Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 21 Nov 2023 17:17:53 +0000 Subject: [PATCH] Support deleting Firestore databases (#9450) Due to backwards compatibility concerns, the default behavior remains to abandon the database upon destroy rather than to actually delete it. To actually delete the database, you must set deletion_policy to DELETE, and apply if necessary, before running `terraform destroy`. This also cleans up some related deletion-related docs and bugs: * Updates the delete protection docs * delete_protection_state being enabled with deletion_policy = DELETE fails the destroy Fixes https://github.com/hashicorp/terraform-provider-google/issues/16488 Fixes https://github.com/hashicorp/terraform-provider-google/issues/16404 Fixes https://github.com/hashicorp/terraform-provider-google/issues/16325 [upstream:4829cc4a4f604db5d6e1d09a7c85df6250ebc19a] Signed-off-by: Modular Magician --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fc9ac71dd..14b26a032 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/hashicorp/hcl/v2 v2.19.1 github.com/hashicorp/terraform-json v0.17.1 github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 - github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121133934-269de2a0b031 + github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121171423-085304aadf17 github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.8.3 diff --git a/go.sum b/go.sum index 0d7fd3386..c62aed9f7 100644 --- a/go.sum +++ b/go.sum @@ -169,8 +169,8 @@ github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwU github.com/hashicorp/terraform-plugin-mux v0.8.0 h1:WCTP66mZ+iIaIrCNJnjPEYnVjawTshnDJu12BcXK1EI= github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 h1:wcOKYwPI9IorAJEBLzgclh3xVolO7ZorYd6U1vnok14= github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0/go.mod h1:qH/34G25Ugdj5FcM95cSoXzUgIbgfhVLXCcEcYaMwq8= -github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121133934-269de2a0b031 h1:MLaZU3afWwBO1PHvI8msaB1KOrEIP2rnKLwYvl6rrO8= -github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121133934-269de2a0b031/go.mod h1:W/Ri6ztEJqzSaQcRxRLTlbjcguRWT5M0nGvNcnqmGps= +github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121171423-085304aadf17 h1:y5D1kcYpiAV9s6nlyHiQlWPmc81azGQ560yZN5ldEFs= +github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20231121171423-085304aadf17/go.mod h1:W/Ri6ztEJqzSaQcRxRLTlbjcguRWT5M0nGvNcnqmGps= github.com/hashicorp/terraform-registry-address v0.2.2 h1:lPQBg403El8PPicg/qONZJDC6YlgCVbWDtNmmZKtBno= github.com/hashicorp/terraform-registry-address v0.2.2/go.mod h1:LtwNbCihUoUZ3RYriyS2wF/lGPB6gF9ICLRtuDk7hSo= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=