Skip to content

Commit

Permalink
supoort MapValuePointer
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenzuochao @peze
wenzuochao authored and peze committed May 9, 2020
1 parent da2886a commit 8817d0e
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 75 deletions.
81 changes: 41 additions & 40 deletions tea/tea.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons

response = NewResponse(res)
fieldMap["{code}"] = strconv.Itoa(res.StatusCode)
fieldMap["{res_headers}"] = TransToString(res.Header)
fieldMap["{res_headers}"] = transToString(res.Header)
debugLog("< HTTP/1.1 %s", res.Status)
for key, value := range res.Header {
debugLog("< %s: %s", key, strings.Join(value, ""))
Expand Down Expand Up @@ -382,7 +382,7 @@ func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, er
return trans, nil
}

func TransToString(object interface{}) string {
func transToString(object interface{}) string {
byt, _ := json.Marshal(object)
return string(byt)
}
Expand All @@ -395,7 +395,7 @@ func putMsgToMap(fieldMap map[string]string, request *http.Request) {
fieldMap["{version}"] = strings.Split(request.Proto, "/")[1]
hostname, _ := os.Hostname()
fieldMap["{hostname}"] = hostname
fieldMap["{req_headers}"] = TransToString(request.Header)
fieldMap["{req_headers}"] = transToString(request.Header)
fieldMap["{target}"] = request.URL.Path + request.URL.RawQuery
}

Expand All @@ -414,8 +414,9 @@ func getNoProxy(protocol string, runtime *RuntimeObject) []string {

func ToReader(obj interface{}) io.Reader {
switch obj.(type) {
case string:
return strings.NewReader(obj.(string))
case *string:
tmp := obj.(*string)
return strings.NewReader(StringValue(tmp))
case []byte:
return strings.NewReader(string(obj.([]byte)))
case io.Reader:
Expand Down Expand Up @@ -509,34 +510,34 @@ func ToObject(obj interface{}) map[string]interface{} {
return result
}

func AllowRetry(retry interface{}, retryTimes int) bool {
if retryTimes == 0 {
return true
func AllowRetry(retry interface{}, retryTimes *int) *bool {
if IntValue(retryTimes) == 0 {
return Bool(true)
}
retryMap, ok := retry.(map[string]interface{})
if !ok {
return false
return Bool(false)
}
retryable, ok := retryMap["retryable"].(bool)
if !ok || !retryable {
return false
return Bool(false)
}

maxAttempts, ok := retryMap["maxAttempts"].(int)
if !ok || maxAttempts < retryTimes {
return false
if !ok || maxAttempts < IntValue(retryTimes) {
return Bool(false)
}
return true
return Bool(true)
}

func Merge(args ...interface{}) map[string]string {
finalArg := make(map[string]string)
func Merge(args ...interface{}) map[string]*string {
finalArg := make(map[string]*string)
for _, obj := range args {
switch obj.(type) {
case map[string]string:
arg := obj.(map[string]string)
case map[string]*string:
arg := obj.(map[string]*string)
for key, value := range arg {
if value != "" {
if value != nil {
finalArg[key] = value
}
}
Expand All @@ -549,7 +550,7 @@ func Merge(args ...interface{}) map[string]string {
}
for key, value := range arg {
if value != "" {
finalArg[key] = value
finalArg[key] = String(value)
}
}
}
Expand Down Expand Up @@ -580,11 +581,11 @@ func ToMap(args ...interface{}) map[string]interface{} {
isNotNil = true

switch obj.(type) {
case map[string]string:
arg := obj.(map[string]string)
case map[string]*string:
arg := obj.(map[string]*string)
for key, value := range arg {
if value != "" {
finalArg[key] = value
if value != nil {
finalArg[key] = StringValue(value)
}
}
case map[string]interface{}:
Expand All @@ -594,10 +595,10 @@ func ToMap(args ...interface{}) map[string]interface{} {
finalArg[key] = value
}
}
case string:
str := obj.(string)
case *string:
str := obj.(*string)
arg := make(map[string]interface{})
err := json.Unmarshal([]byte(str), &arg)
err := json.Unmarshal([]byte(StringValue(str)), &arg)
if err == nil {
for key, value := range arg {
if value != nil {
Expand All @@ -606,7 +607,7 @@ func ToMap(args ...interface{}) map[string]interface{} {
}
}
tmp := make(map[string]string)
err = json.Unmarshal([]byte(str), &tmp)
err = json.Unmarshal([]byte(StringValue(str)), &tmp)
if err == nil {
for key, value := range arg {
if value != "" {
Expand Down Expand Up @@ -713,41 +714,41 @@ func structToMap(dataValue reflect.Value) map[string]interface{} {
return out
}

func Retryable(err error) bool {
func Retryable(err error) *bool {
if err == nil {
return false
return Bool(false)
}
if realErr, ok := err.(*SDKError); ok {
code, err := strconv.Atoi(StringValue(realErr.Code))
if err != nil {
return true
return Bool(true)
}
return code >= http.StatusInternalServerError
return Bool(code >= http.StatusInternalServerError)
}
return true
return Bool(true)
}

func GetBackoffTime(backoff interface{}, retrytimes int) int {
func GetBackoffTime(backoff interface{}, retrytimes *int) *int {
backoffMap, ok := backoff.(map[string]interface{})
if !ok {
return 0
return Int(0)
}
policy, ok := backoffMap["policy"].(string)
if !ok || policy == "no" {
return 0
return Int(0)
}

period, ok := backoffMap["period"].(int)
if !ok || period == 0 {
return 0
return Int(0)
}

maxTime := math.Pow(2.0, float64(retrytimes))
return rand.Intn(int(maxTime-1)) * period
maxTime := math.Pow(2.0, float64(IntValue(retrytimes)))
return Int(rand.Intn(int(maxTime-1)) * period)
}

func Sleep(backoffTime int) {
sleeptime := time.Duration(backoffTime) * time.Second
func Sleep(backoffTime *int) {
sleeptime := time.Duration(IntValue(backoffTime)) * time.Second
time.Sleep(sleeptime)
}

Expand Down
70 changes: 35 additions & 35 deletions tea/tea_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,42 +165,42 @@ func TestToObject(t *testing.T) {
}

func TestAllowRetry(t *testing.T) {
allow := AllowRetry(nil, 0)
utils.AssertEqual(t, true, allow)
allow := AllowRetry(nil, Int(0))
utils.AssertEqual(t, true, BoolValue(allow))

allow = AllowRetry(nil, 1)
utils.AssertEqual(t, false, allow)
allow = AllowRetry(nil, Int(1))
utils.AssertEqual(t, false, BoolValue(allow))

input := map[string]interface{}{
"retryable": false,
"maxAttempts": 2,
}
allow = AllowRetry(input, 1)
utils.AssertEqual(t, false, allow)
allow = AllowRetry(input, Int(1))
utils.AssertEqual(t, false, BoolValue(allow))

input["retryable"] = true
allow = AllowRetry(input, 3)
utils.AssertEqual(t, false, allow)
allow = AllowRetry(input, Int(3))
utils.AssertEqual(t, false, BoolValue(allow))

input["retryable"] = true
allow = AllowRetry(input, 1)
utils.AssertEqual(t, true, allow)
allow = AllowRetry(input, Int(1))
utils.AssertEqual(t, true, BoolValue(allow))
}

func TestMerge(t *testing.T) {
in := map[string]string{
"tea": "test",
in := map[string]*string{
"tea": String("test"),
}
valid := map[string]interface{}{
"valid": "test",
}
invalidStr := "sdfdg"
result := Merge(in, valid, invalidStr)
utils.AssertEqual(t, "test", result["tea"])
utils.AssertEqual(t, "test", result["valid"])
utils.AssertEqual(t, "test", StringValue(result["tea"]))
utils.AssertEqual(t, "test", StringValue(result["valid"]))

result = Merge(nil)
utils.AssertEqual(t, map[string]string{}, result)
utils.AssertEqual(t, map[string]*string{}, result)
}

type Test struct {
Expand All @@ -213,8 +213,8 @@ type Test struct {
}

func TestToMap(t *testing.T) {
in := map[string]string{
"tea": "test",
in := map[string]*string{
"tea": String("test"),
}
result := ToMap(in)
utils.AssertEqual(t, "test", result["tea"])
Expand Down Expand Up @@ -258,18 +258,18 @@ func TestToMap(t *testing.T) {
result = ToMap(valid1)
utils.AssertEqual(t, "tea", result["Msg"])

validStr := `{"test":"ok"}`
validStr := String(`{"test":"ok"}`)
result = ToMap(validStr)
utils.AssertEqual(t, "ok", result["test"])

validStr1 := `{"test":"ok","num":1}`
validStr1 := String(`{"test":"ok","num":1}`)
result = ToMap(validStr1)
utils.AssertEqual(t, "ok", result["test"])

result = ToMap([]byte(validStr))
result = ToMap([]byte(StringValue(validStr)))
utils.AssertEqual(t, "ok", result["test"])

result = ToMap([]byte(validStr1))
result = ToMap([]byte(StringValue(validStr1)))
utils.AssertEqual(t, "ok", result["test"])

invalidStr := "sdfdg"
Expand All @@ -285,45 +285,45 @@ func TestToMap(t *testing.T) {

func Test_Retryable(t *testing.T) {
ifRetry := Retryable(nil)
utils.AssertEqual(t, false, ifRetry)
utils.AssertEqual(t, false, BoolValue(ifRetry))

err := errors.New("tea")
ifRetry = Retryable(err)
utils.AssertEqual(t, true, ifRetry)
utils.AssertEqual(t, true, BoolValue(ifRetry))

errmsg := map[string]interface{}{
"code": "err",
}
err = NewSDKError(errmsg)
ifRetry = Retryable(err)
utils.AssertEqual(t, true, ifRetry)
utils.AssertEqual(t, true, BoolValue(ifRetry))

errmsg["code"] = "400"
err = NewSDKError(errmsg)
ifRetry = Retryable(err)
utils.AssertEqual(t, false, ifRetry)
utils.AssertEqual(t, false, BoolValue(ifRetry))
}

func Test_GetBackoffTime(t *testing.T) {
ms := GetBackoffTime(nil, 0)
utils.AssertEqual(t, 0, ms)
ms := GetBackoffTime(nil, Int(0))
utils.AssertEqual(t, 0, IntValue(ms))

backoff := map[string]interface{}{
"policy": "no",
}
ms = GetBackoffTime(backoff, 0)
utils.AssertEqual(t, 0, ms)
ms = GetBackoffTime(backoff, Int(0))
utils.AssertEqual(t, 0, IntValue(ms))

backoff["policy"] = "yes"
backoff["period"] = 0
ms = GetBackoffTime(backoff, 1)
utils.AssertEqual(t, 0, ms)
ms = GetBackoffTime(backoff, Int(1))
utils.AssertEqual(t, 0, IntValue(ms))

Sleep(1)
Sleep(Int(1))

backoff["period"] = 3
ms = GetBackoffTime(backoff, 1)
utils.AssertEqual(t, true, ms <= 3)
ms = GetBackoffTime(backoff, Int(1))
utils.AssertEqual(t, true, IntValue(ms) <= 3)
}

func Test_DoRequest(t *testing.T) {
Expand Down Expand Up @@ -491,7 +491,7 @@ func Test_hookdo(t *testing.T) {

func Test_ToReader(t *testing.T) {
str := "abc"
reader := ToReader(str)
reader := ToReader(String(str))
byt, err := ioutil.ReadAll(reader)
utils.AssertNil(t, err)
utils.AssertEqual(t, "abc", string(byt))
Expand Down

0 comments on commit 8817d0e

Please sign in to comment.