From 581c65594d190d6a613715279145b349cb1b6eca Mon Sep 17 00:00:00 2001 From: Quaternions <krakow20@gmail.com> Date: Mon, 31 Mar 2025 19:30:57 -0700 Subject: [PATCH] openapi: generate --- pkg/api/oas_client_gen.go | 23 ++++++++-- pkg/api/oas_handlers_gen.go | 8 +++- pkg/api/oas_parameters_gen.go | 69 ++++++++++++++++++++++++++---- pkg/internal/oas_client_gen.go | 23 ++++++++-- pkg/internal/oas_handlers_gen.go | 8 +++- pkg/internal/oas_parameters_gen.go | 69 ++++++++++++++++++++++++++---- 6 files changed, 172 insertions(+), 28 deletions(-) diff --git a/pkg/api/oas_client_gen.go b/pkg/api/oas_client_gen.go index c7eff2d..76746fd 100644 --- a/pkg/api/oas_client_gen.go +++ b/pkg/api/oas_client_gen.go @@ -2491,15 +2491,32 @@ func (c *Client) sendListScripts(ctx context.Context, params ListScriptsParams) } } { - // Encode "SubmissionID" parameter. + // Encode "ResourceType" parameter. cfg := uri.QueryParameterEncodingConfig{ - Name: "SubmissionID", + Name: "ResourceType", Style: uri.QueryStyleForm, Explode: true, } if err := q.EncodeParam(cfg, func(e uri.Encoder) error { - if val, ok := params.SubmissionID.Get(); ok { + if val, ok := params.ResourceType.Get(); ok { + return e.EncodeValue(conv.Int32ToString(val)) + } + return nil + }); err != nil { + return res, errors.Wrap(err, "encode query") + } + } + { + // Encode "ResourceID" parameter. + cfg := uri.QueryParameterEncodingConfig{ + Name: "ResourceID", + Style: uri.QueryStyleForm, + Explode: true, + } + + if err := q.EncodeParam(cfg, func(e uri.Encoder) error { + if val, ok := params.ResourceID.Get(); ok { return e.EncodeValue(conv.Int64ToString(val)) } return nil diff --git a/pkg/api/oas_handlers_gen.go b/pkg/api/oas_handlers_gen.go index 8b423e8..5e41a87 100644 --- a/pkg/api/oas_handlers_gen.go +++ b/pkg/api/oas_handlers_gen.go @@ -3487,9 +3487,13 @@ func (s *Server) handleListScriptsRequest(args [0]string, argsEscaped bool, w ht In: "query", }: params.Source, { - Name: "SubmissionID", + Name: "ResourceType", In: "query", - }: params.SubmissionID, + }: params.ResourceType, + { + Name: "ResourceID", + In: "query", + }: params.ResourceID, }, Raw: r, } diff --git a/pkg/api/oas_parameters_gen.go b/pkg/api/oas_parameters_gen.go index 870fdf0..d426273 100644 --- a/pkg/api/oas_parameters_gen.go +++ b/pkg/api/oas_parameters_gen.go @@ -1257,7 +1257,8 @@ type ListScriptsParams struct { Hash OptString Name OptString Source OptString - SubmissionID OptInt64 + ResourceType OptInt32 + ResourceID OptInt64 } func unpackListScriptsParams(packed middleware.Parameters) (params ListScriptsParams) { @@ -1304,11 +1305,20 @@ func unpackListScriptsParams(packed middleware.Parameters) (params ListScriptsPa } { key := middleware.ParameterKey{ - Name: "SubmissionID", + Name: "ResourceType", In: "query", } if v, ok := packed[key]; ok { - params.SubmissionID = v.(OptInt64) + params.ResourceType = v.(OptInt32) + } + } + { + key := middleware.ParameterKey{ + Name: "ResourceID", + In: "query", + } + if v, ok := packed[key]; ok { + params.ResourceID = v.(OptInt64) } } return params @@ -1614,17 +1624,58 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) Err: err, } } - // Decode query: SubmissionID. + // Decode query: ResourceType. if err := func() error { cfg := uri.QueryParameterDecodingConfig{ - Name: "SubmissionID", + Name: "ResourceType", Style: uri.QueryStyleForm, Explode: true, } if err := q.HasParam(cfg); err == nil { if err := q.DecodeParam(cfg, func(d uri.Decoder) error { - var paramsDotSubmissionIDVal int64 + var paramsDotResourceTypeVal int32 + if err := func() error { + val, err := d.DecodeValue() + if err != nil { + return err + } + + c, err := conv.ToInt32(val) + if err != nil { + return err + } + + paramsDotResourceTypeVal = c + return nil + }(); err != nil { + return err + } + params.ResourceType.SetTo(paramsDotResourceTypeVal) + return nil + }); err != nil { + return err + } + } + return nil + }(); err != nil { + return params, &ogenerrors.DecodeParamError{ + Name: "ResourceType", + In: "query", + Err: err, + } + } + // Decode query: ResourceID. + if err := func() error { + cfg := uri.QueryParameterDecodingConfig{ + Name: "ResourceID", + Style: uri.QueryStyleForm, + Explode: true, + } + + if err := q.HasParam(cfg); err == nil { + if err := q.DecodeParam(cfg, func(d uri.Decoder) error { + var paramsDotResourceIDVal int64 if err := func() error { val, err := d.DecodeValue() if err != nil { @@ -1636,12 +1687,12 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) return err } - paramsDotSubmissionIDVal = c + paramsDotResourceIDVal = c return nil }(); err != nil { return err } - params.SubmissionID.SetTo(paramsDotSubmissionIDVal) + params.ResourceID.SetTo(paramsDotResourceIDVal) return nil }); err != nil { return err @@ -1650,7 +1701,7 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) return nil }(); err != nil { return params, &ogenerrors.DecodeParamError{ - Name: "SubmissionID", + Name: "ResourceID", In: "query", Err: err, } diff --git a/pkg/internal/oas_client_gen.go b/pkg/internal/oas_client_gen.go index 26e4930..91bfd06 100644 --- a/pkg/internal/oas_client_gen.go +++ b/pkg/internal/oas_client_gen.go @@ -967,15 +967,32 @@ func (c *Client) sendListScripts(ctx context.Context, params ListScriptsParams) } } { - // Encode "SubmissionID" parameter. + // Encode "ResourceType" parameter. cfg := uri.QueryParameterEncodingConfig{ - Name: "SubmissionID", + Name: "ResourceType", Style: uri.QueryStyleForm, Explode: true, } if err := q.EncodeParam(cfg, func(e uri.Encoder) error { - if val, ok := params.SubmissionID.Get(); ok { + if val, ok := params.ResourceType.Get(); ok { + return e.EncodeValue(conv.Int32ToString(val)) + } + return nil + }); err != nil { + return res, errors.Wrap(err, "encode query") + } + } + { + // Encode "ResourceID" parameter. + cfg := uri.QueryParameterEncodingConfig{ + Name: "ResourceID", + Style: uri.QueryStyleForm, + Explode: true, + } + + if err := q.EncodeParam(cfg, func(e uri.Encoder) error { + if val, ok := params.ResourceID.Get(); ok { return e.EncodeValue(conv.Int64ToString(val)) } return nil diff --git a/pkg/internal/oas_handlers_gen.go b/pkg/internal/oas_handlers_gen.go index e783223..b8bc5c3 100644 --- a/pkg/internal/oas_handlers_gen.go +++ b/pkg/internal/oas_handlers_gen.go @@ -1212,9 +1212,13 @@ func (s *Server) handleListScriptsRequest(args [0]string, argsEscaped bool, w ht In: "query", }: params.Source, { - Name: "SubmissionID", + Name: "ResourceType", In: "query", - }: params.SubmissionID, + }: params.ResourceType, + { + Name: "ResourceID", + In: "query", + }: params.ResourceID, }, Raw: r, } diff --git a/pkg/internal/oas_parameters_gen.go b/pkg/internal/oas_parameters_gen.go index c127a23..0744fce 100644 --- a/pkg/internal/oas_parameters_gen.go +++ b/pkg/internal/oas_parameters_gen.go @@ -703,7 +703,8 @@ type ListScriptsParams struct { Hash OptString Name OptString Source OptString - SubmissionID OptInt64 + ResourceType OptInt32 + ResourceID OptInt64 } func unpackListScriptsParams(packed middleware.Parameters) (params ListScriptsParams) { @@ -750,11 +751,20 @@ func unpackListScriptsParams(packed middleware.Parameters) (params ListScriptsPa } { key := middleware.ParameterKey{ - Name: "SubmissionID", + Name: "ResourceType", In: "query", } if v, ok := packed[key]; ok { - params.SubmissionID = v.(OptInt64) + params.ResourceType = v.(OptInt32) + } + } + { + key := middleware.ParameterKey{ + Name: "ResourceID", + In: "query", + } + if v, ok := packed[key]; ok { + params.ResourceID = v.(OptInt64) } } return params @@ -1060,17 +1070,58 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) Err: err, } } - // Decode query: SubmissionID. + // Decode query: ResourceType. if err := func() error { cfg := uri.QueryParameterDecodingConfig{ - Name: "SubmissionID", + Name: "ResourceType", Style: uri.QueryStyleForm, Explode: true, } if err := q.HasParam(cfg); err == nil { if err := q.DecodeParam(cfg, func(d uri.Decoder) error { - var paramsDotSubmissionIDVal int64 + var paramsDotResourceTypeVal int32 + if err := func() error { + val, err := d.DecodeValue() + if err != nil { + return err + } + + c, err := conv.ToInt32(val) + if err != nil { + return err + } + + paramsDotResourceTypeVal = c + return nil + }(); err != nil { + return err + } + params.ResourceType.SetTo(paramsDotResourceTypeVal) + return nil + }); err != nil { + return err + } + } + return nil + }(); err != nil { + return params, &ogenerrors.DecodeParamError{ + Name: "ResourceType", + In: "query", + Err: err, + } + } + // Decode query: ResourceID. + if err := func() error { + cfg := uri.QueryParameterDecodingConfig{ + Name: "ResourceID", + Style: uri.QueryStyleForm, + Explode: true, + } + + if err := q.HasParam(cfg); err == nil { + if err := q.DecodeParam(cfg, func(d uri.Decoder) error { + var paramsDotResourceIDVal int64 if err := func() error { val, err := d.DecodeValue() if err != nil { @@ -1082,12 +1133,12 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) return err } - paramsDotSubmissionIDVal = c + paramsDotResourceIDVal = c return nil }(); err != nil { return err } - params.SubmissionID.SetTo(paramsDotSubmissionIDVal) + params.ResourceID.SetTo(paramsDotResourceIDVal) return nil }); err != nil { return err @@ -1096,7 +1147,7 @@ func decodeListScriptsParams(args [0]string, argsEscaped bool, r *http.Request) return nil }(); err != nil { return params, &ogenerrors.DecodeParamError{ - Name: "SubmissionID", + Name: "ResourceID", In: "query", Err: err, }