diff --git a/.buildkite/code.pipeline.yml b/.buildkite/code.pipeline.yml index 70fd04a8e06..dcbd96287cb 100644 --- a/.buildkite/code.pipeline.yml +++ b/.buildkite/code.pipeline.yml @@ -269,12 +269,17 @@ steps: timeout_in_minutes: 40 command: - .buildkite/scripts/download_e2e_test_artifacts.sh + # Needed as the trust-root test rebuilds the enclave with embedded trust root data. + - cargo install --locked --path tools # Only run runtime scenarios as others do not use SGX. - .buildkite/scripts/test_e2e.sh --scenario e2e/runtime/.* artifact_paths: - coverage-merged-e2e-*.txt - /tmp/e2e/**/*.log env: + # Unsafe flags needed as the trust-root test rebuilds the enclave with embedded trust root data. + OASIS_UNSAFE_SKIP_AVR_VERIFY: "1" + OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES: "1" OASIS_E2E_COVERAGE: enable OASIS_EXCLUDE_E2E: e2e/runtime/txsource-multi,e2e/runtime/txsource-multi-short TEST_BASE_DIR: /tmp diff --git a/.changelog/4260.internal.md b/.changelog/4260.internal.md new file mode 100644 index 00000000000..e953727079a --- /dev/null +++ b/.changelog/4260.internal.md @@ -0,0 +1 @@ +go: Bump grpc to 1.40.0 diff --git a/go/common/grpc/errors_test.go b/go/common/grpc/errors_test.go index 40baada5861..9f00c6391ed 100644 --- a/go/common/grpc/errors_test.go +++ b/go/common/grpc/errors_test.go @@ -204,5 +204,5 @@ func TestErrorMapping(t *testing.T) { st := GetErrorStatus(err) require.NotNil(st, "GetErrorStatus should not be nil") s, _ := status.FromError(io.ErrUnexpectedEOF) - require.EqualValues(s, st, "GetErrorStatus.Status should be io.ErrUnexpectedEOF") + require.Equal(s.Err().Error(), st.Err().Error(), "GetErrorStatus.Status should be io.ErrUnexpectedEOF") } diff --git a/go/go.mod b/go/go.mod index 64429b4c75a..2addaa17593 100644 --- a/go/go.mod +++ b/go/go.mod @@ -62,7 +62,7 @@ require ( golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf golang.org/x/net v0.0.0-20210525063256-abc453219eb5 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c - google.golang.org/grpc v1.39.1 + google.golang.org/grpc v1.40.0 google.golang.org/grpc/security/advancedtls v0.0.0-20200902210233-8630cac324bf google.golang.org/protobuf v1.27.1 ) diff --git a/go/go.sum b/go/go.sum index 2384fd8c3cf..84015c2fa1b 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1642,8 +1642,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.1 h1:f37vZbBVTiJ6jKG5mWz8ySOBxNqy6ViPgyhSdVnxF3E= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc/examples v0.0.0-20200731180010-8bec2f5d898f h1:HNNmM2dnxUknBEJDvuCRZcUzhGbhkz00ckV2ha2gFJY= google.golang.org/grpc/examples v0.0.0-20200731180010-8bec2f5d898f/go.mod h1:TGiSRL2BBv2WqzfsFNWYp/pkWdtf5kbZS/DQ9Ee3mWk= google.golang.org/grpc/security/advancedtls v0.0.0-20200902210233-8630cac324bf h1:IqdIxEnvZreeZMpDPbAA66R/PkRH6AD255RbxyuyfEY=