potential fix for a crash in google_storage_bucket when providers upgrade to 4.42.0 (#6758) (#4828)

modular-magician · shuyama1 · commit bf7bb7a21c58 · 2022-11-01T14:57:56.000-07:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/6758.txt b/.changelog/6758.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+storage: fixed a crash in `google_storage_bucket` when upgrading provider to version `4.42.0` with `lifecycle_rule.condition.age` unset
+```
diff --git a/google-beta/resource_storage_bucket.go b/google-beta/resource_storage_bucket.go
@@ -1080,7 +1080,6 @@ func flattenBucketLifecycleRuleAction(action *storage.BucketLifecycleRuleAction)
 
 func flattenBucketLifecycleRuleCondition(condition *storage.BucketLifecycleRuleCondition) map[string]interface{} {
 	ruleCondition := map[string]interface{}{
-		"age":                        int(*condition.Age),
 		"created_before":             condition.CreatedBefore,
 		"matches_storage_class":      convertStringArrToInterface(condition.MatchesStorageClass),
 		"num_newer_versions":         int(condition.NumNewerVersions),
@@ -1091,6 +1090,9 @@ func flattenBucketLifecycleRuleCondition(condition *storage.BucketLifecycleRuleC
 		"matches_prefix":             convertStringArrToInterface(condition.MatchesPrefix),
 		"matches_suffix":             convertStringArrToInterface(condition.MatchesSuffix),
 	}
+	if condition.Age != nil {
+		ruleCondition["age"] = int(*condition.Age)
+	}
 	if condition.IsLive == nil {
 		ruleCondition["with_state"] = "ANY"
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+storage: fixed a crash in `google_storage_bucket` when upgrading provider to version `4.42.0` with `lifecycle_rule.condition.age` unset
	`3`	+```