Skip to content

Commit

Permalink
Add tests, fix lint, staticchecks and other issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tejaswiagarwal committed Dec 12, 2019
1 parent 80c69d8 commit 1aa9d68
Show file tree
Hide file tree
Showing 14 changed files with 83 additions and 101 deletions.
19 changes: 9 additions & 10 deletions codegen/method.go
Expand Up @@ -1019,20 +1019,20 @@ func (ms *MethodSpec) setDummyTypeConverters(
dummyConverter.append(
"func convert",
PascalCase(ms.Name),
"DummyResponse(in ",ms.RequestType, ") ", ms.ResponseType, "{")
"DummyResponse(in ", ms.RequestType, ") ", ms.ResponseType, "{")

structType := compile.FieldGroup(funcSpec.ArgsSpec)

switch respType.(type) {
case
*compile.BoolSpec,
*compile.I8Spec,
*compile.I16Spec,
*compile.I32Spec,
*compile.EnumSpec,
*compile.I64Spec,
*compile.DoubleSpec,
*compile.StringSpec:
*compile.BoolSpec,
*compile.I8Spec,
*compile.I16Spec,
*compile.I32Spec,
*compile.EnumSpec,
*compile.I64Spec,
*compile.DoubleSpec,
*compile.StringSpec:

dummyConverter.append("out", " := in\t\n")
default:
Expand Down Expand Up @@ -1082,7 +1082,6 @@ func getQueryMethodForPrimitiveType(typeSpec compile.TypeSpec) string {
return queryMethod
}


func getQueryMethodForType(typeSpec compile.TypeSpec) string {
var queryMethod string

Expand Down
2 changes: 1 addition & 1 deletion codegen/module_system.go
Expand Up @@ -306,7 +306,7 @@ func NewDefaultModuleSystem(
)
}

if err := system.RegisterClassType("client", "custom", &CustomClientGenerator{
if err := system.RegisterClassType("client", "custom", &CustomClientGenerator{
templates: tmpl,
packageHelper: h,
}); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion codegen/post_gen_hooks.go
Expand Up @@ -368,7 +368,7 @@ func WorkflowMockGenHook(h *PackageHelper, t *Template) PostGenHook {
for _, instance := range instances["endpoint"] {
endpointSpecs := instance.genSpec.([]*EndpointSpec)
for _, endpointSpec := range endpointSpecs {
if endpointSpec.WorkflowType == "custom" {
if endpointSpec.WorkflowType == "custom" {
shouldGenMap[instance] = endpointSpecs
errChanSize += len(endpointSpecs)
break
Expand Down
8 changes: 4 additions & 4 deletions codegen/service.go
Expand Up @@ -221,10 +221,10 @@ func (ms *ModuleSpec) SetDownstream(
clientMethod = e.ClientMethod

// TODO: move generated middlewares out of zanzibar
headersPropagate = e.HeadersPropagate
reqTransforms = e.ReqTransforms
respTransforms = e.RespTransforms
reqrespTransforms = e.DummyReqTransforms
headersPropagate = e.HeadersPropagate
reqTransforms = e.ReqTransforms
respTransforms = e.RespTransforms
reqrespTransforms = e.DummyReqTransforms
)
for _, v := range ms.Services {
if v.Name == serviceName {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions examples/example-gateway/config/test.json
Expand Up @@ -19,11 +19,6 @@
"clients.contacts.timeout": 10000,
"clients.contacts.maxConcurrentRequests": 1000,
"clients.contacts.errorPercentThreshold": 20,
"clients.serverless.ip": "127.0.0.1",
"clients.serverless.port": 4000,
"clients.serverless.timeout": 10000,
"clients.serverless.maxConcurrentRequests": 1000,
"clients.serverless.errorPercentThreshold": 20,
"clients.corge.serviceName": "Corge",
"clients.corge.timeout": 10000,
"clients.corge.timeoutPerAttempt": 2000,
Expand Down
5 changes: 0 additions & 5 deletions examples/example-gateway/config/test.yaml
Expand Up @@ -17,11 +17,6 @@ clients.contacts.port: 4000
clients.contacts.timeout: 10000
clients.contacts.maxConcurrentRequests: 1000
clients.contacts.errorPercentThreshold: 20
clients.serverless.ip: 127.0.0.1
clients.serverless.port: 4010
clients.serverless.timeout: 10000
clients.serverless.maxConcurrentRequests: 1000
clients.serverless.errorPercentThreshold: 20
clients.corge.serviceName: Corge
clients.corge.timeout: 10000
clients.corge.timeoutPerAttempt: 2000
Expand Down
10 changes: 0 additions & 10 deletions examples/example-gateway/endpoints/contacts/save_contacts_test.go
Expand Up @@ -9,7 +9,6 @@ import (

mockcontactsworkflow "github.com/uber/zanzibar/examples/example-gateway/build/endpoints/contacts/mock-workflow"
endpointContacts "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/endpoints/contacts/contacts"
serverlessendpoint "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/endpoints/serverless-endpoint/serverless"
ms "github.com/uber/zanzibar/examples/example-gateway/build/services/example-gateway/mock-service"
)

Expand All @@ -29,15 +28,6 @@ func TestSaveContactsCall(t *testing.T) {
"POST", "/contacts/foo/contacts", nil, bytes.NewReader(rawBody),
)

var a = "Tejaswi"
endpointReqeust1 := &serverlessendpoint.Request{
FirstName: &a,
}
rawBody2, _ := endpointReqeust1.MarshalJSON()

res, err = ms.MakeHTTPRequest(
"POST", "/serverless/serverless/post-request", nil, bytes.NewReader(rawBody2),
)
if !assert.NoError(t, err, "got http error") {
return
}
Expand Down
38 changes: 38 additions & 0 deletions examples/example-gateway/endpoints/serverless/serverless_test.go
@@ -0,0 +1,38 @@
package serverless

import (
"bytes"
"fmt"
"io/ioutil"
"testing"

"github.com/stretchr/testify/assert"

endpointServerless "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/endpoints/serverless/serverless"
ms "github.com/uber/zanzibar/examples/example-gateway/build/services/example-gateway/mock-service"
)

func TestServerlessEndpointCall(t *testing.T) {
ms := ms.MustCreateTestService(t)
ms.Start()
defer ms.Stop()

var a = "Test"
endpointRequest := &endpointServerless.Serverless_Beta_Args{
Request: &endpointServerless.Request{
FirstName: &a,
},
}
rawBody, _ := endpointRequest.MarshalJSON()
res, err := ms.MakeHTTPRequest(
"POST", "/serverless/post-request", nil, bytes.NewReader(rawBody),
)
if !assert.NoError(t, err, "got http error") {
return
}

assert.Equal(t, "200 OK", res.Status)
respBytes, _ := ioutil.ReadAll(res.Body)
assert.Equal(t, string("{\"firstName\":\"Test\"}"), string(respBytes))
fmt.Println(res.Body)
}
Expand Up @@ -13,3 +13,4 @@ dependencies:
- tchannel/panic
- tchannel/quux
- withexceptions
- serverless
65 changes: 0 additions & 65 deletions test/endpoints/serverless/serverless_endpoint_test.go

This file was deleted.

0 comments on commit 1aa9d68

Please sign in to comment.