Merge pull request #6250 from simongh/storagement-management-policy-fix

Changed management policy to only send set properties
hashicorp · Mar 26, 2020 · 0c4d2f6 · 0c4d2f6
2 parents 1cf46ec + 625b397
commit 0c4d2f6
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/azurerm/internal/services/storage/resource_arm_storage_management_policy.go b/azurerm/internal/services/storage/resource_arm_storage_management_policy.go
@@ -294,33 +294,21 @@ func expandStorageManagementPolicyRule(d *schema.ResourceData, ruleIndex int) (s
 		if _, ok := d.GetOk(fmt.Sprintf("rule.%d.actions.0.base_blob", ruleIndex)); ok {
 			baseBlob := &storage.ManagementPolicyBaseBlob{}
 			if v, ok := d.GetOk(fmt.Sprintf("rule.%d.actions.0.base_blob.0.tier_to_cool_after_days_since_modification_greater_than", ruleIndex)); ok {
-				if v == nil {
-					baseBlob.TierToCool = &storage.DateAfterModification{
-						DaysAfterModificationGreaterThan: nil,
-					}
-				} else {
+				if v != nil {
 					baseBlob.TierToCool = &storage.DateAfterModification{
 						DaysAfterModificationGreaterThan: utils.Float(float64(v.(int))),
 					}
 				}
 			}
 			if v, ok := d.GetOk(fmt.Sprintf("rule.%d.actions.0.base_blob.0.tier_to_archive_after_days_since_modification_greater_than", ruleIndex)); ok {
-				if v == nil {
-					baseBlob.TierToArchive = &storage.DateAfterModification{
-						DaysAfterModificationGreaterThan: nil,
-					}
-				} else {
+				if v != nil {
 					baseBlob.TierToArchive = &storage.DateAfterModification{
 						DaysAfterModificationGreaterThan: utils.Float(float64(v.(int))),
 					}
 				}
 			}
 			if v, ok := d.GetOk(fmt.Sprintf("rule.%d.actions.0.base_blob.0.delete_after_days_since_modification_greater_than", ruleIndex)); ok {
-				if v == nil {
-					baseBlob.Delete = &storage.DateAfterModification{
-						DaysAfterModificationGreaterThan: nil,
-					}
-				} else {
+				if v != nil {
 					baseBlob.Delete = &storage.DateAfterModification{
 						DaysAfterModificationGreaterThan: utils.Float(float64(v.(int))),
 					}