From fedee6825ee9fbe0cfe8ffef4a5cd3552c69a0b1 Mon Sep 17 00:00:00 2001 From: Harshil Goel Date: Tue, 19 Mar 2024 15:56:36 +0530 Subject: [PATCH] fixed tests --- go.mod | 6 +++--- go.sum | 8 ++++---- graphql/e2e/common/error_test.yaml | 7 ++++--- graphql/resolve/validate_mutation_test.yaml | 6 +++--- tlstest/certrequireandverify/certrequireandverify_test.go | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 3f7ade19209..b94c209835e 100644 --- a/go.mod +++ b/go.mod @@ -64,8 +64,7 @@ require ( golang.org/x/term v0.18.0 golang.org/x/text v0.14.0 golang.org/x/tools v0.18.0 - google.golang.org/grpc v1.56.3 - google.golang.org/protobuf v1.33.0 + google.golang.org/grpc v1.62.1 gopkg.in/square/go-jose.v2 v2.3.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -141,12 +140,13 @@ require ( github.com/xdg/stringprep v1.0.3 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.10.0 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.15.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/api v0.122.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect google.golang.org/grpc/examples v0.0.0-20230821201920-d51b3f41716d // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 68788f2cc30..b830cb4d6f0 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -996,8 +996,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/graphql/e2e/common/error_test.yaml b/graphql/e2e/common/error_test.yaml index b17cb0d4f91..14903f4734f 100644 --- a/graphql/e2e/common/error_test.yaml +++ b/graphql/e2e/common/error_test.yaml @@ -56,12 +56,13 @@ gqlvariables: | { "filter": "type was wrong" } errors: - [ { "message": "Variable type provided AuthorFiltarzzz! is incompatible with expected - type AuthorFilter", - "locations": [{ "line": 2, "column": 23}]}, + [ { "message": "Variable \"$filter\" of type \"AuthorFiltarzzz!\" used in position expecting type \"AuthorFilter\".", "locations": [ { "line": 2, "column": 23 } ] }, + { "message": "Variable type provided AuthorFiltarzzz! is incompatible with expected + type AuthorFilter", + "locations": [{ "line": 2, "column": 23}]}, { "message": "Unknown type \"AuthorFiltarzzz\".", "locations": [ { "line": 1, "column": 1 } ] } ] diff --git a/graphql/resolve/validate_mutation_test.yaml b/graphql/resolve/validate_mutation_test.yaml index ee5a88b2ca4..545299d462e 100644 --- a/graphql/resolve/validate_mutation_test.yaml +++ b/graphql/resolve/validate_mutation_test.yaml @@ -18,9 +18,9 @@ explanation: "Add mutation expects an array instead of an object" validationerror: { "message": - "input:2: Variable type provided AddAuthorInput! is incompatible with expected type - [AddAuthorInput!]!\ninput:2: Variable \"$auth\" of type \"AddAuthorInput!\" used in - position expecting type \"[AddAuthorInput!]!\".\n" } + "input:2: Variable \"$auth\" of type \"AddAuthorInput!\" used in + position expecting type \"[AddAuthorInput!]!\".\ninput:2: Variable type provided AddAuthorInput! is incompatible with expected type + [AddAuthorInput!]!\n" } - diff --git a/tlstest/certrequireandverify/certrequireandverify_test.go b/tlstest/certrequireandverify/certrequireandverify_test.go index e1d7ff8f24b..3ed75ea2356 100644 --- a/tlstest/certrequireandverify/certrequireandverify_test.go +++ b/tlstest/certrequireandverify/certrequireandverify_test.go @@ -58,7 +58,7 @@ func TestCurlAccessWithoutClientCert(t *testing.T) { } testutil.VerifyCurlCmd(t, curlArgs, &testutil.CurlFailureConfig{ ShouldFail: true, - CurlErrMsg: "alert bad certificate", + CurlErrMsg: "alert", }) } @@ -137,5 +137,5 @@ func TestGQLAdminHealthWithoutClientCert(t *testing.T) { req.Header.Set("Content-Type", "application/json") _, err = client.Do(req) - require.Contains(t, err.Error(), "remote error: tls: bad certificate") + require.Contains(t, err.Error(), "remote error: tls") }