V2: Fix template delims (#1572)

* Fix template delims * go mod tidy --------- Co-authored-by: Tobias Theel <tt@fino.digital>
swaggo · May 4, 2023 · 9a872fb · 9a872fb
1 parent ff9485a
commit 9a872fb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/gen/gen.go b/gen/gen.go
@@ -285,7 +285,7 @@ func (g *Gen) writeDoc(config *Config, doc interface{}) error {
 	case *v3.OpenAPI:
 		err = g.writeGoDocV3(packageName, docs, spec, config)
 		if err != nil {
-			return nil
+			return err
 		}
 	}
 	g.debug.Printf("create docs.go at %+v", docFileName)
@@ -552,23 +552,27 @@ func (g *Gen) writeGoDocV3(packageName string, output io.Writer, openAPI *v3.Ope
 	buffer := &bytes.Buffer{}
 
 	err = generator.Execute(buffer, struct {
-		Timestamp     time.Time
-		Doc           string
-		PackageName   string
-		Title         string
-		Description   string
-		Version       string
-		InstanceName  string
-		GeneratedTime bool
+		Timestamp          time.Time
+		Doc                string
+		PackageName        string
+		Title              string
+		Description        string
+		Version            string
+		InstanceName       string
+		GeneratedTime      bool
+		LeftTemplateDelim  string
+		RightTemplateDelim string
 	}{
-		Timestamp:     time.Now(),
-		GeneratedTime: config.GeneratedTime,
-		Doc:           string(buf),
-		PackageName:   packageName,
-		Title:         openAPI.Info.Spec.Title,
-		Description:   openAPI.Info.Spec.Description,
-		Version:       openAPI.Info.Spec.Version,
-		InstanceName:  config.InstanceName,
+		Timestamp:          time.Now(),
+		GeneratedTime:      config.GeneratedTime,
+		Doc:                string(buf),
+		PackageName:        packageName,
+		Title:              openAPI.Info.Spec.Title,
+		Description:        openAPI.Info.Spec.Description,
+		Version:            openAPI.Info.Spec.Version,
+		InstanceName:       config.InstanceName,
+		LeftTemplateDelim:  config.LeftTemplateDelim,
+		RightTemplateDelim: config.RightTemplateDelim,
 	})
 	if err != nil {
 		return err

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/KyleBanks/depth v1.2.1
-	github.com/go-openapi/spec v0.20.8
+	github.com/go-openapi/spec v0.20.9
 	github.com/json-iterator/go v1.1.12
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.2

diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaL
 github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
-github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
+github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=