fix(storage): disable soft delete policy using 0 retentionDurationSeconds (#11226)

frankyn · web-flow · commit f087721b7b20 · 2024-12-04T19:15:54.000-05:00
diff --git a/storage/bucket.go b/storage/bucket.go
@@ -1341,8 +1341,10 @@ func (ua *BucketAttrsToUpdate) toRawBucket() *raw.Bucket {
 	}
 	if ua.SoftDeletePolicy != nil {
 		if ua.SoftDeletePolicy.RetentionDuration == 0 {
-			rb.NullFields = append(rb.NullFields, "SoftDeletePolicy")
-			rb.SoftDeletePolicy = nil
+			rb.SoftDeletePolicy = &raw.BucketSoftDeletePolicy{
+				RetentionDurationSeconds: 0,
+				ForceSendFields:          []string{"RetentionDurationSeconds"},
+			}
 		} else {
 			rb.SoftDeletePolicy = ua.SoftDeletePolicy.toRawSoftDeletePolicy()
 		}
diff --git a/storage/bucket_test.go b/storage/bucket_test.go
@@ -479,7 +479,10 @@ func TestBucketAttrsToUpdateToRawBucket(t *testing.T) {
 	}
 	got = au3.toRawBucket()
 	want = &raw.Bucket{
-		NullFields: []string{"RetentionPolicy", "Encryption", "Logging", "Website", "SoftDeletePolicy"},
+		NullFields: []string{"RetentionPolicy", "Encryption", "Logging", "Website"},
+		SoftDeletePolicy: &raw.BucketSoftDeletePolicy{
+			ForceSendFields: []string{"RetentionDurationSeconds"},
+		},
 	}
 	if msg := testutil.Diff(got, want); msg != "" {
 		t.Error(msg)

Original file line number	Diff line number	Diff line change
`@@ -1341,8 +1341,10 @@ func (ua BucketAttrsToUpdate) toRawBucket() raw.Bucket {`
`1341`	`1341`	`}`
`1342`	`1342`	`if ua.SoftDeletePolicy != nil {`
`1343`	`1343`	`if ua.SoftDeletePolicy.RetentionDuration == 0 {`
`1344`		`- rb.NullFields = append(rb.NullFields, "SoftDeletePolicy")`
`1345`		`- rb.SoftDeletePolicy = nil`
	`1344`	`+ rb.SoftDeletePolicy = &raw.BucketSoftDeletePolicy{`
	`1345`	`+ RetentionDurationSeconds: 0,`
	`1346`	`+ ForceSendFields: []string{"RetentionDurationSeconds"},`
	`1347`	`+ }`
`1346`	`1348`	`} else {`
`1347`	`1349`	`rb.SoftDeletePolicy = ua.SoftDeletePolicy.toRawSoftDeletePolicy()`
`1348`	`1350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,10 @@ func TestBucketAttrsToUpdateToRawBucket(t *testing.T) {`
`479`	`479`	`}`
`480`	`480`	`got = au3.toRawBucket()`
`481`	`481`	`want = &raw.Bucket{`
`482`		`- NullFields: []string{"RetentionPolicy", "Encryption", "Logging", "Website", "SoftDeletePolicy"},`
	`482`	`+ NullFields: []string{"RetentionPolicy", "Encryption", "Logging", "Website"},`
	`483`	`+ SoftDeletePolicy: &raw.BucketSoftDeletePolicy{`
	`484`	`+ ForceSendFields: []string{"RetentionDurationSeconds"},`
	`485`	`+ },`
`483`	`486`	`}`
`484`	`487`	`if msg := testutil.Diff(got, want); msg != "" {`
`485`	`488`	`t.Error(msg)`