Skip to content

Commit

Permalink
fix(keploy): adds missing fields in PostTC rpc call
Browse files Browse the repository at this point in the history 
Signed-off-by: re-Tick <[email protected]>
  • Loading branch information
@re-Tick
re-Tick committed Mar 10, 2023
1 parent 3a7cedc commit 721100c
Showing 1 changed file with 86 additions and 75 deletions.
161 changes: 86 additions & 75 deletions keploy/keploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"net/http"
"os"
"regexp"
"strconv"
"strings"
"sync"
"testing"
"time"
"strconv"

"github.com/keploy/go-sdk/mock"
"github.com/keploy/go-sdk/pkg/keploy"
Expand Down Expand Up @@ -360,50 +360,50 @@ func (k *Keploy) start(total int) (string, error) {
var resp map[string]string
if k.cfg.GrpcEnabled {
res, err := k.grpcClient.Start(k.Ctx, &proto.StartRequest{
Total: strconv.Itoa(total),
App: k.cfg.App.Name,
Total: strconv.Itoa(total),
App: k.cfg.App.Name,
TestCasePath: k.cfg.App.TestPath,
MockPath: k.cfg.App.MockPath,
MockPath: k.cfg.App.MockPath,
})
if err != nil {
return "", err
}
result, _ := res.Descriptor()
err = json.Unmarshal(result, &resp)

}else{
} else {

url := fmt.Sprintf("%s/regression/start?app=%s&total=%d&testCasePath=%s&mockPath=%s", k.cfg.Server.URL, k.cfg.App.Name, total, k.cfg.App.TestPath, k.cfg.App.MockPath)
body, err := k.newGet(url)
if err != nil {
return "", err
}
url := fmt.Sprintf("%s/regression/start?app=%s&total=%d&testCasePath=%s&mockPath=%s", k.cfg.Server.URL, k.cfg.App.Name, total, k.cfg.App.TestPath, k.cfg.App.MockPath)
body, err := k.newGet(url)
if err != nil {
return "", err
}

err = json.Unmarshal(body, &resp)
if err != nil {
return "", err
err = json.Unmarshal(body, &resp)
if err != nil {
return "", err
}
}
}
return resp["id"], nil
}

func (k *Keploy) end(id string, status bool) error {
if k.cfg.GrpcEnabled {
_, err := k.grpcClient.End(k.Ctx, &proto.EndRequest{
Id: id,
Id: id,
Status: strconv.FormatBool(status),
})
if err != nil {
return err
}

}else{
url := fmt.Sprintf("%s/regression/end?status=%t&id=%s", k.cfg.Server.URL, status, id)
_, err := k.newGet(url)
if err != nil {
return err
} else {
url := fmt.Sprintf("%s/regression/end?status=%t&id=%s", k.cfg.Server.URL, status, id)
_, err := k.newGet(url)
if err != nil {
return err
}
}
}
return nil
}

Expand Down Expand Up @@ -538,17 +538,17 @@ func (k *Keploy) check(runId string, tc models.TestCase) bool {
// test application reponse
if k.cfg.GrpcEnabled {
r, err := k.grpcClient.Test(k.Ctx, &proto.TestReq{
ID: tc.ID,
AppID: k.cfg.App.Name,
RunID: runId,
ID: tc.ID,
AppID: k.cfg.App.Name,
RunID: runId,
Resp: &proto.HttpResp{
Body: resp.Body,
Header: utils.GetProtoMap(resp.Header),
StatusCode: int64(resp.StatusCode),
Body: resp.Body,
Header: utils.GetProtoMap(resp.Header),
StatusCode: int64(resp.StatusCode),
StatusMessage: resp.StatusMessage,
ProtoMajor: int64(resp.ProtoMajor),
ProtoMinor: int64(resp.ProtoMinor),
Binary: resp.Binary,
ProtoMajor: int64(resp.ProtoMajor),
ProtoMinor: int64(resp.ProtoMinor),
Binary: resp.Binary,
},
TestCasePath: k.cfg.App.TestPath,
MockPath: k.cfg.App.MockPath,
Expand Down Expand Up @@ -690,6 +690,17 @@ func (k *Keploy) put(tcs regression.TestCaseReq) {
TestCasePath: tcs.TestCasePath,
MockPath: tcs.MockPath,
Mocks: tcs.Mocks,
Type: string(tcs.Type),
Remove: tcs.Remove,
Replace: tcs.Replace,
GrpcReq: &proto.GrpcReq{
Body: tcs.GrpcReq.Body,
Method: tcs.GrpcReq.Method,
},
GrpcResp: &proto.GrpcResp{
Body: tcs.GrpcResp.Body,
Err: tcs.GrpcResp.Err,
},
})
if err != nil {
k.Log.Error("failed to send testcase to backend", zap.String("url", tcs.URI), zap.Error(err))
Expand Down Expand Up @@ -820,16 +831,16 @@ func (k *Keploy) denoise(id string, tcs regression.TestCaseReq) {
// send de-noise request to server
if k.cfg.GrpcEnabled {
_, err = k.grpcClient.DeNoise(k.Ctx, &proto.TestReq{
ID: id,
AppID: k.cfg.App.Name,
ID: id,
AppID: k.cfg.App.Name,
Resp: &proto.HttpResp{
Body: resp2.Body,
Header: utils.GetProtoMap(resp2.Header),
StatusCode: int64(resp2.StatusCode),
Body: resp2.Body,
Header: utils.GetProtoMap(resp2.Header),
StatusCode: int64(resp2.StatusCode),
StatusMessage: resp2.StatusMessage, //when it has to be done it will be done and it should be doe
ProtoMajor: int64(resp2.ProtoMajor),
ProtoMinor: int64(resp2.ProtoMinor),
Binary: resp2.Binary,
ProtoMajor: int64(resp2.ProtoMajor),
ProtoMinor: int64(resp2.ProtoMinor),
Binary: resp2.Binary,
},
TestCasePath: k.cfg.App.TestPath,
MockPath: k.cfg.App.MockPath,
Expand Down Expand Up @@ -917,53 +928,53 @@ func (k *Keploy) fetch(reqType models.Kind) []models.TestCase {
}
res = ProtoToModelsTestCase(resp.GetTcs())
tcs = append(tcs, res...)
if len(res) < pageSize{
if len(res) < pageSize {
break
}
if resp.Eof{
if resp.Eof {
break
}

} else {
url := fmt.Sprintf("%s/regression/testcase?app=%s&offset=%d&limit=%d&testCasePath=%s&mockPath=%s&reqType=%s", k.cfg.Server.URL, k.cfg.App.Name, i, 25, k.cfg.App.TestPath, k.cfg.App.MockPath, reqType)
url := fmt.Sprintf("%s/regression/testcase?app=%s&offset=%d&limit=%d&testCasePath=%s&mockPath=%s&reqType=%s", k.cfg.Server.URL, k.cfg.App.Name, i, 25, k.cfg.App.TestPath, k.cfg.App.MockPath, reqType)

req, err := http.NewRequest("GET", url, http.NoBody)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
k.setKey(req)
resp, err := k.client.Do(req)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
if resp.StatusCode != http.StatusOK {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(errors.New("failed to send get request: "+resp.Status)))
return nil
}
req, err := http.NewRequest("GET", url, http.NoBody)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
k.setKey(req)
resp, err := k.client.Do(req)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
if resp.StatusCode != http.StatusOK {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(errors.New("failed to send get request: "+resp.Status)))
return nil
}

defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
err = json.Unmarshal(body, &res)
if err != nil {
k.Log.Error("failed to reading testcases from keploy cloud", zap.Error(err))
return nil
}
tcs = append(tcs, res...)
if len(res) < pageSize {
break
}
eof := resp.Header.Get("EOF")
if eof == "true" {
break
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
k.Log.Error("failed to fetch testcases from keploy cloud", zap.Error(err))
return nil
}
err = json.Unmarshal(body, &res)
if err != nil {
k.Log.Error("failed to reading testcases from keploy cloud", zap.Error(err))
return nil
}
tcs = append(tcs, res...)
if len(res) < pageSize {
break
}
eof := resp.Header.Get("EOF")
if eof == "true" {
break

}
}
}

}

Expand Down

0 comments on commit 721100c

Please sign in to comment.