github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(goctl): api format with reader input (#1722)

Browse Source 
resolves #1721
This commit is contained in:
Fyn 2022-03-31 00:20:51 +08:00 committed by GitHub
parent e9620c8c05
commit 500bd87c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/goctl/api/format/format.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"go/format" "go/format"
"go/scanner" "go/scanner"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -29,14 +30,14 @@ const (
func GoFormatApi(c *cli.Context) error { func GoFormatApi(c *cli.Context) error {
useStdin := c.Bool("stdin") useStdin := c.Bool("stdin")
skipCheckDeclare := c.Bool("declare") skipCheckDeclare := c.Bool("declare")
dir := c.String("dir")
var be errorx.BatchError var be errorx.BatchError
if useStdin { if useStdin {
if err := apiFormatByStdin(skipCheckDeclare); err != nil { if err := apiFormatReader(os.Stdin, dir, skipCheckDeclare); err != nil {
be.Add(err) be.Add(err)
} }
} else { } else {
dir := c.String("dir")
if len(dir) == 0 { if len(dir) == 0 {
return errors.New("missing -dir") return errors.New("missing -dir")
} }
@ -65,13 +66,14 @@ func GoFormatApi(c *cli.Context) error {
return be.Err() return be.Err()
} }
func apiFormatByStdin(skipCheckDeclare bool) error { // apiFormatReader
data, err := ioutil.ReadAll(os.Stdin) // filename is needed when there are `import` literals.
func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) error {
data, err := ioutil.ReadAll(reader)
if err != nil { if err != nil {
return err return err
} }
result, err := apiFormat(string(data), skipCheckDeclare, filename)
result, err := apiFormat(string(data), skipCheckDeclare)
if err != nil { if err != nil {
return err return err
} }

29
tools/goctl/api/format/format_test.go
View File

@ -1,9 +1,15 @@
package format package format
import ( import (
"fmt"
"io/fs"
"io/ioutil"
"os"
"path"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
) )
const ( const (
@ -45,3 +51,26 @@ func TestFormat(t *testing.T) {
_, err = apiFormat(notFormattedStr, false) _, err = apiFormat(notFormattedStr, false)
assert.Errorf(t, err, " line 7:13 can not found declaration 'Student' in context") assert.Errorf(t, err, " line 7:13 can not found declaration 'Student' in context")
} }
func Test_apiFormatReader_issue1721(t *testing.T) {
dir, err := os.MkdirTemp("", "goctl-api-format")
require.NoError(t, err)
defer os.RemoveAll(dir)
subDir := path.Join(dir, "sub")
err = os.MkdirAll(subDir, fs.ModePerm)
require.NoError(t, err)
importedFilename := path.Join(dir, "foo.api")
err = ioutil.WriteFile(importedFilename, []byte{}, fs.ModePerm)
require.NoError(t, err)
filename := path.Join(subDir, "bar.api")
err = ioutil.WriteFile(filename, []byte(fmt.Sprintf(`import "%s"`, importedFilename)), 0644)
require.NoError(t, err)
f, err := os.Open(filename)
require.NoError(t, err)
err = apiFormatReader(f, filename, false)
assert.NoError(t, err)
}