vendor: make vendor-update

This commit is contained in:
Aliaksandr Valialkin 2021-12-02 12:42:35 +02:00
parent c0cbf0de2a
commit 9c66848c32
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
9 changed files with 550 additions and 126 deletions

7
go.mod
View file

@ -10,10 +10,11 @@ require (
github.com/VictoriaMetrics/metrics v1.18.1 github.com/VictoriaMetrics/metrics v1.18.1
github.com/VictoriaMetrics/metricsql v0.31.0 github.com/VictoriaMetrics/metricsql v0.31.0
github.com/VividCortex/ewma v1.2.0 // indirect github.com/VividCortex/ewma v1.2.0 // indirect
github.com/aws/aws-sdk-go v1.42.14 github.com/aws/aws-sdk-go v1.42.17
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 github.com/cespare/xxhash/v2 v2.1.2
github.com/cheggaaa/pb/v3 v3.0.8 github.com/cheggaaa/pb/v3 v3.0.8
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/envoyproxy/go-control-plane v0.10.1 // indirect github.com/envoyproxy/go-control-plane v0.10.1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
@ -32,11 +33,11 @@ require (
github.com/valyala/fasttemplate v1.2.1 github.com/valyala/fasttemplate v1.2.1
github.com/valyala/gozstd v1.14.2 github.com/valyala/gozstd v1.14.2
github.com/valyala/quicktemplate v1.7.0 github.com/valyala/quicktemplate v1.7.0
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
google.golang.org/api v0.60.0 google.golang.org/api v0.60.0
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12 // indirect
google.golang.org/grpc v1.42.0 // indirect google.golang.org/grpc v1.42.0 // indirect
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
) )

15
go.sum
View file

@ -154,8 +154,8 @@ github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve
github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
github.com/aws/aws-sdk-go v1.35.31/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.35.31/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go v1.42.14 h1:Eqwjl/cwRY9z0TTU4RGpiElWo9oPzG+Y8r5Thu6Ug5A= github.com/aws/aws-sdk-go v1.42.17 h1:NEMRZcLd+YhXhUqdjwqNGtEYthiUZ+3BudGmK4/0yaA=
github.com/aws/aws-sdk-go v1.42.14/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.42.17/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o=
@ -207,8 +207,9 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 h1:KwaoQzs/WeUxxJqiJsZ4euOly1Az/IgZXXSxlD/UBNk=
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@ -1178,8 +1179,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 h1:0qxwC5n+ttVOINCBeRHO0nq9X7uy8SDsPoi5OaCdIEI= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c=
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -1530,8 +1531,8 @@ google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEc
google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211021150943-2b146023228c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 h1:b9mVrqYfq3P4bCdaLg1qtBnPzUYgglsIdjZkL/fQVOE= google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12 h1:DN5b3HU13J4sMd/QjDx34U6afpaexKTDdop+26pdjdk=
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=

View file

@ -1951,6 +1951,9 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "ap-northeast-2", Region: "ap-northeast-2",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "ap-northeast-3",
}: endpoint{},
endpointKey{ endpointKey{
Region: "ap-south-1", Region: "ap-south-1",
}: endpoint{}, }: endpoint{},
@ -3223,36 +3226,12 @@ var awsPartition = partition{
}, },
"cloudhsm": service{ "cloudhsm": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "eu-west-1", Region: "eu-west-1",
}: endpoint{}, }: endpoint{},
endpointKey{ endpointKey{
Region: "us-east-1", Region: "us-east-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "us-east-2",
}: endpoint{},
endpointKey{
Region: "us-west-1",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
}, },
}, },
"cloudhsmv2": service{ "cloudhsmv2": service{
@ -8132,6 +8111,55 @@ var awsPartition = partition{
}, },
}, },
}, },
"evidently": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "ap-northeast-1",
}: endpoint{
Hostname: "evidently.ap-northeast-1.amazonaws.com",
},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{
Hostname: "evidently.ap-southeast-1.amazonaws.com",
},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{
Hostname: "evidently.ap-southeast-2.amazonaws.com",
},
endpointKey{
Region: "eu-central-1",
}: endpoint{
Hostname: "evidently.eu-central-1.amazonaws.com",
},
endpointKey{
Region: "eu-north-1",
}: endpoint{
Hostname: "evidently.eu-north-1.amazonaws.com",
},
endpointKey{
Region: "eu-west-1",
}: endpoint{
Hostname: "evidently.eu-west-1.amazonaws.com",
},
endpointKey{
Region: "us-east-1",
}: endpoint{
Hostname: "evidently.us-east-1.amazonaws.com",
},
endpointKey{
Region: "us-east-2",
}: endpoint{
Hostname: "evidently.us-east-2.amazonaws.com",
},
endpointKey{
Region: "us-west-2",
}: endpoint{
Hostname: "evidently.us-west-2.amazonaws.com",
},
},
},
"finspace": service{ "finspace": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
@ -10087,6 +10115,67 @@ var awsPartition = partition{
}, },
}, },
}, },
"inspector2": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "ap-east-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-2",
}: endpoint{},
endpointKey{
Region: "ap-south-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
endpointKey{
Region: "eu-north-1",
}: endpoint{},
endpointKey{
Region: "eu-south-1",
}: endpoint{},
endpointKey{
Region: "eu-west-1",
}: endpoint{},
endpointKey{
Region: "eu-west-2",
}: endpoint{},
endpointKey{
Region: "eu-west-3",
}: endpoint{},
endpointKey{
Region: "me-south-1",
}: endpoint{},
endpointKey{
Region: "sa-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-2",
}: endpoint{},
endpointKey{
Region: "us-west-1",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
},
},
"iot": service{ "iot": service{
Defaults: endpointDefaults{ Defaults: endpointDefaults{
defaultKey{}: endpoint{ defaultKey{}: endpoint{
@ -14645,6 +14734,73 @@ var awsPartition = partition{
}, },
}, },
}, },
"rbin": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "af-south-1",
}: endpoint{},
endpointKey{
Region: "ap-east-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-2",
}: endpoint{},
endpointKey{
Region: "ap-northeast-3",
}: endpoint{},
endpointKey{
Region: "ap-south-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
endpointKey{
Region: "eu-north-1",
}: endpoint{},
endpointKey{
Region: "eu-south-1",
}: endpoint{},
endpointKey{
Region: "eu-west-1",
}: endpoint{},
endpointKey{
Region: "eu-west-2",
}: endpoint{},
endpointKey{
Region: "eu-west-3",
}: endpoint{},
endpointKey{
Region: "me-south-1",
}: endpoint{},
endpointKey{
Region: "sa-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-2",
}: endpoint{},
endpointKey{
Region: "us-west-1",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
},
},
"rds": service{ "rds": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
@ -15595,6 +15751,40 @@ var awsPartition = partition{
}: endpoint{}, }: endpoint{},
}, },
}, },
"rum": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
endpointKey{
Region: "eu-north-1",
}: endpoint{},
endpointKey{
Region: "eu-west-1",
}: endpoint{},
endpointKey{
Region: "eu-west-2",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-2",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
},
},
"runtime-v2-lex": service{ "runtime-v2-lex": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
@ -20841,6 +21031,19 @@ var awsPartition = partition{
}, },
}, },
}, },
"workspaces-web": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "eu-west-1",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
},
},
"xray": service{ "xray": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{

View file

@ -5,4 +5,4 @@ package aws
const SDKName = "aws-sdk-go" const SDKName = "aws-sdk-go"
// SDKVersion is the version of this SDK // SDKVersion is the version of this SDK
const SDKVersion = "1.42.14" const SDKVersion = "1.42.17"

View file

@ -420,6 +420,21 @@ func (c *S3) CopyObjectRequest(input *CopyObjectInput) (req *request.Request, ou
// see Access Control List (ACL) Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html) // see Access Control List (ACL) Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html)
// and Managing ACLs Using the REST API (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html). // and Managing ACLs Using the REST API (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html).
// //
// If the bucket that you're copying objects to uses the bucket owner enforced
// setting for S3 Object Ownership, ACLs are disabled and no longer affect permissions.
// Buckets that use this setting only accept PUT requests that don't specify
// an ACL or PUT requests that specify bucket owner full control ACLs, such
// as the bucket-owner-full-control canned ACL or an equivalent form of this
// ACL expressed in the XML format.
//
// For more information, see Controlling ownership of objects and disabling
// ACLs (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// If your bucket uses the bucket owner enforced setting for Object Ownership,
// all objects written to the bucket by any account will be owned by the bucket
// owner.
//
// Storage Class Options // Storage Class Options
// //
// You can use the CopyObject action to change the storage class of an object // You can use the CopyObject action to change the storage class of an object
@ -558,8 +573,19 @@ func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request
// your application must be able to handle 307 redirect. For more information, // your application must be able to handle 307 redirect. For more information,
// see Virtual hosting of buckets (https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html). // see Virtual hosting of buckets (https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html).
// //
// When creating a bucket using this operation, you can optionally specify the // Access control lists (ACLs)
// accounts or groups that should be granted specific permissions on the bucket. //
// When creating a bucket using this operation, you can optionally configure
// the bucket ACL to specify the accounts or groups that should be granted specific
// permissions on the bucket.
//
// If your CreateBucket request includes the BucketOwnerEnforced value for the
// x-amz-object-ownership header, your request can either not specify an ACL
// or specify bucket owner full control ACLs, such as the bucket-owner-full-control
// canned ACL or an equivalent ACL expressed in the XML format. For more information,
// see Controlling object ownership (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// There are two ways to grant the appropriate permissions using the request // There are two ways to grant the appropriate permissions using the request
// headers. // headers.
// //
@ -572,11 +598,11 @@ func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request
// x-amz-grant-read-acp, x-amz-grant-write-acp, and x-amz-grant-full-control // x-amz-grant-read-acp, x-amz-grant-write-acp, and x-amz-grant-full-control
// headers. These headers map to the set of permissions Amazon S3 supports // headers. These headers map to the set of permissions Amazon S3 supports
// in an ACL. For more information, see Access control list (ACL) overview // in an ACL. For more information, see Access control list (ACL) overview
// (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html). You // (https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html).
// specify each grantee as a type=value pair, where the type is one of the // You specify each grantee as a type=value pair, where the type is one of
// following: id if the value specified is the canonical user ID of an // the following: id if the value specified is the canonical user ID
// Amazon Web Services account uri if you are granting permissions to // of an Amazon Web Services account uri if you are granting permissions
// a predefined group emailAddress if the value specified is the email // to a predefined group emailAddress if the value specified is the email
// address of an Amazon Web Services account Using email addresses to specify // address of an Amazon Web Services account Using email addresses to specify
// a grantee is only supported in the following Amazon Web Services Regions: // a grantee is only supported in the following Amazon Web Services Regions:
// US East (N. Virginia) US West (N. California) US West (Oregon) Asia Pacific // US East (N. Virginia) US West (N. California) US West (Oregon) Asia Pacific
@ -593,15 +619,23 @@ func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request
// //
// Permissions // Permissions
// //
// If your CreateBucket request specifies ACL permissions and the ACL is public-read, // In addition to s3:CreateBucket, the following permissions are required when
// public-read-write, authenticated-read, or if you specify access permissions // your CreateBucket includes specific headers:
// explicitly through any other ACL, both s3:CreateBucket and s3:PutBucketAcl
// permissions are needed. If the ACL the CreateBucket request is private, only
// s3:CreateBucket permission is needed.
// //
// If ObjectLockEnabledForBucket is set to true in your CreateBucket request, // * ACLs - If your CreateBucket request specifies ACL permissions and the
// s3:PutBucketObjectLockConfiguration and s3:PutBucketVersioning permissions // ACL is public-read, public-read-write, authenticated-read, or if you specify
// are required. // access permissions explicitly through any other ACL, both s3:CreateBucket
// and s3:PutBucketAcl permissions are needed. If the ACL the CreateBucket
// request is private or doesn't specify any ACLs, only s3:CreateBucket permission
// is needed.
//
// * Object Lock - If ObjectLockEnabledForBucket is set to true in your CreateBucket
// request, s3:PutBucketObjectLockConfiguration and s3:PutBucketVersioning
// permissions are required.
//
// * S3 Object Ownership - If your CreateBucket request includes the the
// x-amz-object-ownership header, s3:PutBucketOwnershipControls permission
// is required.
// //
// The following operations are related to CreateBucket: // The following operations are related to CreateBucket:
// //
@ -1281,17 +1315,16 @@ func (c *S3) DeleteBucketIntelligentTieringConfigurationRequest(input *DeleteBuc
// The S3 Intelligent-Tiering storage class is designed to optimize storage // The S3 Intelligent-Tiering storage class is designed to optimize storage
// costs by automatically moving data to the most cost-effective storage access // costs by automatically moving data to the most cost-effective storage access
// tier, without performance impact or operational overhead. S3 Intelligent-Tiering // tier, without performance impact or operational overhead. S3 Intelligent-Tiering
// delivers automatic cost savings in two low latency and high throughput access // delivers automatic cost savings in three low latency and high throughput
// tiers. For data that can be accessed asynchronously, you can choose to activate // access tiers. To get the lowest storage cost on data that can be accessed
// automatic archiving capabilities within the S3 Intelligent-Tiering storage // in minutes to hours, you can choose to activate additional archiving capabilities.
// class.
// //
// The S3 Intelligent-Tiering storage class is the ideal storage class for data // The S3 Intelligent-Tiering storage class is the ideal storage class for data
// with unknown, changing, or unpredictable access patterns, independent of // with unknown, changing, or unpredictable access patterns, independent of
// object size or retention period. If the size of an object is less than 128 // object size or retention period. If the size of an object is less than 128
// KB, it is not eligible for auto-tiering. Smaller objects can be stored, but // KB, it is not monitored and not eligible for auto-tiering. Smaller objects
// they are always charged at the Frequent Access tier rates in the S3 Intelligent-Tiering // can be stored, but they are always charged at the Frequent Access tier rates
// storage class. // in the S3 Intelligent-Tiering storage class.
// //
// For more information, see Storage class for automatically optimizing frequently // For more information, see Storage class for automatically optimizing frequently
// and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access). // and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access).
@ -2618,6 +2651,12 @@ func (c *S3) GetBucketAclRequest(input *GetBucketAclInput) (req *request.Request
// is granted to the anonymous user, you can return the ACL of the bucket without // is granted to the anonymous user, you can return the ACL of the bucket without
// using an authorization header. // using an authorization header.
// //
// If your bucket uses the bucket owner enforced setting for S3 Object Ownership,
// requests to read ACLs are still supported and return the bucket-owner-full-control
// ACL with the owner being the account that created the bucket. For more information,
// see Controlling object ownership and disabling ACLs (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// Related Resources // Related Resources
// //
// * ListObjects (https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjects.html) // * ListObjects (https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjects.html)
@ -2971,17 +3010,16 @@ func (c *S3) GetBucketIntelligentTieringConfigurationRequest(input *GetBucketInt
// The S3 Intelligent-Tiering storage class is designed to optimize storage // The S3 Intelligent-Tiering storage class is designed to optimize storage
// costs by automatically moving data to the most cost-effective storage access // costs by automatically moving data to the most cost-effective storage access
// tier, without performance impact or operational overhead. S3 Intelligent-Tiering // tier, without performance impact or operational overhead. S3 Intelligent-Tiering
// delivers automatic cost savings in two low latency and high throughput access // delivers automatic cost savings in three low latency and high throughput
// tiers. For data that can be accessed asynchronously, you can choose to activate // access tiers. To get the lowest storage cost on data that can be accessed
// automatic archiving capabilities within the S3 Intelligent-Tiering storage // in minutes to hours, you can choose to activate additional archiving capabilities.
// class.
// //
// The S3 Intelligent-Tiering storage class is the ideal storage class for data // The S3 Intelligent-Tiering storage class is the ideal storage class for data
// with unknown, changing, or unpredictable access patterns, independent of // with unknown, changing, or unpredictable access patterns, independent of
// object size or retention period. If the size of an object is less than 128 // object size or retention period. If the size of an object is less than 128
// KB, it is not eligible for auto-tiering. Smaller objects can be stored, but // KB, it is not monitored and not eligible for auto-tiering. Smaller objects
// they are always charged at the Frequent Access tier rates in the S3 Intelligent-Tiering // can be stored, but they are always charged at the Frequent Access tier rates
// storage class. // in the S3 Intelligent-Tiering storage class.
// //
// For more information, see Storage class for automatically optimizing frequently // For more information, see Storage class for automatically optimizing frequently
// and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access). // and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access).
@ -3809,10 +3847,10 @@ func (c *S3) GetBucketOwnershipControlsRequest(input *GetBucketOwnershipControls
// //
// Retrieves OwnershipControls for an Amazon S3 bucket. To use this operation, // Retrieves OwnershipControls for an Amazon S3 bucket. To use this operation,
// you must have the s3:GetBucketOwnershipControls permission. For more information // you must have the s3:GetBucketOwnershipControls permission. For more information
// about Amazon S3 permissions, see Specifying Permissions in a Policy (https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html). // about Amazon S3 permissions, see Specifying permissions in a policy (https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-with-s3-actions.html).
// //
// For information about Amazon S3 Object Ownership, see Using Object Ownership // For information about Amazon S3 Object Ownership, see Using Object Ownership
// (https://docs.aws.amazon.com/AmazonS3/latest/dev/about-object-ownership.html). // (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html).
// //
// The following operations are related to GetBucketOwnershipControls: // The following operations are related to GetBucketOwnershipControls:
// //
@ -4739,6 +4777,12 @@ func (c *S3) GetObjectAclRequest(input *GetObjectAclInput) (req *request.Request
// By default, GET returns ACL information about the current version of an object. // By default, GET returns ACL information about the current version of an object.
// To return ACL information about a different version, use the versionId subresource. // To return ACL information about a different version, use the versionId subresource.
// //
// If your bucket uses the bucket owner enforced setting for S3 Object Ownership,
// requests to read ACLs are still supported and return the bucket-owner-full-control
// ACL with the owner being the account that created the bucket. For more information,
// see Controlling object ownership and disabling ACLs (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// The following operations are related to GetObjectAcl: // The following operations are related to GetObjectAcl:
// //
// * GetObject (https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html) // * GetObject (https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)
@ -5680,17 +5724,16 @@ func (c *S3) ListBucketIntelligentTieringConfigurationsRequest(input *ListBucket
// The S3 Intelligent-Tiering storage class is designed to optimize storage // The S3 Intelligent-Tiering storage class is designed to optimize storage
// costs by automatically moving data to the most cost-effective storage access // costs by automatically moving data to the most cost-effective storage access
// tier, without performance impact or operational overhead. S3 Intelligent-Tiering // tier, without performance impact or operational overhead. S3 Intelligent-Tiering
// delivers automatic cost savings in two low latency and high throughput access // delivers automatic cost savings in three low latency and high throughput
// tiers. For data that can be accessed asynchronously, you can choose to activate // access tiers. To get the lowest storage cost on data that can be accessed
// automatic archiving capabilities within the S3 Intelligent-Tiering storage // in minutes to hours, you can choose to activate additional archiving capabilities.
// class.
// //
// The S3 Intelligent-Tiering storage class is the ideal storage class for data // The S3 Intelligent-Tiering storage class is the ideal storage class for data
// with unknown, changing, or unpredictable access patterns, independent of // with unknown, changing, or unpredictable access patterns, independent of
// object size or retention period. If the size of an object is less than 128 // object size or retention period. If the size of an object is less than 128
// KB, it is not eligible for auto-tiering. Smaller objects can be stored, but // KB, it is not monitored and not eligible for auto-tiering. Smaller objects
// they are always charged at the Frequent Access tier rates in the S3 Intelligent-Tiering // can be stored, but they are always charged at the Frequent Access tier rates
// storage class. // in the S3 Intelligent-Tiering storage class.
// //
// For more information, see Storage class for automatically optimizing frequently // For more information, see Storage class for automatically optimizing frequently
// and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access). // and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access).
@ -6985,6 +7028,14 @@ func (c *S3) PutBucketAclRequest(input *PutBucketAclInput) (req *request.Request
// existing application that updates a bucket ACL using the request body, then // existing application that updates a bucket ACL using the request body, then
// you can continue to use that approach. // you can continue to use that approach.
// //
// If your bucket uses the bucket owner enforced setting for S3 Object Ownership,
// ACLs are disabled and no longer affect permissions. You must use policies
// to grant access to your bucket and the objects in it. Requests to set ACLs
// or update ACLs fail and return the AccessControlListNotSupported error code.
// Requests to read ACLs are still supported. For more information, see Controlling
// object ownership (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// Access Permissions // Access Permissions
// //
// You can set access permissions using one of the following methods: // You can set access permissions using one of the following methods:
@ -7479,17 +7530,16 @@ func (c *S3) PutBucketIntelligentTieringConfigurationRequest(input *PutBucketInt
// The S3 Intelligent-Tiering storage class is designed to optimize storage // The S3 Intelligent-Tiering storage class is designed to optimize storage
// costs by automatically moving data to the most cost-effective storage access // costs by automatically moving data to the most cost-effective storage access
// tier, without performance impact or operational overhead. S3 Intelligent-Tiering // tier, without performance impact or operational overhead. S3 Intelligent-Tiering
// delivers automatic cost savings in two low latency and high throughput access // delivers automatic cost savings in three low latency and high throughput
// tiers. For data that can be accessed asynchronously, you can choose to activate // access tiers. To get the lowest storage cost on data that can be accessed
// automatic archiving capabilities within the S3 Intelligent-Tiering storage // in minutes to hours, you can choose to activate additional archiving capabilities.
// class.
// //
// The S3 Intelligent-Tiering storage class is the ideal storage class for data // The S3 Intelligent-Tiering storage class is the ideal storage class for data
// with unknown, changing, or unpredictable access patterns, independent of // with unknown, changing, or unpredictable access patterns, independent of
// object size or retention period. If the size of an object is less than 128 // object size or retention period. If the size of an object is less than 128
// KB, it is not eligible for auto-tiering. Smaller objects can be stored, but // KB, it is not monitored and not eligible for auto-tiering. Smaller objects
// they are always charged at the Frequent Access tier rates in the S3 Intelligent-Tiering // can be stored, but they are always charged at the Frequent Access tier rates
// storage class. // in the S3 Intelligent-Tiering storage class.
// //
// For more information, see Storage class for automatically optimizing frequently // For more information, see Storage class for automatically optimizing frequently
// and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access). // and infrequently accessed objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html#sc-dynamic-data-access).
@ -8003,6 +8053,12 @@ func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request
// the Grantee request element to grant access to other people. The Permissions // the Grantee request element to grant access to other people. The Permissions
// request element specifies the kind of access the grantee has to the logs. // request element specifies the kind of access the grantee has to the logs.
// //
// If the target bucket for log delivery uses the bucket owner enforced setting
// for S3 Object Ownership, you can't use the Grantee request element to grant
// access to others. Permissions can only be granted using policies. For more
// information, see Permissions for server access log delivery (https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html#grant-log-delivery-permissions-general)
// in the Amazon S3 User Guide.
//
// Grantee Values // Grantee Values
// //
// You can specify the person (grantee) to whom you're assigning access rights // You can specify the person (grantee) to whom you're assigning access rights
@ -8026,7 +8082,8 @@ func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request
// <BucketLoggingStatus xmlns="http://doc.s3.amazonaws.com/2006-03-01" /> // <BucketLoggingStatus xmlns="http://doc.s3.amazonaws.com/2006-03-01" />
// //
// For more information about server access logging, see Server Access Logging // For more information about server access logging, see Server Access Logging
// (https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerLogs.html). // (https://docs.aws.amazon.com/AmazonS3/latest/userguide/ServerLogs.html) in
// the Amazon S3 User Guide.
// //
// For more information about creating a bucket, see CreateBucket (https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html). // For more information about creating a bucket, see CreateBucket (https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html).
// For more information about returning the logging status of a bucket, see // For more information about returning the logging status of a bucket, see
@ -8435,11 +8492,11 @@ func (c *S3) PutBucketOwnershipControlsRequest(input *PutBucketOwnershipControls
// //
// Creates or modifies OwnershipControls for an Amazon S3 bucket. To use this // Creates or modifies OwnershipControls for an Amazon S3 bucket. To use this
// operation, you must have the s3:PutBucketOwnershipControls permission. For // operation, you must have the s3:PutBucketOwnershipControls permission. For
// more information about Amazon S3 permissions, see Specifying Permissions // more information about Amazon S3 permissions, see Specifying permissions
// in a Policy (https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html). // in a policy (https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-with-s3-actions.html).
// //
// For information about Amazon S3 Object Ownership, see Using Object Ownership // For information about Amazon S3 Object Ownership, see Using object ownership
// (https://docs.aws.amazon.com/AmazonS3/latest/dev/about-object-ownership.html). // (https://docs.aws.amazon.com/AmazonS3/latest/user-guide/about-object-ownership.html).
// //
// The following operations are related to PutBucketOwnershipControls: // The following operations are related to PutBucketOwnershipControls:
// //
@ -9277,6 +9334,23 @@ func (c *S3) PutObjectRequest(input *PutObjectInput) (req *request.Request, outp
// Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html) // Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html)
// and Managing ACLs Using the REST API (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html). // and Managing ACLs Using the REST API (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html).
// //
// If the bucket that you're uploading objects to uses the bucket owner enforced
// setting for S3 Object Ownership, ACLs are disabled and no longer affect permissions.
// Buckets that use this setting only accept PUT requests that don't specify
// an ACL or PUT requests that specify bucket owner full control ACLs, such
// as the bucket-owner-full-control canned ACL or an equivalent form of this
// ACL expressed in the XML format. PUT requests that contain other ACLs (for
// example, custom grants to certain Amazon Web Services accounts) fail and
// return a 400 error with the error code AccessControlListNotSupported.
//
// For more information, see Controlling ownership of objects and disabling
// ACLs (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// If your bucket uses the bucket owner enforced setting for Object Ownership,
// all objects written to the bucket by any account will be owned by the bucket
// owner.
//
// Storage Class Options // Storage Class Options
// //
// By default, Amazon S3 uses the STANDARD Storage Class to store newly created // By default, Amazon S3 uses the STANDARD Storage Class to store newly created
@ -9396,6 +9470,14 @@ func (c *S3) PutObjectAclRequest(input *PutObjectAclInput) (req *request.Request
// Control List (ACL) Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html) // Control List (ACL) Overview (https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html)
// in the Amazon S3 User Guide. // in the Amazon S3 User Guide.
// //
// If your bucket uses the bucket owner enforced setting for S3 Object Ownership,
// ACLs are disabled and no longer affect permissions. You must use policies
// to grant access to your bucket and the objects in it. Requests to set ACLs
// or update ACLs fail and return the AccessControlListNotSupported error code.
// Requests to read ACLs are still supported. For more information, see Controlling
// object ownership (https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
// in the Amazon S3 User Guide.
//
// Access Permissions // Access Permissions
// //
// You can set access permissions using one of the following methods: // You can set access permissions using one of the following methods:
@ -13734,6 +13816,22 @@ type CreateBucketInput struct {
// Specifies whether you want S3 Object Lock to be enabled for the new bucket. // Specifies whether you want S3 Object Lock to be enabled for the new bucket.
ObjectLockEnabledForBucket *bool `location:"header" locationName:"x-amz-bucket-object-lock-enabled" type:"boolean"` ObjectLockEnabledForBucket *bool `location:"header" locationName:"x-amz-bucket-object-lock-enabled" type:"boolean"`
// The container element for object ownership for a bucket's ownership controls.
//
// BucketOwnerPreferred - Objects uploaded to the bucket change ownership to
// the bucket owner if the objects are uploaded with the bucket-owner-full-control
// canned ACL.
//
// ObjectWriter - The uploading account will own the object if the object is
// uploaded with the bucket-owner-full-control canned ACL.
//
// BucketOwnerEnforced - Access control lists (ACLs) are disabled and no longer
// affect permissions. The bucket owner automatically owns and has full control
// over every object in the bucket. The bucket only accepts PUT requests that
// don't specify an ACL or bucket owner full control ACLs, such as the bucket-owner-full-control
// canned ACL or an equivalent form of this ACL expressed in the XML format.
ObjectOwnership *string `location:"header" locationName:"x-amz-object-ownership" type:"string" enum:"ObjectOwnership"`
} }
// String returns the string representation. // String returns the string representation.
@ -13831,6 +13929,12 @@ func (s *CreateBucketInput) SetObjectLockEnabledForBucket(v bool) *CreateBucketI
return s return s
} }
// SetObjectOwnership sets the ObjectOwnership field's value.
func (s *CreateBucketInput) SetObjectOwnership(v string) *CreateBucketInput {
s.ObjectOwnership = &v
return s
}
type CreateBucketOutput struct { type CreateBucketOutput struct {
_ struct{} `type:"structure"` _ struct{} `type:"structure"`
@ -17821,6 +17925,29 @@ func (s *ErrorDocument) SetKey(v string) *ErrorDocument {
return s return s
} }
// A container for specifying the configuration for Amazon EventBridge.
type EventBridgeConfiguration struct {
_ struct{} `type:"structure"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s EventBridgeConfiguration) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s EventBridgeConfiguration) GoString() string {
return s.String()
}
// Optional configuration to replicate existing source bucket objects. For more // Optional configuration to replicate existing source bucket objects. For more
// information, see Replicating Existing Objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication) // information, see Replicating Existing Objects (https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication)
// in the Amazon S3 User Guide. // in the Amazon S3 User Guide.
@ -19667,8 +19794,8 @@ func (s GetBucketOwnershipControlsInput) updateArnableField(v string) (interface
type GetBucketOwnershipControlsOutput struct { type GetBucketOwnershipControlsOutput struct {
_ struct{} `type:"structure" payload:"OwnershipControls"` _ struct{} `type:"structure" payload:"OwnershipControls"`
// The OwnershipControls (BucketOwnerPreferred or ObjectWriter) currently in // The OwnershipControls (BucketOwnerEnforced, BucketOwnerPreferred, or ObjectWriter)
// effect for this Amazon S3 bucket. // currently in effect for this Amazon S3 bucket.
OwnershipControls *OwnershipControls `type:"structure"` OwnershipControls *OwnershipControls `type:"structure"`
} }
@ -27454,6 +27581,11 @@ type LoggingEnabled struct {
TargetBucket *string `type:"string" required:"true"` TargetBucket *string `type:"string" required:"true"`
// Container for granting information. // Container for granting information.
//
// Buckets that use the bucket owner enforced setting for Object Ownership don't
// support target grants. For more information, see Permissions for server access
// log delivery (https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html#grant-log-delivery-permissions-general)
// in the Amazon S3 User Guide.
TargetGrants []*TargetGrant `locationNameList:"Grant" type:"list"` TargetGrants []*TargetGrant `locationNameList:"Grant" type:"list"`
// A prefix for all log object keys. If you store log files from multiple Amazon // A prefix for all log object keys. If you store log files from multiple Amazon
@ -27980,12 +28112,12 @@ func (s *NoncurrentVersionExpiration) SetNoncurrentDays(v int64) *NoncurrentVers
} }
// Container for the transition rule that describes when noncurrent objects // Container for the transition rule that describes when noncurrent objects
// transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, // transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER_IR,
// or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled (or versioning // GLACIER, or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled
// is suspended), you can set this action to request that Amazon S3 transition // (or versioning is suspended), you can set this action to request that Amazon
// noncurrent object versions to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, // S3 transition noncurrent object versions to the STANDARD_IA, ONEZONE_IA,
// GLACIER, or DEEP_ARCHIVE storage class at a specific period in the object's // INTELLIGENT_TIERING, GLACIER_IR, GLACIER, or DEEP_ARCHIVE storage class at
// lifetime. // a specific period in the object's lifetime.
type NoncurrentVersionTransition struct { type NoncurrentVersionTransition struct {
_ struct{} `type:"structure"` _ struct{} `type:"structure"`
@ -28048,6 +28180,9 @@ func (s *NoncurrentVersionTransition) SetStorageClass(v string) *NoncurrentVersi
type NotificationConfiguration struct { type NotificationConfiguration struct {
_ struct{} `type:"structure"` _ struct{} `type:"structure"`
// Enables delivery of events to Amazon EventBridge.
EventBridgeConfiguration *EventBridgeConfiguration `type:"structure"`
// Describes the Lambda functions to invoke and the events for which to invoke // Describes the Lambda functions to invoke and the events for which to invoke
// them. // them.
LambdaFunctionConfigurations []*LambdaFunctionConfiguration `locationName:"CloudFunctionConfiguration" type:"list" flattened:"true"` LambdaFunctionConfigurations []*LambdaFunctionConfiguration `locationName:"CloudFunctionConfiguration" type:"list" flattened:"true"`
@ -28119,6 +28254,12 @@ func (s *NotificationConfiguration) Validate() error {
return nil return nil
} }
// SetEventBridgeConfiguration sets the EventBridgeConfiguration field's value.
func (s *NotificationConfiguration) SetEventBridgeConfiguration(v *EventBridgeConfiguration) *NotificationConfiguration {
s.EventBridgeConfiguration = v
return s
}
// SetLambdaFunctionConfigurations sets the LambdaFunctionConfigurations field's value. // SetLambdaFunctionConfigurations sets the LambdaFunctionConfigurations field's value.
func (s *NotificationConfiguration) SetLambdaFunctionConfigurations(v []*LambdaFunctionConfiguration) *NotificationConfiguration { func (s *NotificationConfiguration) SetLambdaFunctionConfigurations(v []*LambdaFunctionConfiguration) *NotificationConfiguration {
s.LambdaFunctionConfigurations = v s.LambdaFunctionConfigurations = v
@ -28830,6 +28971,12 @@ type OwnershipControlsRule struct {
// ObjectWriter - The uploading account will own the object if the object is // ObjectWriter - The uploading account will own the object if the object is
// uploaded with the bucket-owner-full-control canned ACL. // uploaded with the bucket-owner-full-control canned ACL.
// //
// BucketOwnerEnforced - Access control lists (ACLs) are disabled and no longer
// affect permissions. The bucket owner automatically owns and has full control
// over every object in the bucket. The bucket only accepts PUT requests that
// don't specify an ACL or bucket owner full control ACLs, such as the bucket-owner-full-control
// canned ACL or an equivalent form of this ACL expressed in the XML format.
//
// ObjectOwnership is a required field // ObjectOwnership is a required field
ObjectOwnership *string `type:"string" required:"true" enum:"ObjectOwnership"` ObjectOwnership *string `type:"string" required:"true" enum:"ObjectOwnership"`
} }
@ -30780,6 +30927,10 @@ type PutBucketNotificationConfigurationInput struct {
// //
// NotificationConfiguration is a required field // NotificationConfiguration is a required field
NotificationConfiguration *NotificationConfiguration `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"` NotificationConfiguration *NotificationConfiguration `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
// Skips validation of Amazon SQS, Amazon SNS, and Lambda destinations. True
// or false value.
SkipDestinationValidation *bool `location:"header" locationName:"x-amz-skip-destination-validation" type:"boolean"`
} }
// String returns the string representation. // String returns the string representation.
@ -30849,6 +31000,12 @@ func (s *PutBucketNotificationConfigurationInput) SetNotificationConfiguration(v
return s return s
} }
// SetSkipDestinationValidation sets the SkipDestinationValidation field's value.
func (s *PutBucketNotificationConfigurationInput) SetSkipDestinationValidation(v bool) *PutBucketNotificationConfigurationInput {
s.SkipDestinationValidation = &v
return s
}
func (s *PutBucketNotificationConfigurationInput) getEndpointARN() (arn.Resource, error) { func (s *PutBucketNotificationConfigurationInput) getEndpointARN() (arn.Resource, error) {
if s.Bucket == nil { if s.Bucket == nil {
return nil, fmt.Errorf("member Bucket is nil") return nil, fmt.Errorf("member Bucket is nil")
@ -31041,8 +31198,8 @@ type PutBucketOwnershipControlsInput struct {
// error. // error.
ExpectedBucketOwner *string `location:"header" locationName:"x-amz-expected-bucket-owner" type:"string"` ExpectedBucketOwner *string `location:"header" locationName:"x-amz-expected-bucket-owner" type:"string"`
// The OwnershipControls (BucketOwnerPreferred or ObjectWriter) that you want // The OwnershipControls (BucketOwnerEnforced, BucketOwnerPreferred, or ObjectWriter)
// to apply to this Amazon S3 bucket. // that you want to apply to this Amazon S3 bucket.
// //
// OwnershipControls is a required field // OwnershipControls is a required field
OwnershipControls *OwnershipControls `locationName:"OwnershipControls" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"` OwnershipControls *OwnershipControls `locationName:"OwnershipControls" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
@ -35162,12 +35319,12 @@ type Rule struct {
NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"` NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"`
// Container for the transition rule that describes when noncurrent objects // Container for the transition rule that describes when noncurrent objects
// transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, // transition to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER_IR,
// or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled (or versioning // GLACIER, or DEEP_ARCHIVE storage class. If your bucket is versioning-enabled
// is suspended), you can set this action to request that Amazon S3 transition // (or versioning is suspended), you can set this action to request that Amazon
// noncurrent object versions to the STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, // S3 transition noncurrent object versions to the STANDARD_IA, ONEZONE_IA,
// GLACIER, or DEEP_ARCHIVE storage class at a specific period in the object's // INTELLIGENT_TIERING, GLACIER_IR, GLACIER, or DEEP_ARCHIVE storage class at
// lifetime. // a specific period in the object's lifetime.
NoncurrentVersionTransition *NoncurrentVersionTransition `type:"structure"` NoncurrentVersionTransition *NoncurrentVersionTransition `type:"structure"`
// Object key prefix that identifies one or more objects to which this rule // Object key prefix that identifies one or more objects to which this rule
@ -36623,6 +36780,11 @@ func (s *Tagging) SetTagSet(v []*Tag) *Tagging {
} }
// Container for granting information. // Container for granting information.
//
// Buckets that use the bucket owner enforced setting for Object Ownership don't
// support target grants. For more information, see Permissions server access
// log delivery (https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html#grant-log-delivery-permissions-general)
// in the Amazon S3 User Guide.
type TargetGrant struct { type TargetGrant struct {
_ struct{} `type:"structure"` _ struct{} `type:"structure"`
@ -38691,6 +38853,36 @@ const (
// EventS3ReplicationOperationReplicatedAfterThreshold is a Event enum value // EventS3ReplicationOperationReplicatedAfterThreshold is a Event enum value
EventS3ReplicationOperationReplicatedAfterThreshold = "s3:Replication:OperationReplicatedAfterThreshold" EventS3ReplicationOperationReplicatedAfterThreshold = "s3:Replication:OperationReplicatedAfterThreshold"
// EventS3ObjectRestoreDelete is a Event enum value
EventS3ObjectRestoreDelete = "s3:ObjectRestore:Delete"
// EventS3LifecycleTransition is a Event enum value
EventS3LifecycleTransition = "s3:LifecycleTransition"
// EventS3IntelligentTiering is a Event enum value
EventS3IntelligentTiering = "s3:IntelligentTiering"
// EventS3ObjectAclPut is a Event enum value
EventS3ObjectAclPut = "s3:ObjectAcl:Put"
// EventS3LifecycleExpiration is a Event enum value
EventS3LifecycleExpiration = "s3:LifecycleExpiration:*"
// EventS3LifecycleExpirationDelete is a Event enum value
EventS3LifecycleExpirationDelete = "s3:LifecycleExpiration:Delete"
// EventS3LifecycleExpirationDeleteMarkerCreated is a Event enum value
EventS3LifecycleExpirationDeleteMarkerCreated = "s3:LifecycleExpiration:DeleteMarkerCreated"
// EventS3ObjectTagging is a Event enum value
EventS3ObjectTagging = "s3:ObjectTagging:*"
// EventS3ObjectTaggingPut is a Event enum value
EventS3ObjectTaggingPut = "s3:ObjectTagging:Put"
// EventS3ObjectTaggingDelete is a Event enum value
EventS3ObjectTaggingDelete = "s3:ObjectTagging:Delete"
) )
// Event_Values returns all elements of the Event enum // Event_Values returns all elements of the Event enum
@ -38713,6 +38905,16 @@ func Event_Values() []string {
EventS3ReplicationOperationNotTracked, EventS3ReplicationOperationNotTracked,
EventS3ReplicationOperationMissedThreshold, EventS3ReplicationOperationMissedThreshold,
EventS3ReplicationOperationReplicatedAfterThreshold, EventS3ReplicationOperationReplicatedAfterThreshold,
EventS3ObjectRestoreDelete,
EventS3LifecycleTransition,
EventS3IntelligentTiering,
EventS3ObjectAclPut,
EventS3LifecycleExpiration,
EventS3LifecycleExpirationDelete,
EventS3LifecycleExpirationDeleteMarkerCreated,
EventS3ObjectTagging,
EventS3ObjectTaggingPut,
EventS3ObjectTaggingDelete,
} }
} }
@ -39120,12 +39322,21 @@ func ObjectLockRetentionMode_Values() []string {
// //
// ObjectWriter - The uploading account will own the object if the object is // ObjectWriter - The uploading account will own the object if the object is
// uploaded with the bucket-owner-full-control canned ACL. // uploaded with the bucket-owner-full-control canned ACL.
//
// BucketOwnerEnforced - Access control lists (ACLs) are disabled and no longer
// affect permissions. The bucket owner automatically owns and has full control
// over every object in the bucket. The bucket only accepts PUT requests that
// don't specify an ACL or bucket owner full control ACLs, such as the bucket-owner-full-control
// canned ACL or an equivalent form of this ACL expressed in the XML format.
const ( const (
// ObjectOwnershipBucketOwnerPreferred is a ObjectOwnership enum value // ObjectOwnershipBucketOwnerPreferred is a ObjectOwnership enum value
ObjectOwnershipBucketOwnerPreferred = "BucketOwnerPreferred" ObjectOwnershipBucketOwnerPreferred = "BucketOwnerPreferred"
// ObjectOwnershipObjectWriter is a ObjectOwnership enum value // ObjectOwnershipObjectWriter is a ObjectOwnership enum value
ObjectOwnershipObjectWriter = "ObjectWriter" ObjectOwnershipObjectWriter = "ObjectWriter"
// ObjectOwnershipBucketOwnerEnforced is a ObjectOwnership enum value
ObjectOwnershipBucketOwnerEnforced = "BucketOwnerEnforced"
) )
// ObjectOwnership_Values returns all elements of the ObjectOwnership enum // ObjectOwnership_Values returns all elements of the ObjectOwnership enum
@ -39133,6 +39344,7 @@ func ObjectOwnership_Values() []string {
return []string{ return []string{
ObjectOwnershipBucketOwnerPreferred, ObjectOwnershipBucketOwnerPreferred,
ObjectOwnershipObjectWriter, ObjectOwnershipObjectWriter,
ObjectOwnershipBucketOwnerEnforced,
} }
} }
@ -39160,6 +39372,9 @@ const (
// ObjectStorageClassOutposts is a ObjectStorageClass enum value // ObjectStorageClassOutposts is a ObjectStorageClass enum value
ObjectStorageClassOutposts = "OUTPOSTS" ObjectStorageClassOutposts = "OUTPOSTS"
// ObjectStorageClassGlacierIr is a ObjectStorageClass enum value
ObjectStorageClassGlacierIr = "GLACIER_IR"
) )
// ObjectStorageClass_Values returns all elements of the ObjectStorageClass enum // ObjectStorageClass_Values returns all elements of the ObjectStorageClass enum
@ -39173,6 +39388,7 @@ func ObjectStorageClass_Values() []string {
ObjectStorageClassIntelligentTiering, ObjectStorageClassIntelligentTiering,
ObjectStorageClassDeepArchive, ObjectStorageClassDeepArchive,
ObjectStorageClassOutposts, ObjectStorageClassOutposts,
ObjectStorageClassGlacierIr,
} }
} }
@ -39447,6 +39663,9 @@ const (
// StorageClassOutposts is a StorageClass enum value // StorageClassOutposts is a StorageClass enum value
StorageClassOutposts = "OUTPOSTS" StorageClassOutposts = "OUTPOSTS"
// StorageClassGlacierIr is a StorageClass enum value
StorageClassGlacierIr = "GLACIER_IR"
) )
// StorageClass_Values returns all elements of the StorageClass enum // StorageClass_Values returns all elements of the StorageClass enum
@ -39460,6 +39679,7 @@ func StorageClass_Values() []string {
StorageClassGlacier, StorageClassGlacier,
StorageClassDeepArchive, StorageClassDeepArchive,
StorageClassOutposts, StorageClassOutposts,
StorageClassGlacierIr,
} }
} }
@ -39526,6 +39746,9 @@ const (
// TransitionStorageClassDeepArchive is a TransitionStorageClass enum value // TransitionStorageClassDeepArchive is a TransitionStorageClass enum value
TransitionStorageClassDeepArchive = "DEEP_ARCHIVE" TransitionStorageClassDeepArchive = "DEEP_ARCHIVE"
// TransitionStorageClassGlacierIr is a TransitionStorageClass enum value
TransitionStorageClassGlacierIr = "GLACIER_IR"
) )
// TransitionStorageClass_Values returns all elements of the TransitionStorageClass enum // TransitionStorageClass_Values returns all elements of the TransitionStorageClass enum
@ -39536,6 +39759,7 @@ func TransitionStorageClass_Values() []string {
TransitionStorageClassOnezoneIa, TransitionStorageClassOnezoneIa,
TransitionStorageClassIntelligentTiering, TransitionStorageClassIntelligentTiering,
TransitionStorageClassDeepArchive, TransitionStorageClassDeepArchive,
TransitionStorageClassGlacierIr,
} }
} }

View file

@ -706,7 +706,7 @@ var file_xds_type_matcher_v3_matcher_proto_rawDesc = []byte{
0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x72, 0x69, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x72, 0x69,
0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x22, 0x85, 0x10, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4d, 0x0a, 0x6f, 0x22, 0x80, 0x10, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4d, 0x0a,
0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d,
0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
@ -833,14 +833,14 @@ var file_xds_type_matcher_v3_matcher_proto_rawDesc = []byte{
0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x76, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65, 0x65, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65, 0x65,
0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x08, 0xd2, 0xc6, 0xa4, 0xe1, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x08, 0xd2, 0xc6, 0xa4, 0xe1,
0x06, 0x02, 0x08, 0x01, 0x42, 0x13, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x06, 0x02, 0x08, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f,
0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x5c, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x74, 0x79, 0x70, 0x65, 0x42, 0x5c, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68,
0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x75, 0x62, 0x2e, 0x78, 0x64, 0x73, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x50,
0x63, 0x68, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x63, 0x66, 0x2f, 0x78, 0x64, 0x73, 0x6f, 0x6d, 0x2f, 0x63, 0x6e, 0x63, 0x66, 0x2f, 0x78, 0x64, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x78,
0x2f, 0x67, 0x6f, 0x2f, 0x78, 0x64, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x64, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f,
0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

View file

@ -76,12 +76,6 @@ func (m *Matcher) Validate() error {
} }
} }
default:
return MatcherValidationError{
field: "MatcherType",
reason: "value is required",
}
} }
return nil return nil

View file

@ -1252,12 +1252,12 @@ func (cs *clientStream) writeRequest(req *http.Request) (err error) {
} }
continueTimeout := cc.t.expectContinueTimeout() continueTimeout := cc.t.expectContinueTimeout()
if continueTimeout != 0 && if continueTimeout != 0 {
!httpguts.HeaderValuesContainsToken( if !httpguts.HeaderValuesContainsToken(req.Header["Expect"], "100-continue") {
req.Header["Expect"], continueTimeout = 0
"100-continue") { } else {
continueTimeout = 0 cs.on100 = make(chan struct{}, 1)
cs.on100 = make(chan struct{}, 1) }
} }
// Past this point (where we send request headers), it is possible for // Past this point (where we send request headers), it is possible for

9
vendor/modules.txt vendored
View file

@ -28,7 +28,7 @@ github.com/VictoriaMetrics/metricsql/binaryop
# github.com/VividCortex/ewma v1.2.0 # github.com/VividCortex/ewma v1.2.0
## explicit ## explicit
github.com/VividCortex/ewma github.com/VividCortex/ewma
# github.com/aws/aws-sdk-go v1.42.14 # github.com/aws/aws-sdk-go v1.42.17
## explicit ## explicit
github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/arn
@ -96,7 +96,8 @@ github.com/cheggaaa/pb/v3
github.com/cheggaaa/pb/v3/termutil github.com/cheggaaa/pb/v3/termutil
# github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 # github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4
github.com/cncf/udpa/go/udpa/type/v1 github.com/cncf/udpa/go/udpa/type/v1
# github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 # github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490
## explicit
github.com/cncf/xds/go/udpa/annotations github.com/cncf/xds/go/udpa/annotations
github.com/cncf/xds/go/udpa/type/v1 github.com/cncf/xds/go/udpa/type/v1
github.com/cncf/xds/go/xds/annotations/v3 github.com/cncf/xds/go/xds/annotations/v3
@ -303,7 +304,7 @@ go.opencensus.io/trace/propagation
go.opencensus.io/trace/tracestate go.opencensus.io/trace/tracestate
# go.uber.org/atomic v1.9.0 # go.uber.org/atomic v1.9.0
go.uber.org/atomic go.uber.org/atomic
# golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 # golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c
## explicit ## explicit
golang.org/x/net/context golang.org/x/net/context
golang.org/x/net/context/ctxhttp golang.org/x/net/context/ctxhttp
@ -372,7 +373,7 @@ google.golang.org/appengine/internal/socket
google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/internal/urlfetch
google.golang.org/appengine/socket google.golang.org/appengine/socket
google.golang.org/appengine/urlfetch google.golang.org/appengine/urlfetch
# google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 # google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12
## explicit ## explicit
google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/api/expr/v1alpha1 google.golang.org/genproto/googleapis/api/expr/v1alpha1