From 6706cdbd9c6aa6f7c143872dfb63dab06c3127b0 Mon Sep 17 00:00:00 2001 From: Vladimir Korol Date: Wed, 24 Feb 2021 16:52:40 +0300 Subject: [PATCH 1/2] Fixed repeating changes google_service_usage_consumer_quota_override when override_value is 0 --- .changelog/4522.txt | 3 +++ google-beta/resource_service_usage_consumer_quota_override.go | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .changelog/4522.txt diff --git a/.changelog/4522.txt b/.changelog/4522.txt new file mode 100644 index 0000000000..11a3c2c0cf --- /dev/null +++ b/.changelog/4522.txt @@ -0,0 +1,3 @@ +```release-note:bug +Fixed repeating changes google_service_usage_consumer_quota_override when override_value is 0 +``` diff --git a/google-beta/resource_service_usage_consumer_quota_override.go b/google-beta/resource_service_usage_consumer_quota_override.go index 4834612e8d..4094c52875 100644 --- a/google-beta/resource_service_usage_consumer_quota_override.go +++ b/google-beta/resource_service_usage_consumer_quota_override.go @@ -363,6 +363,9 @@ func resourceServiceUsageConsumerQuotaOverrideImport(d *schema.ResourceData, met } func flattenNestedServiceUsageConsumerQuotaOverrideOverrideValue(v interface{}, d *schema.ResourceData, config *Config) interface{} { + if v == nil { + return "0" + } return v } From c002b04990e99a58686be6ad0bba9f5d96b80c32 Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Mon, 1 Mar 2021 16:15:16 -0600 Subject: [PATCH 2/2] Remove unneeded changelog file Our upstream automation will handle this --- .changelog/4522.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .changelog/4522.txt diff --git a/.changelog/4522.txt b/.changelog/4522.txt deleted file mode 100644 index 11a3c2c0cf..0000000000 --- a/.changelog/4522.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:bug -Fixed repeating changes google_service_usage_consumer_quota_override when override_value is 0 -```