Fix identation for yaml.v3

Teamwork · May 26, 2022 · b9536ea · b9536ea
1 parent cf184d7
commit b9536ea
Show file tree

Hide file tree

Showing 33 changed files with 337 additions and 332 deletions.
diff --git a/openapi2/openapi2.go b/openapi2/openapi2.go
@@ -5,6 +5,7 @@
 package openapi2 // import "github.com/teamwork/kommentaar/openapi2"
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -469,7 +470,11 @@ func write(outFormat string, w io.Writer, prog *docparse.Program) error {
 	case "json":
 		d, err = json.Marshal(&out)
 	case "yaml":
-		d, err = yaml.Marshal(&out)
+		var b bytes.Buffer
+		yamlEncoder := yaml.NewEncoder(&b)
+		yamlEncoder.SetIndent(2)
+		err = yamlEncoder.Encode(&out)
+		d = b.Bytes()
 	default:
 		err = fmt.Errorf("unknown format: %#v", outFormat)
 	}

diff --git a/testdata/openapi2/src/blank-line/want.yaml b/testdata/openapi2/src/blank-line/want.yaml
@@ -3,21 +3,21 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 tags:
-- name: tag
+  - name: tag
 paths:
   /path:
     post:
       operationId: POST_path
       tags:
-      - tag
+        - tag
       consumes:
-      - application/x-www-form-urlencoded
+        - application/x-www-form-urlencoded
       produces:
-      - application/json
+        - application/json
       responses:
         200:
           description: 200 OK (no data)

diff --git a/testdata/openapi2/src/description-print-var/want.yaml b/testdata/openapi2/src/description-print-var/want.yaml
@@ -39,7 +39,7 @@ paths:
 
         I'm escaped $foo
       produces:
-      - application/json
+        - application/json
       responses:
         200:
           description: 200 OK (no data)

diff --git a/testdata/openapi2/src/embedded-pointer/want.yaml b/testdata/openapi2/src/embedded-pointer/want.yaml
@@ -3,15 +3,15 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 paths:
   /path:
     post:
       operationId: POST_path
       produces:
-      - application/json
+        - application/json
       responses:
         200:
           description: 200 OK

diff --git a/testdata/openapi2/src/embedded-sometimes/want.yaml b/testdata/openapi2/src/embedded-sometimes/want.yaml
@@ -3,31 +3,31 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 tags:
-- name: foobar
+  - name: foobar
 paths:
   /foo/{id}:
     post:
       operationId: POST_foo_{id}
       tags:
-      - foobar
+        - foobar
       consumes:
-      - application/json
+        - application/json
       produces:
-      - application/json
+        - application/json
       parameters:
-      - name: id
-        in: path
-        type: integer
-        required: true
-      - name: embedded-sometimes.RequestObj
-        in: body
-        required: true
-        schema:
-          $ref: '#/definitions/embedded-sometimes.RequestObj'
+        - name: id
+          in: path
+          type: integer
+          required: true
+        - name: embedded-sometimes.RequestObj
+          in: body
+          required: true
+          schema:
+            $ref: '#/definitions/embedded-sometimes.RequestObj'
       responses:
         200:
           description: 200 OK

diff --git a/testdata/openapi2/src/endpoint-extend/want.yaml b/testdata/openapi2/src/endpoint-extend/want.yaml
@@ -3,23 +3,23 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 paths:
   /path:
     post:
       consumes:
-      - application/xml
+        - application/xml
       operationId: POST_path
       parameters:
-      - in: body
-        name: endpoint-extend.reqRef
-        required: true
-        schema:
-          $ref: '#/definitions/endpoint-extend.reqRef'
+        - in: body
+          name: endpoint-extend.reqRef
+          required: true
+          schema:
+            $ref: '#/definitions/endpoint-extend.reqRef'
       produces:
-      - application/json
+        - application/json
       responses:
         "200":
           description: 200 OK (no data)

diff --git a/testdata/openapi2/src/export/want.yaml b/testdata/openapi2/src/export/want.yaml
@@ -3,26 +3,26 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 paths:
   /path:
     post:
       operationId: POST_path
       consumes:
-      - application/json
+        - application/json
       produces:
-      - application/json
+        - application/json
       parameters:
-      - name: exported
-        in: query
-        type: string
-      - name: export.ref2
-        in: body
-        required: true
-        schema:
-          $ref: '#/definitions/export.ref2'
+        - name: exported
+          in: query
+          type: string
+        - name: export.ref2
+          in: body
+          required: true
+          schema:
+            $ref: '#/definitions/export.ref2'
       responses:
         200:
           description: 200 OK (no data)

diff --git a/testdata/openapi2/src/field-whitelist/want.yaml b/testdata/openapi2/src/field-whitelist/want.yaml
@@ -3,15 +3,15 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 paths:
   /path:
     post:
       operationId: POST_path
       produces:
-      - application/json
+        - application/json
       responses:
         200:
           description: 200 OK

diff --git a/testdata/openapi2/src/interface/want.yaml b/testdata/openapi2/src/interface/want.yaml
@@ -3,15 +3,15 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 paths:
   /path:
     get:
       operationId: GET_path
       produces:
-      - application/json
+        - application/json
       responses:
         200:
           description: 200 OK

diff --git a/testdata/openapi2/src/multiple-routes/want.yaml b/testdata/openapi2/src/multiple-routes/want.yaml
@@ -3,85 +3,85 @@ info:
   title: x
   version: x
 consumes:
-- application/json
+  - application/json
 produces:
-- application/json
+  - application/json
 tags:
-- name: somethingelse
-- name: tag
+  - name: somethingelse
+  - name: tag
 paths:
   /bar:
     put:
       operationId: PUT_bar
       tags:
-      - somethingelse
+        - somethingelse
       summary: Tagline
       description: Desc
       consumes:
-      - application/x-www-form-urlencoded
+        - application/x-www-form-urlencoded
       produces:
-      - application/json
+        - application/json
       parameters:
-      - name: id
-        in: path
-        type: string
-        required: true
-      - name: id
-        in: query
-        type: string
-      - name: id
-        in: formData
-        type: string
+        - name: id
+          in: path
+          type: string
+          required: true
+        - name: id
+          in: query
+          type: string
+        - name: id
+          in: formData
+          type: string
       responses:
         200:
           description: 200 OK (no data)
   /foo:
     get:
       operationId: GET_foo
       tags:
-      - tag
+        - tag
       summary: Tagline
       description: Desc
       consumes:
-      - application/x-www-form-urlencoded
+        - application/x-www-form-urlencoded
       produces:
-      - application/json
+        - application/json
       parameters:
-      - name: id
-        in: path
-        type: string
-        required: true
-      - name: id
-        in: query
-        type: string
-      - name: id
-        in: formData
-        type: string
+        - name: id
+          in: path
+          type: string
+          required: true
+        - name: id
+          in: query
+          type: string
+        - name: id
+          in: formData
+          type: string
       responses:
         200:
           description: 200 OK (no data)
   /path/{id}:
     post:
       operationId: POST_path_{id}
       tags:
-      - tag
+        - tag
       summary: Tagline
       description: Desc
       consumes:
-      - application/x-www-form-urlencoded
+        - application/x-www-form-urlencoded
       produces:
-      - application/json
+        - application/json
       parameters:
-      - name: id
-        in: path
-        type: string
-        required: true
-      - name: id
-        in: query
-        type: string
-      - name: id
-        in: formData
-        type: string
+        - name: id
+          in: path
+          type: string
+          required: true
+        - name: id
+          in: query
+          type: string
+        - name: id
+          in: formData
+          type: string
       responses:
         200:
           description: 200 OK (no data)