Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(storage): add content type, disposition and encoding in v4 storage post policy #2769

Merged
merged 9 commits into from
Sep 17, 2020
Merged

fix(storage): add content type, disposition and encoding in v4 storage post policy #2769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6eaa8b5
fix(storage): add content type, disposition and encoding in v4 storag…
pierreis Aug 24, 2020
88c622d
Merge branch 'master' into patch-1
tritone Sep 15, 2020
8e2f937
unskip post policy test
tritone Sep 16, 2020
02402b3
Merge branch 'master' into patch-1
tritone Sep 16, 2020
bdf0c47
Merge branch 'master' into patch-1
tritone Sep 16, 2020
dfe1e72
Merge branch 'master' into patch-1
tritone Sep 17, 2020
0e7b1c8
Fix field ordering
tritone Sep 17, 2020
656c65d
Merge branch 'patch-1' of https://github.com/pierreis/google-cloud-go…
tritone Sep 17, 2020
5761144
Merge branch 'master' into patch-1
tritone Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions storage/conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ func TestPostPolicyV4Conformance(t *testing.T) {
for _, testFile := range testFiles {
for _, tc := range testFile.PostPolicyV4Tests {
t.Run(tc.Description, func(t *testing.T) {
if tc.Description == "POST Policy With Additional Metadata" {
t.Skip("https://github.com/googleapis/google-cloud-go/issues/2767")
}
pin := tc.PolicyInput
utcNow = func() time.Time {
return time.Unix(pin.GetTimestamp().GetSeconds(), 0).UTC()
Expand Down
10 changes: 8 additions & 2 deletions storage/post_policy_v4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,16 @@ func GenerateSignedPostPolicyV4(bucket, object string, opts *PostPolicyV4Options
conds := make([]PostPolicyV4Condition, len(opts.Conditions))
copy(conds, opts.Conditions)
conds = append(conds,
conditionRedirectToURLOnSuccess(descFields.RedirectToURLOnSuccess),
conditionStatusCodeOnSuccess(descFields.StatusCodeOnSuccess),
// These are ordered lexicographically. Technically the order doesn't matter
// for creating the policy, but we use this order to match the
// cross-language conformance tests for this feature.
&singleValueCondition{"acl", descFields.ACL},
&singleValueCondition{"cache-control", descFields.CacheControl},
&singleValueCondition{"content-disposition", descFields.ContentDisposition},
&singleValueCondition{"content-encoding", descFields.ContentEncoding},
&singleValueCondition{"content-type", descFields.ContentType},
conditionRedirectToURLOnSuccess(descFields.RedirectToURLOnSuccess),
conditionStatusCodeOnSuccess(descFields.StatusCodeOnSuccess),
)

YYYYMMDD := now.Format(yearMonthDay)
Expand Down