zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: support baggage propagation in httpc (#2375)

Browse Source 
* feat: support baggage propagation in httpc

* chore: use go 1.16

* chore: use go 1.16

* chore: use go ^1.16

* chore: remove deprecated
This commit is contained in:
Kevin Wan
2022-09-10 15:18:52 +08:00
committed by GitHub
parent 590d784800
commit d935c83a54
44 changed files with 141 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import (
"go/format"
"go/scanner"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -76,7 +75,7 @@ func GoFormatApi(_ *cobra.Command, _ []string) error {
// apiFormatReader
// filename is needed when there are `import` literals.
func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) error {
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
return err
}
@@ -91,7 +90,7 @@ func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) e
// ApiFormatByPath format api from file path
func ApiFormatByPath(apiFilePath string, skipCheckDeclare bool) error {
data, err := ioutil.ReadFile(apiFilePath)
data, err := os.ReadFile(apiFilePath)
if err != nil {
return err
}
@@ -111,7 +110,7 @@ func ApiFormatByPath(apiFilePath string, skipCheckDeclare bool) error {
return err
}
return ioutil.WriteFile(apiFilePath, []byte(result), os.ModePerm)
return os.WriteFile(apiFilePath, []byte(result), os.ModePerm)
}
func apiFormat(data string, skipCheckDeclare bool, filename ...string) (string, error) {
@@ -145,12 +144,12 @@ func apiFormat(data string, skipCheckDeclare bool, filename ...string) (string,
}
if tapCount == 0 {
format, err := formatGoTypeDef(line, s, &builder)
ft, err := formatGoTypeDef(line, s, &builder)
if err != nil {
return "", err
}
if format {
if ft {
continue
}
}

37
tools/goctl/api/gogen/gen_test.go
View File

@@ -3,7 +3,6 @@ package gogen
import (
_ "embed"
goformat "go/format"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -52,7 +51,7 @@ var (
func TestParser(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(testApiTemplate), os.ModePerm)
err := os.WriteFile(filename, []byte(testApiTemplate), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -73,7 +72,7 @@ func TestParser(t *testing.T) {
func TestMultiService(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(testMultiServiceTemplate), os.ModePerm)
err := os.WriteFile(filename, []byte(testMultiServiceTemplate), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -88,7 +87,7 @@ func TestMultiService(t *testing.T) {
func TestApiNoInfo(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(apiNoInfo), os.ModePerm)
err := os.WriteFile(filename, []byte(apiNoInfo), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -100,7 +99,7 @@ func TestApiNoInfo(t *testing.T) {
func TestInvalidApiFile(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(invalidApiFile), os.ModePerm)
err := os.WriteFile(filename, []byte(invalidApiFile), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -110,7 +109,7 @@ func TestInvalidApiFile(t *testing.T) {
func TestAnonymousAnnotation(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(anonymousAnnotation), os.ModePerm)
err := os.WriteFile(filename, []byte(anonymousAnnotation), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -125,7 +124,7 @@ func TestAnonymousAnnotation(t *testing.T) {
func TestApiHasMiddleware(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(apiHasMiddleware), os.ModePerm)
err := os.WriteFile(filename, []byte(apiHasMiddleware), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -137,7 +136,7 @@ func TestApiHasMiddleware(t *testing.T) {
func TestApiHasJwt(t *testing.T) {
filename := "jwt.api"
err := ioutil.WriteFile(filename, []byte(apiJwt), os.ModePerm)
err := os.WriteFile(filename, []byte(apiJwt), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -149,7 +148,7 @@ func TestApiHasJwt(t *testing.T) {
func TestApiHasJwtAndMiddleware(t *testing.T) {
filename := "jwt.api"
err := ioutil.WriteFile(filename, []byte(apiJwtWithMiddleware), os.ModePerm)
err := os.WriteFile(filename, []byte(apiJwtWithMiddleware), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -161,7 +160,7 @@ func TestApiHasJwtAndMiddleware(t *testing.T) {
func TestApiHasNoRequestBody(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(apiHasNoRequest), os.ModePerm)
err := os.WriteFile(filename, []byte(apiHasNoRequest), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -171,7 +170,7 @@ func TestApiHasNoRequestBody(t *testing.T) {
func TestApiRoutes(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(apiRouteTest), os.ModePerm)
err := os.WriteFile(filename, []byte(apiRouteTest), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -183,7 +182,7 @@ func TestApiRoutes(t *testing.T) {
func TestHasCommentRoutes(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(hasCommentApiTest), os.ModePerm)
err := os.WriteFile(filename, []byte(hasCommentApiTest), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -195,7 +194,7 @@ func TestHasCommentRoutes(t *testing.T) {
func TestInlineTypeNotExist(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(hasInlineNoExistTest), os.ModePerm)
err := os.WriteFile(filename, []byte(hasInlineNoExistTest), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -205,12 +204,12 @@ func TestInlineTypeNotExist(t *testing.T) {
func TestHasImportApi(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(hasImportApi), os.ModePerm)
err := os.WriteFile(filename, []byte(hasImportApi), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
importApiName := "importApi.api"
err = ioutil.WriteFile(importApiName, []byte(importApi), os.ModePerm)
err = os.WriteFile(importApiName, []byte(importApi), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(importApiName)
@@ -231,7 +230,7 @@ func TestHasImportApi(t *testing.T) {
func TestNoStructApi(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(noStructTagApi), os.ModePerm)
err := os.WriteFile(filename, []byte(noStructTagApi), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -244,7 +243,7 @@ func TestNoStructApi(t *testing.T) {
func TestNestTypeApi(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(nestTypeApi), os.ModePerm)
err := os.WriteFile(filename, []byte(nestTypeApi), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -254,7 +253,7 @@ func TestNestTypeApi(t *testing.T) {
func TestCamelStyle(t *testing.T) {
filename := "greet.api"
err := ioutil.WriteFile(filename, []byte(testApiTemplate), os.ModePerm)
err := os.WriteFile(filename, []byte(testApiTemplate), os.ModePerm)
assert.Nil(t, err)
defer os.Remove(filename)
@@ -281,7 +280,7 @@ func validateWithCamel(t *testing.T, api, camel string) {
assert.Nil(t, err)
filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
if strings.HasSuffix(path, ".go") {
code, err := ioutil.ReadFile(path)
code, err := os.ReadFile(path)
assert.Nil(t, err)
assert.Nil(t, validateCode(string(code)))
}

18
tools/goctl/api/gogen/template_test.go
View File

@@ -1,7 +1,7 @@
package gogen
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -15,7 +15,7 @@ func TestGenTemplates(t *testing.T) {
dir, err := pathx.GetTemplateDir(category)
assert.Nil(t, err)
file := filepath.Join(dir, "main.tpl")
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
assert.Nil(t, err)
assert.Equal(t, string(data), mainTemplate)
}
@@ -29,21 +29,21 @@ func TestRevertTemplate(t *testing.T) {
assert.Nil(t, err)
file := filepath.Join(dir, name)
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
assert.Nil(t, err)
modifyData := string(data) + "modify"
err = pathx.CreateTemplate(category, name, modifyData)
assert.Nil(t, err)
data, err = ioutil.ReadFile(file)
data, err = os.ReadFile(file)
assert.Nil(t, err)
assert.Equal(t, string(data), modifyData)
assert.Nil(t, RevertTemplate(name))
data, err = ioutil.ReadFile(file)
data, err = os.ReadFile(file)
assert.Nil(t, err)
assert.Equal(t, mainTemplate, string(data))
}
@@ -59,7 +59,7 @@ func TestClean(t *testing.T) {
assert.Nil(t, err)
file := filepath.Join(dir, name)
_, err = ioutil.ReadFile(file)
_, err = os.ReadFile(file)
assert.NotNil(t, err)
}
@@ -72,21 +72,21 @@ func TestUpdate(t *testing.T) {
assert.Nil(t, err)
file := filepath.Join(dir, name)
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
assert.Nil(t, err)
modifyData := string(data) + "modify"
err = pathx.CreateTemplate(category, name, modifyData)
assert.Nil(t, err)
data, err = ioutil.ReadFile(file)
data, err = os.ReadFile(file)
assert.Nil(t, err)
assert.Equal(t, string(data), modifyData)
assert.Nil(t, Update())
data, err = ioutil.ReadFile(file)
data, err = os.ReadFile(file)
assert.Nil(t, err)
assert.Equal(t, mainTemplate, string(data))
}

4
tools/goctl/api/parser/g4/ast/apiparser.go
View File

@@ -2,7 +2,7 @@ package ast
import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"strings"
@@ -498,7 +498,7 @@ func (p *Parser) checkType(linePrefix string, types map[string]TypeExpr, expr Da
func (p *Parser) readContent(filename string) (string, error) {
filename = strings.ReplaceAll(filename, `"`, "")
data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
return "", err
}

5
tools/goctl/api/parser/g4/gen/api/file_splitor_test.go
View File

@@ -9,7 +9,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"log"
"os"
"path/filepath"
@@ -18,7 +17,7 @@ import (
func TestFileSplitor(t *testing.T) {
dir := "."
data, err := ioutil.ReadFile(filepath.Join(dir, "apiparser_parser.go"))
data, err := os.ReadFile(filepath.Join(dir, "apiparser_parser.go"))
if err != nil {
log.Fatalln(err)
}
@@ -67,7 +66,7 @@ import "github.com/zeromicro/antlr"
fmt.Printf("%+v\n", err)
break
}
err = ioutil.WriteFile(fp, src, os.ModePerm)
err = os.WriteFile(fp, src, os.ModePerm)
if err != nil {
fmt.Printf("%+v\n", err)
}