Merge pull request #1370 from max107/tags

fix(expand): pass tags to merged openapi spec

openapi/api.go

@@ -12,6 +12,7 @@ type Ref = jsonpointer.RefKey
 // API represents parsed OpenAPI spec.
 type API struct {
 	Version    Version
+	Tags       []Tag
 	Servers    []Server
 	Operations []*Operation
 	Webhooks   []Webhook

openapi/operation.go

@@ -10,10 +10,11 @@ import (
 
 // Operation is an OpenAPI Operation.
 type Operation struct {
-	OperationID string // optional
-	Summary     string // optional
-	Description string // optional
-	Deprecated  bool   // optional
+	Tags        []string // optional
+	OperationID string   // optional
+	Summary     string   // optional
+	Description string   // optional
+	Deprecated  bool     // optional
 
 	HTTPMethod  string
 	Path        Path

openapi/parser/expand.go

@@ -38,6 +38,16 @@ func (e *expander) Spec(api *openapi.API) (spec *ogen.Spec, err error) {
 	e.components = spec.Components
 
 	spec.OpenAPI = api.Version.String()
+
+	tags := make([]ogen.Tag, len(api.Tags))
+	for i, tag := range api.Tags {
+		tags[i] = ogen.Tag{
+			Name:        tag.Name,
+			Description: tag.Description,
+		}
+	}
+	spec.Tags = tags
+
 	// FIXME(tdakkota): store actual information
 	spec.Info = ogen.Info{
 		Title:   "Expanded spec",
@@ -263,6 +273,7 @@ func (e *expander) OAuthFlow(flow *openapi.OAuthFlow) (expanded *ogen.OAuthFlow,
 func (e *expander) Operation(op *openapi.Operation) (expanded *ogen.Operation, err error) {
 	expanded = new(ogen.Operation)
 
+	expanded.Tags = op.Tags
 	expanded.OperationID = op.OperationID
 	expanded.Summary = op.Summary
 	expanded.Description = op.Description

openapi/parser/parse_path_item.go

@@ -113,6 +113,7 @@ func (p *parser) parseOp(
 	}()
 
 	op := &openapi.Operation{
+		Tags:                spec.Tags,
 		OperationID:         spec.OperationID,
 		Summary:             spec.Summary,
 		Description:         spec.Description,

openapi/tag.go

@@ -0,0 +1,7 @@
+package openapi
+
+// Tag represents parsed OpenAPI tags.
+type Tag struct {
+	Name        string
+	Description string
+}