forked from TrueCloudLab/frostfs-s3-gw
[#316] Remove minio mentions in commits
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
parent
e5a256df0c
commit
bffc09167a
5 changed files with 6 additions and 20 deletions
|
@ -651,18 +651,12 @@ var errorCodes = errorCodeMap{
|
||||||
Description: "X-Amz-Date must be in the ISO8601 Long Format \"yyyyMMdd'T'HHmmss'Z'\"",
|
Description: "X-Amz-Date must be in the ISO8601 Long Format \"yyyyMMdd'T'HHmmss'Z'\"",
|
||||||
HTTPStatusCode: http.StatusBadRequest,
|
HTTPStatusCode: http.StatusBadRequest,
|
||||||
},
|
},
|
||||||
// FIXME: Should contain the invalid param set as seen in https://github.com/minio/minio/issues/2385.
|
|
||||||
// right Description: "Error parsing the X-Amz-Credential parameter; incorrect date format \"%s\". This date in the credential must be in the format \"yyyyMMdd\".",
|
|
||||||
// Need changes to make sure variable messages can be constructed.
|
|
||||||
ErrMalformedCredentialDate: {
|
ErrMalformedCredentialDate: {
|
||||||
ErrCode: ErrMalformedCredentialDate,
|
ErrCode: ErrMalformedCredentialDate,
|
||||||
Code: "AuthorizationQueryParametersError",
|
Code: "AuthorizationQueryParametersError",
|
||||||
Description: "Error parsing the X-Amz-Credential parameter; incorrect date format \"%s\". This date in the credential must be in the format \"yyyyMMdd\".",
|
Description: "Error parsing the X-Amz-Credential parameter; incorrect date format \"%s\". This date in the credential must be in the format \"yyyyMMdd\".",
|
||||||
HTTPStatusCode: http.StatusBadRequest,
|
HTTPStatusCode: http.StatusBadRequest,
|
||||||
},
|
},
|
||||||
// FIXME: Should contain the invalid param set as seen in https://github.com/minio/minio/issues/2385.
|
|
||||||
// right Description: "Error parsing the X-Amz-Credential parameter; the region 'us-east-' is wrong; expecting 'us-east-1'".
|
|
||||||
// Need changes to make sure variable messages can be constructed.
|
|
||||||
ErrMalformedCredentialRegion: {
|
ErrMalformedCredentialRegion: {
|
||||||
ErrCode: ErrMalformedCredentialRegion,
|
ErrCode: ErrMalformedCredentialRegion,
|
||||||
Code: "AuthorizationQueryParametersError",
|
Code: "AuthorizationQueryParametersError",
|
||||||
|
@ -675,9 +669,6 @@ var errorCodes = errorCodeMap{
|
||||||
Description: "Region does not match.",
|
Description: "Region does not match.",
|
||||||
HTTPStatusCode: http.StatusBadRequest,
|
HTTPStatusCode: http.StatusBadRequest,
|
||||||
},
|
},
|
||||||
// FIXME: Should contain the invalid param set as seen in https://github.com/minio/minio/issues/2385.
|
|
||||||
// right Description: "Error parsing the X-Amz-Credential parameter; incorrect service \"s4\". This endpoint belongs to \"s3\".".
|
|
||||||
// Need changes to make sure variable messages can be constructed.
|
|
||||||
ErrInvalidServiceS3: {
|
ErrInvalidServiceS3: {
|
||||||
ErrCode: ErrInvalidServiceS3,
|
ErrCode: ErrInvalidServiceS3,
|
||||||
Code: "AuthorizationParametersError",
|
Code: "AuthorizationParametersError",
|
||||||
|
@ -690,9 +681,6 @@ var errorCodes = errorCodeMap{
|
||||||
Description: "Error parsing the Credential parameter; incorrect service. This endpoint belongs to \"sts\".",
|
Description: "Error parsing the Credential parameter; incorrect service. This endpoint belongs to \"sts\".",
|
||||||
HTTPStatusCode: http.StatusBadRequest,
|
HTTPStatusCode: http.StatusBadRequest,
|
||||||
},
|
},
|
||||||
// FIXME: Should contain the invalid param set as seen in https://github.com/minio/minio/issues/2385.
|
|
||||||
// Description: "Error parsing the X-Amz-Credential parameter; incorrect terminal "aws4_reque". This endpoint uses "aws4_request".
|
|
||||||
// Need changes to make sure variable messages can be constructed.
|
|
||||||
ErrInvalidRequestVersion: {
|
ErrInvalidRequestVersion: {
|
||||||
ErrCode: ErrInvalidRequestVersion,
|
ErrCode: ErrInvalidRequestVersion,
|
||||||
Code: "AuthorizationQueryParametersError",
|
Code: "AuthorizationQueryParametersError",
|
||||||
|
|
|
@ -70,7 +70,7 @@ func collectHTTPMetrics(ch chan<- prometheus.Metric) {
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
prometheus.NewDesc(
|
prometheus.NewDesc(
|
||||||
prometheus.BuildFQName("neofs_s3", "requests", "current"),
|
prometheus.BuildFQName("neofs_s3", "requests", "current"),
|
||||||
"Total number of running s3 requests in current MinIO server instance",
|
"Total number of running s3 requests in current NeoFS S3 Gate instance",
|
||||||
[]string{"api"}, nil),
|
[]string{"api"}, nil),
|
||||||
prometheus.CounterValue,
|
prometheus.CounterValue,
|
||||||
float64(value),
|
float64(value),
|
||||||
|
@ -82,7 +82,7 @@ func collectHTTPMetrics(ch chan<- prometheus.Metric) {
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
prometheus.NewDesc(
|
prometheus.NewDesc(
|
||||||
prometheus.BuildFQName("neofs_s3", "requests", "total"),
|
prometheus.BuildFQName("neofs_s3", "requests", "total"),
|
||||||
"Total number of s3 requests in current MinIO server instance",
|
"Total number of s3 requests in current NeoFS S3 Gate instance",
|
||||||
[]string{"api"}, nil),
|
[]string{"api"}, nil),
|
||||||
prometheus.CounterValue,
|
prometheus.CounterValue,
|
||||||
float64(value),
|
float64(value),
|
||||||
|
@ -94,7 +94,7 @@ func collectHTTPMetrics(ch chan<- prometheus.Metric) {
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
prometheus.NewDesc(
|
prometheus.NewDesc(
|
||||||
prometheus.BuildFQName("neofs_s3", "errors", "total"),
|
prometheus.BuildFQName("neofs_s3", "errors", "total"),
|
||||||
"Total number of s3 errors in current MinIO server instance",
|
"Total number of s3 errors in current NeoFS S3 Gate instance",
|
||||||
[]string{"api"}, nil),
|
[]string{"api"}, nil),
|
||||||
prometheus.CounterValue,
|
prometheus.CounterValue,
|
||||||
float64(value),
|
float64(value),
|
||||||
|
|
|
@ -23,7 +23,7 @@ var (
|
||||||
)
|
)
|
||||||
|
|
||||||
statsMetrics = &stats{
|
statsMetrics = &stats{
|
||||||
desc: prometheus.NewDesc("neofs_s3_stats", "Statistics exposed by MinIO server", nil, nil),
|
desc: prometheus.NewDesc("neofs_s3_stats", "Statistics exposed by NeoFS S3 Gate instance", nil, nil),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ type (
|
||||||
RemoteHost string // Client Host/IP
|
RemoteHost string // Client Host/IP
|
||||||
Host string // Node Host/IP
|
Host string // Node Host/IP
|
||||||
UserAgent string // User Agent
|
UserAgent string // User Agent
|
||||||
DeploymentID string // x-minio-deployment-id
|
DeploymentID string // random generated s3-deployment-id
|
||||||
RequestID string // x-amz-request-id
|
RequestID string // x-amz-request-id
|
||||||
API string // API name - GetObject PutObject NewMultipartUpload etc.
|
API string // API name - GetObject PutObject NewMultipartUpload etc.
|
||||||
BucketName string // Bucket name
|
BucketName string // Bucket name
|
||||||
|
|
|
@ -5,8 +5,6 @@ import "github.com/gorilla/mux"
|
||||||
const systemPath = "/system"
|
const systemPath = "/system"
|
||||||
|
|
||||||
func newS3Router() *mux.Router {
|
func newS3Router() *mux.Router {
|
||||||
// Initialize router. `SkipClean(true)` stops gorilla/mux from
|
// Initialize router
|
||||||
// normalizing URL path minio/minio#3256
|
|
||||||
// avoid URL path encoding minio/minio#8950
|
|
||||||
return mux.NewRouter().SkipClean(true).UseEncodedPath()
|
return mux.NewRouter().SkipClean(true).UseEncodedPath()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue