openapi: generate
This commit is contained in:
@@ -193,6 +193,12 @@ type Invoker interface {
|
|||||||
//
|
//
|
||||||
// POST /usernames
|
// POST /usernames
|
||||||
BatchUsernames(ctx context.Context, request *BatchUsernamesReq) (*BatchUsernamesOK, error)
|
BatchUsernames(ctx context.Context, request *BatchUsernamesReq) (*BatchUsernamesOK, error)
|
||||||
|
// Combobulate invokes combobulate operation.
|
||||||
|
//
|
||||||
|
// Queue a map for combobulator processing.
|
||||||
|
//
|
||||||
|
// POST /maps/{MapID}/combobulate
|
||||||
|
Combobulate(ctx context.Context, params CombobulateParams) error
|
||||||
// CreateMapfix invokes createMapfix operation.
|
// CreateMapfix invokes createMapfix operation.
|
||||||
//
|
//
|
||||||
// Trigger the validator to create a mapfix.
|
// Trigger the validator to create a mapfix.
|
||||||
@@ -3722,6 +3728,132 @@ func (c *Client) sendBatchUsernames(ctx context.Context, request *BatchUsernames
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Combobulate invokes combobulate operation.
|
||||||
|
//
|
||||||
|
// Queue a map for combobulator processing.
|
||||||
|
//
|
||||||
|
// POST /maps/{MapID}/combobulate
|
||||||
|
func (c *Client) Combobulate(ctx context.Context, params CombobulateParams) error {
|
||||||
|
_, err := c.sendCombobulate(ctx, params)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) sendCombobulate(ctx context.Context, params CombobulateParams) (res *CombobulateNoContent, err error) {
|
||||||
|
otelAttrs := []attribute.KeyValue{
|
||||||
|
otelogen.OperationID("combobulate"),
|
||||||
|
semconv.HTTPRequestMethodKey.String("POST"),
|
||||||
|
semconv.URLTemplateKey.String("/maps/{MapID}/combobulate"),
|
||||||
|
}
|
||||||
|
otelAttrs = append(otelAttrs, c.cfg.Attributes...)
|
||||||
|
|
||||||
|
// Run stopwatch.
|
||||||
|
startTime := time.Now()
|
||||||
|
defer func() {
|
||||||
|
// Use floating point division here for higher precision (instead of Millisecond method).
|
||||||
|
elapsedDuration := time.Since(startTime)
|
||||||
|
c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Increment request counter.
|
||||||
|
c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
|
||||||
|
|
||||||
|
// Start a span for this request.
|
||||||
|
ctx, span := c.cfg.Tracer.Start(ctx, CombobulateOperation,
|
||||||
|
trace.WithAttributes(otelAttrs...),
|
||||||
|
clientSpanKind,
|
||||||
|
)
|
||||||
|
// Track stage for error reporting.
|
||||||
|
var stage string
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
span.RecordError(err)
|
||||||
|
span.SetStatus(codes.Error, stage)
|
||||||
|
c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
|
||||||
|
}
|
||||||
|
span.End()
|
||||||
|
}()
|
||||||
|
|
||||||
|
stage = "BuildURL"
|
||||||
|
u := uri.Clone(c.requestURL(ctx))
|
||||||
|
var pathParts [3]string
|
||||||
|
pathParts[0] = "/maps/"
|
||||||
|
{
|
||||||
|
// Encode "MapID" parameter.
|
||||||
|
e := uri.NewPathEncoder(uri.PathEncoderConfig{
|
||||||
|
Param: "MapID",
|
||||||
|
Style: uri.PathStyleSimple,
|
||||||
|
Explode: false,
|
||||||
|
})
|
||||||
|
if err := func() error {
|
||||||
|
return e.EncodeValue(conv.Int64ToString(params.MapID))
|
||||||
|
}(); err != nil {
|
||||||
|
return res, errors.Wrap(err, "encode path")
|
||||||
|
}
|
||||||
|
encoded, err := e.Result()
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrap(err, "encode path")
|
||||||
|
}
|
||||||
|
pathParts[1] = encoded
|
||||||
|
}
|
||||||
|
pathParts[2] = "/combobulate"
|
||||||
|
uri.AddPathParts(u, pathParts[:]...)
|
||||||
|
|
||||||
|
stage = "EncodeRequest"
|
||||||
|
r, err := ht.NewRequest(ctx, "POST", u)
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrap(err, "create request")
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
type bitset = [1]uint8
|
||||||
|
var satisfied bitset
|
||||||
|
{
|
||||||
|
stage = "Security:CookieAuth"
|
||||||
|
switch err := c.securityCookieAuth(ctx, CombobulateOperation, r); {
|
||||||
|
case err == nil: // if NO error
|
||||||
|
satisfied[0] |= 1 << 0
|
||||||
|
case errors.Is(err, ogenerrors.ErrSkipClientSecurity):
|
||||||
|
// Skip this security.
|
||||||
|
default:
|
||||||
|
return res, errors.Wrap(err, "security \"CookieAuth\"")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ok := func() bool {
|
||||||
|
nextRequirement:
|
||||||
|
for _, requirement := range []bitset{
|
||||||
|
{0b00000001},
|
||||||
|
} {
|
||||||
|
for i, mask := range requirement {
|
||||||
|
if satisfied[i]&mask != mask {
|
||||||
|
continue nextRequirement
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}(); !ok {
|
||||||
|
return res, ogenerrors.ErrSecurityRequirementIsNotSatisfied
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage = "SendRequest"
|
||||||
|
resp, err := c.cfg.Client.Do(r)
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrap(err, "do request")
|
||||||
|
}
|
||||||
|
body := resp.Body
|
||||||
|
defer body.Close()
|
||||||
|
|
||||||
|
stage = "DecodeResponse"
|
||||||
|
result, err := decodeCombobulateResponse(resp)
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrap(err, "decode response")
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// CreateMapfix invokes createMapfix operation.
|
// CreateMapfix invokes createMapfix operation.
|
||||||
//
|
//
|
||||||
// Trigger the validator to create a mapfix.
|
// Trigger the validator to create a mapfix.
|
||||||
|
|||||||
@@ -5298,6 +5298,206 @@ func (s *Server) handleBatchUsernamesRequest(args [0]string, argsEscaped bool, w
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleCombobulateRequest handles combobulate operation.
|
||||||
|
//
|
||||||
|
// Queue a map for combobulator processing.
|
||||||
|
//
|
||||||
|
// POST /maps/{MapID}/combobulate
|
||||||
|
func (s *Server) handleCombobulateRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
|
||||||
|
statusWriter := &codeRecorder{ResponseWriter: w}
|
||||||
|
w = statusWriter
|
||||||
|
otelAttrs := []attribute.KeyValue{
|
||||||
|
otelogen.OperationID("combobulate"),
|
||||||
|
semconv.HTTPRequestMethodKey.String("POST"),
|
||||||
|
semconv.HTTPRouteKey.String("/maps/{MapID}/combobulate"),
|
||||||
|
}
|
||||||
|
// Add attributes from config.
|
||||||
|
otelAttrs = append(otelAttrs, s.cfg.Attributes...)
|
||||||
|
|
||||||
|
// Start a span for this request.
|
||||||
|
ctx, span := s.cfg.Tracer.Start(r.Context(), CombobulateOperation,
|
||||||
|
trace.WithAttributes(otelAttrs...),
|
||||||
|
serverSpanKind,
|
||||||
|
)
|
||||||
|
defer span.End()
|
||||||
|
|
||||||
|
// Add Labeler to context.
|
||||||
|
labeler := &Labeler{attrs: otelAttrs}
|
||||||
|
ctx = contextWithLabeler(ctx, labeler)
|
||||||
|
|
||||||
|
// Run stopwatch.
|
||||||
|
startTime := time.Now()
|
||||||
|
defer func() {
|
||||||
|
elapsedDuration := time.Since(startTime)
|
||||||
|
|
||||||
|
attrSet := labeler.AttributeSet()
|
||||||
|
attrs := attrSet.ToSlice()
|
||||||
|
code := statusWriter.status
|
||||||
|
if code != 0 {
|
||||||
|
codeAttr := semconv.HTTPResponseStatusCode(code)
|
||||||
|
attrs = append(attrs, codeAttr)
|
||||||
|
span.SetAttributes(codeAttr)
|
||||||
|
}
|
||||||
|
attrOpt := metric.WithAttributes(attrs...)
|
||||||
|
|
||||||
|
// Increment request counter.
|
||||||
|
s.requests.Add(ctx, 1, attrOpt)
|
||||||
|
|
||||||
|
// Use floating point division here for higher precision (instead of Millisecond method).
|
||||||
|
s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
|
||||||
|
}()
|
||||||
|
|
||||||
|
var (
|
||||||
|
recordError = func(stage string, err error) {
|
||||||
|
span.RecordError(err)
|
||||||
|
|
||||||
|
// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
|
||||||
|
// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
|
||||||
|
// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
|
||||||
|
// max redirects exceeded), in which case status MUST be set to Error.
|
||||||
|
code := statusWriter.status
|
||||||
|
if code < 100 || code >= 500 {
|
||||||
|
span.SetStatus(codes.Error, stage)
|
||||||
|
}
|
||||||
|
|
||||||
|
attrSet := labeler.AttributeSet()
|
||||||
|
attrs := attrSet.ToSlice()
|
||||||
|
if code != 0 {
|
||||||
|
attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
|
||||||
|
}
|
||||||
|
|
||||||
|
s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
|
||||||
|
}
|
||||||
|
err error
|
||||||
|
opErrContext = ogenerrors.OperationContext{
|
||||||
|
Name: CombobulateOperation,
|
||||||
|
ID: "combobulate",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
{
|
||||||
|
type bitset = [1]uint8
|
||||||
|
var satisfied bitset
|
||||||
|
{
|
||||||
|
sctx, ok, err := s.securityCookieAuth(ctx, CombobulateOperation, r)
|
||||||
|
if err != nil {
|
||||||
|
err = &ogenerrors.SecurityError{
|
||||||
|
OperationContext: opErrContext,
|
||||||
|
Security: "CookieAuth",
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
|
||||||
|
defer recordError("Security:CookieAuth", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
satisfied[0] |= 1 << 0
|
||||||
|
ctx = sctx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ok := func() bool {
|
||||||
|
nextRequirement:
|
||||||
|
for _, requirement := range []bitset{
|
||||||
|
{0b00000001},
|
||||||
|
} {
|
||||||
|
for i, mask := range requirement {
|
||||||
|
if satisfied[i]&mask != mask {
|
||||||
|
continue nextRequirement
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}(); !ok {
|
||||||
|
err = &ogenerrors.SecurityError{
|
||||||
|
OperationContext: opErrContext,
|
||||||
|
Err: ogenerrors.ErrSecurityRequirementIsNotSatisfied,
|
||||||
|
}
|
||||||
|
if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
|
||||||
|
defer recordError("Security", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
params, err := decodeCombobulateParams(args, argsEscaped, r)
|
||||||
|
if err != nil {
|
||||||
|
err = &ogenerrors.DecodeParamsError{
|
||||||
|
OperationContext: opErrContext,
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
defer recordError("DecodeParams", err)
|
||||||
|
s.cfg.ErrorHandler(ctx, w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var rawBody []byte
|
||||||
|
|
||||||
|
var response *CombobulateNoContent
|
||||||
|
if m := s.cfg.Middleware; m != nil {
|
||||||
|
mreq := middleware.Request{
|
||||||
|
Context: ctx,
|
||||||
|
OperationName: CombobulateOperation,
|
||||||
|
OperationSummary: "Queue a map for combobulator processing",
|
||||||
|
OperationID: "combobulate",
|
||||||
|
Body: nil,
|
||||||
|
RawBody: rawBody,
|
||||||
|
Params: middleware.Parameters{
|
||||||
|
{
|
||||||
|
Name: "MapID",
|
||||||
|
In: "path",
|
||||||
|
}: params.MapID,
|
||||||
|
},
|
||||||
|
Raw: r,
|
||||||
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
Request = struct{}
|
||||||
|
Params = CombobulateParams
|
||||||
|
Response = *CombobulateNoContent
|
||||||
|
)
|
||||||
|
response, err = middleware.HookMiddleware[
|
||||||
|
Request,
|
||||||
|
Params,
|
||||||
|
Response,
|
||||||
|
](
|
||||||
|
m,
|
||||||
|
mreq,
|
||||||
|
unpackCombobulateParams,
|
||||||
|
func(ctx context.Context, request Request, params Params) (response Response, err error) {
|
||||||
|
err = s.h.Combobulate(ctx, params)
|
||||||
|
return response, err
|
||||||
|
},
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
err = s.h.Combobulate(ctx, params)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
|
||||||
|
if err := encodeErrorResponse(errRes, w, span); err != nil {
|
||||||
|
defer recordError("Internal", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if errors.Is(err, ht.ErrNotImplemented) {
|
||||||
|
s.cfg.ErrorHandler(ctx, w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
|
||||||
|
defer recordError("Internal", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := encodeCombobulateResponse(response, w, span); err != nil {
|
||||||
|
defer recordError("EncodeResponse", err)
|
||||||
|
if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
|
||||||
|
s.cfg.ErrorHandler(ctx, w, r, err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// handleCreateMapfixRequest handles createMapfix operation.
|
// handleCreateMapfixRequest handles createMapfix operation.
|
||||||
//
|
//
|
||||||
// Trigger the validator to create a mapfix.
|
// Trigger the validator to create a mapfix.
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ const (
|
|||||||
BatchAssetThumbnailsOperation OperationName = "BatchAssetThumbnails"
|
BatchAssetThumbnailsOperation OperationName = "BatchAssetThumbnails"
|
||||||
BatchUserThumbnailsOperation OperationName = "BatchUserThumbnails"
|
BatchUserThumbnailsOperation OperationName = "BatchUserThumbnails"
|
||||||
BatchUsernamesOperation OperationName = "BatchUsernames"
|
BatchUsernamesOperation OperationName = "BatchUsernames"
|
||||||
|
CombobulateOperation OperationName = "Combobulate"
|
||||||
CreateMapfixOperation OperationName = "CreateMapfix"
|
CreateMapfixOperation OperationName = "CreateMapfix"
|
||||||
CreateMapfixAuditCommentOperation OperationName = "CreateMapfixAuditComment"
|
CreateMapfixAuditCommentOperation OperationName = "CreateMapfixAuditComment"
|
||||||
CreateScriptOperation OperationName = "CreateScript"
|
CreateScriptOperation OperationName = "CreateScript"
|
||||||
|
|||||||
@@ -2030,6 +2030,89 @@ func decodeActionSubmissionValidatedParams(args [1]string, argsEscaped bool, r *
|
|||||||
return params, nil
|
return params, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CombobulateParams is parameters of combobulate operation.
|
||||||
|
type CombobulateParams struct {
|
||||||
|
MapID int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func unpackCombobulateParams(packed middleware.Parameters) (params CombobulateParams) {
|
||||||
|
{
|
||||||
|
key := middleware.ParameterKey{
|
||||||
|
Name: "MapID",
|
||||||
|
In: "path",
|
||||||
|
}
|
||||||
|
params.MapID = packed[key].(int64)
|
||||||
|
}
|
||||||
|
return params
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeCombobulateParams(args [1]string, argsEscaped bool, r *http.Request) (params CombobulateParams, _ error) {
|
||||||
|
// Decode path: MapID.
|
||||||
|
if err := func() error {
|
||||||
|
param := args[0]
|
||||||
|
if argsEscaped {
|
||||||
|
unescaped, err := url.PathUnescape(args[0])
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "unescape path")
|
||||||
|
}
|
||||||
|
param = unescaped
|
||||||
|
}
|
||||||
|
if len(param) > 0 {
|
||||||
|
d := uri.NewPathDecoder(uri.PathDecoderConfig{
|
||||||
|
Param: "MapID",
|
||||||
|
Value: param,
|
||||||
|
Style: uri.PathStyleSimple,
|
||||||
|
Explode: false,
|
||||||
|
})
|
||||||
|
|
||||||
|
if err := func() error {
|
||||||
|
val, err := d.DecodeValue()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
c, err := conv.ToInt64(val)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
params.MapID = c
|
||||||
|
return nil
|
||||||
|
}(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := func() error {
|
||||||
|
if err := (validate.Int{
|
||||||
|
MinSet: true,
|
||||||
|
Min: 0,
|
||||||
|
MaxSet: false,
|
||||||
|
Max: 0,
|
||||||
|
MinExclusive: false,
|
||||||
|
MaxExclusive: false,
|
||||||
|
MultipleOfSet: false,
|
||||||
|
MultipleOf: 0,
|
||||||
|
Pattern: nil,
|
||||||
|
}).Validate(int64(params.MapID)); err != nil {
|
||||||
|
return errors.Wrap(err, "int")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return validate.ErrFieldRequired
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}(); err != nil {
|
||||||
|
return params, &ogenerrors.DecodeParamError{
|
||||||
|
Name: "MapID",
|
||||||
|
In: "path",
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return params, nil
|
||||||
|
}
|
||||||
|
|
||||||
// CreateMapfixAuditCommentParams is parameters of createMapfixAuditComment operation.
|
// CreateMapfixAuditCommentParams is parameters of createMapfixAuditComment operation.
|
||||||
type CreateMapfixAuditCommentParams struct {
|
type CreateMapfixAuditCommentParams struct {
|
||||||
// The unique identifier for a mapfix.
|
// The unique identifier for a mapfix.
|
||||||
|
|||||||
@@ -1733,6 +1733,66 @@ func decodeBatchUsernamesResponse(resp *http.Response) (res *BatchUsernamesOK, _
|
|||||||
return res, errors.Wrap(defRes, "error")
|
return res, errors.Wrap(defRes, "error")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func decodeCombobulateResponse(resp *http.Response) (res *CombobulateNoContent, _ error) {
|
||||||
|
switch resp.StatusCode {
|
||||||
|
case 204:
|
||||||
|
// Code 204.
|
||||||
|
return &CombobulateNoContent{}, nil
|
||||||
|
}
|
||||||
|
// Convenient error response.
|
||||||
|
defRes, err := func() (res *ErrorStatusCode, err error) {
|
||||||
|
ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrap(err, "parse media type")
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case ct == "application/json":
|
||||||
|
buf, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
d := jx.DecodeBytes(buf)
|
||||||
|
|
||||||
|
var response Error
|
||||||
|
if err := func() error {
|
||||||
|
if err := response.Decode(d); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := d.Skip(); err != io.EOF {
|
||||||
|
return errors.New("unexpected trailing data")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}(); err != nil {
|
||||||
|
err = &ogenerrors.DecodeBodyError{
|
||||||
|
ContentType: ct,
|
||||||
|
Body: buf,
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
// Validate response.
|
||||||
|
if err := func() error {
|
||||||
|
if err := response.Validate(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}(); err != nil {
|
||||||
|
return res, errors.Wrap(err, "validate")
|
||||||
|
}
|
||||||
|
return &ErrorStatusCode{
|
||||||
|
StatusCode: resp.StatusCode,
|
||||||
|
Response: response,
|
||||||
|
}, nil
|
||||||
|
default:
|
||||||
|
return res, validate.InvalidContentType(ct)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if err != nil {
|
||||||
|
return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return res, errors.Wrap(defRes, "error")
|
||||||
|
}
|
||||||
|
|
||||||
func decodeCreateMapfixResponse(resp *http.Response) (res *OperationID, _ error) {
|
func decodeCreateMapfixResponse(resp *http.Response) (res *OperationID, _ error) {
|
||||||
switch resp.StatusCode {
|
switch resp.StatusCode {
|
||||||
case 201:
|
case 201:
|
||||||
|
|||||||
@@ -225,6 +225,13 @@ func encodeBatchUsernamesResponse(response *BatchUsernamesOK, w http.ResponseWri
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func encodeCombobulateResponse(response *CombobulateNoContent, w http.ResponseWriter, span trace.Span) error {
|
||||||
|
w.WriteHeader(204)
|
||||||
|
span.SetStatus(codes.Ok, http.StatusText(204))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
|
func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
|
||||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||||
w.WriteHeader(201)
|
w.WriteHeader(201)
|
||||||
|
|||||||
@@ -11,37 +11,37 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
rn42AllowedHeaders = map[string]string{
|
rn46AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
|
||||||
}
|
|
||||||
rn44AllowedHeaders = map[string]string{
|
|
||||||
"POST": "Content-Type",
|
|
||||||
}
|
|
||||||
rn83AllowedHeaders = map[string]string{
|
|
||||||
"PATCH": "Content-Type",
|
|
||||||
}
|
|
||||||
rn73AllowedHeaders = map[string]string{
|
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn48AllowedHeaders = map[string]string{
|
rn48AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn56AllowedHeaders = map[string]string{
|
rn85AllowedHeaders = map[string]string{
|
||||||
|
"PATCH": "Content-Type",
|
||||||
|
}
|
||||||
|
rn75AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn46AllowedHeaders = map[string]string{
|
rn52AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn54AllowedHeaders = map[string]string{
|
rn60AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
|
||||||
}
|
|
||||||
rn49AllowedHeaders = map[string]string{
|
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn50AllowedHeaders = map[string]string{
|
rn50AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn52AllowedHeaders = map[string]string{
|
rn58AllowedHeaders = map[string]string{
|
||||||
|
"POST": "Content-Type",
|
||||||
|
}
|
||||||
|
rn53AllowedHeaders = map[string]string{
|
||||||
|
"POST": "Content-Type",
|
||||||
|
}
|
||||||
|
rn54AllowedHeaders = map[string]string{
|
||||||
|
"POST": "Content-Type",
|
||||||
|
}
|
||||||
|
rn56AllowedHeaders = map[string]string{
|
||||||
"POST": "Content-Type",
|
"POST": "Content-Type",
|
||||||
}
|
}
|
||||||
rn38AllowedHeaders = map[string]string{
|
rn38AllowedHeaders = map[string]string{
|
||||||
@@ -135,7 +135,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "GET,POST",
|
allowedMethods: "GET,POST",
|
||||||
allowedHeaders: rn42AllowedHeaders,
|
allowedHeaders: rn46AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -248,7 +248,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "POST",
|
allowedMethods: "POST",
|
||||||
allowedHeaders: rn44AllowedHeaders,
|
allowedHeaders: rn48AllowedHeaders,
|
||||||
acceptPost: "text/plain",
|
acceptPost: "text/plain",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -304,7 +304,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "PATCH",
|
allowedMethods: "PATCH",
|
||||||
allowedHeaders: rn83AllowedHeaders,
|
allowedHeaders: rn85AllowedHeaders,
|
||||||
acceptPost: "",
|
acceptPost: "",
|
||||||
acceptPatch: "text/plain",
|
acceptPatch: "text/plain",
|
||||||
})
|
})
|
||||||
@@ -838,31 +838,72 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
switch elem[0] {
|
switch elem[0] {
|
||||||
case '/': // Prefix: "/download"
|
case '/': // Prefix: "/"
|
||||||
|
|
||||||
if l := len("/download"); len(elem) >= l && elem[0:l] == "/download" {
|
if l := len("/"); len(elem) >= l && elem[0:l] == "/" {
|
||||||
elem = elem[l:]
|
elem = elem[l:]
|
||||||
} else {
|
} else {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(elem) == 0 {
|
if len(elem) == 0 {
|
||||||
// Leaf node.
|
break
|
||||||
switch r.Method {
|
}
|
||||||
case "GET":
|
switch elem[0] {
|
||||||
s.handleDownloadMapAssetRequest([1]string{
|
case 'c': // Prefix: "combobulate"
|
||||||
args[0],
|
|
||||||
}, elemIsEscaped, w, r)
|
if l := len("combobulate"); len(elem) >= l && elem[0:l] == "combobulate" {
|
||||||
default:
|
elem = elem[l:]
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
} else {
|
||||||
allowedMethods: "GET",
|
break
|
||||||
allowedHeaders: nil,
|
}
|
||||||
acceptPost: "",
|
|
||||||
acceptPatch: "",
|
if len(elem) == 0 {
|
||||||
})
|
// Leaf node.
|
||||||
|
switch r.Method {
|
||||||
|
case "POST":
|
||||||
|
s.handleCombobulateRequest([1]string{
|
||||||
|
args[0],
|
||||||
|
}, elemIsEscaped, w, r)
|
||||||
|
default:
|
||||||
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
|
allowedMethods: "POST",
|
||||||
|
allowedHeaders: nil,
|
||||||
|
acceptPost: "",
|
||||||
|
acceptPatch: "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
case 'd': // Prefix: "download"
|
||||||
|
|
||||||
|
if l := len("download"); len(elem) >= l && elem[0:l] == "download" {
|
||||||
|
elem = elem[l:]
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(elem) == 0 {
|
||||||
|
// Leaf node.
|
||||||
|
switch r.Method {
|
||||||
|
case "GET":
|
||||||
|
s.handleDownloadMapAssetRequest([1]string{
|
||||||
|
args[0],
|
||||||
|
}, elemIsEscaped, w, r)
|
||||||
|
default:
|
||||||
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
|
allowedMethods: "GET",
|
||||||
|
allowedHeaders: nil,
|
||||||
|
acceptPost: "",
|
||||||
|
acceptPatch: "",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -923,7 +964,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "POST",
|
allowedMethods: "POST",
|
||||||
allowedHeaders: rn73AllowedHeaders,
|
allowedHeaders: rn75AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -973,7 +1014,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "GET,POST",
|
allowedMethods: "GET,POST",
|
||||||
allowedHeaders: rn48AllowedHeaders,
|
allowedHeaders: rn52AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1017,7 +1058,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "DELETE,GET,POST",
|
allowedMethods: "DELETE,GET,POST",
|
||||||
allowedHeaders: rn56AllowedHeaders,
|
allowedHeaders: rn60AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1045,7 +1086,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "GET,POST",
|
allowedMethods: "GET,POST",
|
||||||
allowedHeaders: rn46AllowedHeaders,
|
allowedHeaders: rn50AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1089,7 +1130,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "DELETE,GET,POST",
|
allowedMethods: "DELETE,GET,POST",
|
||||||
allowedHeaders: rn54AllowedHeaders,
|
allowedHeaders: rn58AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1233,7 +1274,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "GET,POST",
|
allowedMethods: "GET,POST",
|
||||||
allowedHeaders: rn49AllowedHeaders,
|
allowedHeaders: rn53AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1258,7 +1299,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "POST",
|
allowedMethods: "POST",
|
||||||
allowedHeaders: rn50AllowedHeaders,
|
allowedHeaders: rn54AllowedHeaders,
|
||||||
acceptPost: "application/json",
|
acceptPost: "application/json",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -1371,7 +1412,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
default:
|
default:
|
||||||
s.notAllowed(w, r, notAllowedParams{
|
s.notAllowed(w, r, notAllowedParams{
|
||||||
allowedMethods: "POST",
|
allowedMethods: "POST",
|
||||||
allowedHeaders: rn52AllowedHeaders,
|
allowedHeaders: rn56AllowedHeaders,
|
||||||
acceptPost: "text/plain",
|
acceptPost: "text/plain",
|
||||||
acceptPatch: "",
|
acceptPatch: "",
|
||||||
})
|
})
|
||||||
@@ -2786,29 +2827,68 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
switch elem[0] {
|
switch elem[0] {
|
||||||
case '/': // Prefix: "/download"
|
case '/': // Prefix: "/"
|
||||||
|
|
||||||
if l := len("/download"); len(elem) >= l && elem[0:l] == "/download" {
|
if l := len("/"); len(elem) >= l && elem[0:l] == "/" {
|
||||||
elem = elem[l:]
|
elem = elem[l:]
|
||||||
} else {
|
} else {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(elem) == 0 {
|
if len(elem) == 0 {
|
||||||
// Leaf node.
|
break
|
||||||
switch method {
|
}
|
||||||
case "GET":
|
switch elem[0] {
|
||||||
r.name = DownloadMapAssetOperation
|
case 'c': // Prefix: "combobulate"
|
||||||
r.summary = "Download the map asset"
|
|
||||||
r.operationID = "downloadMapAsset"
|
if l := len("combobulate"); len(elem) >= l && elem[0:l] == "combobulate" {
|
||||||
r.operationGroup = ""
|
elem = elem[l:]
|
||||||
r.pathPattern = "/maps/{MapID}/download"
|
} else {
|
||||||
r.args = args
|
break
|
||||||
r.count = 1
|
|
||||||
return r, true
|
|
||||||
default:
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(elem) == 0 {
|
||||||
|
// Leaf node.
|
||||||
|
switch method {
|
||||||
|
case "POST":
|
||||||
|
r.name = CombobulateOperation
|
||||||
|
r.summary = "Queue a map for combobulator processing"
|
||||||
|
r.operationID = "combobulate"
|
||||||
|
r.operationGroup = ""
|
||||||
|
r.pathPattern = "/maps/{MapID}/combobulate"
|
||||||
|
r.args = args
|
||||||
|
r.count = 1
|
||||||
|
return r, true
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
case 'd': // Prefix: "download"
|
||||||
|
|
||||||
|
if l := len("download"); len(elem) >= l && elem[0:l] == "download" {
|
||||||
|
elem = elem[l:]
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(elem) == 0 {
|
||||||
|
// Leaf node.
|
||||||
|
switch method {
|
||||||
|
case "GET":
|
||||||
|
r.name = DownloadMapAssetOperation
|
||||||
|
r.summary = "Download the map asset"
|
||||||
|
r.operationID = "downloadMapAsset"
|
||||||
|
r.operationGroup = ""
|
||||||
|
r.pathPattern = "/maps/{MapID}/download"
|
||||||
|
r.args = args
|
||||||
|
r.count = 1
|
||||||
|
return r, true
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -441,6 +441,9 @@ func (s *BatchUsernamesReq) SetUserIds(val []uint64) {
|
|||||||
s.UserIds = val
|
s.UserIds = val
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CombobulateNoContent is response for Combobulate operation.
|
||||||
|
type CombobulateNoContent struct{}
|
||||||
|
|
||||||
type CookieAuth struct {
|
type CookieAuth struct {
|
||||||
APIKey string
|
APIKey string
|
||||||
Roles []string
|
Roles []string
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ var operationRolesCookieAuth = map[string][]string{
|
|||||||
ActionSubmissionTriggerUploadOperation: []string{},
|
ActionSubmissionTriggerUploadOperation: []string{},
|
||||||
ActionSubmissionTriggerValidateOperation: []string{},
|
ActionSubmissionTriggerValidateOperation: []string{},
|
||||||
ActionSubmissionValidatedOperation: []string{},
|
ActionSubmissionValidatedOperation: []string{},
|
||||||
|
CombobulateOperation: []string{},
|
||||||
CreateMapfixOperation: []string{},
|
CreateMapfixOperation: []string{},
|
||||||
CreateMapfixAuditCommentOperation: []string{},
|
CreateMapfixAuditCommentOperation: []string{},
|
||||||
CreateScriptOperation: []string{},
|
CreateScriptOperation: []string{},
|
||||||
|
|||||||
@@ -173,6 +173,12 @@ type Handler interface {
|
|||||||
//
|
//
|
||||||
// POST /usernames
|
// POST /usernames
|
||||||
BatchUsernames(ctx context.Context, req *BatchUsernamesReq) (*BatchUsernamesOK, error)
|
BatchUsernames(ctx context.Context, req *BatchUsernamesReq) (*BatchUsernamesOK, error)
|
||||||
|
// Combobulate implements combobulate operation.
|
||||||
|
//
|
||||||
|
// Queue a map for combobulator processing.
|
||||||
|
//
|
||||||
|
// POST /maps/{MapID}/combobulate
|
||||||
|
Combobulate(ctx context.Context, params CombobulateParams) error
|
||||||
// CreateMapfix implements createMapfix operation.
|
// CreateMapfix implements createMapfix operation.
|
||||||
//
|
//
|
||||||
// Trigger the validator to create a mapfix.
|
// Trigger the validator to create a mapfix.
|
||||||
|
|||||||
@@ -259,6 +259,15 @@ func (UnimplementedHandler) BatchUsernames(ctx context.Context, req *BatchUserna
|
|||||||
return r, ht.ErrNotImplemented
|
return r, ht.ErrNotImplemented
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Combobulate implements combobulate operation.
|
||||||
|
//
|
||||||
|
// Queue a map for combobulator processing.
|
||||||
|
//
|
||||||
|
// POST /maps/{MapID}/combobulate
|
||||||
|
func (UnimplementedHandler) Combobulate(ctx context.Context, params CombobulateParams) error {
|
||||||
|
return ht.ErrNotImplemented
|
||||||
|
}
|
||||||
|
|
||||||
// CreateMapfix implements createMapfix operation.
|
// CreateMapfix implements createMapfix operation.
|
||||||
//
|
//
|
||||||
// Trigger the validator to create a mapfix.
|
// Trigger the validator to create a mapfix.
|
||||||
|
|||||||
Reference in New Issue
Block a user