Skip to content

Commit

Permalink
chore(orc8r): Protobuf upgrade (magma#12546)
Browse files Browse the repository at this point in the history
* bump protobuf to v1.5.2 in orc8r/cloud/go and orc8r/gateway/go

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* propagate changes to remaining modules: running go mod tidy in every module (order: lexically sorted relative paths of go.mod files, relative to /Users/azb/VSCProjects/magma), this is repeated until no changes in go.mod and go.sum files are generated anymore, two iterations were needed

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* add missing go_package option

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* ./build.py --generate

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* add untracked proto generated file

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* fix build and test errors due to proto v2 implementation
- introduce test_utils.Separator to deal with random whitespaces in string representations
- use proto.Equal for comparison of proto Messages, often wrapped in custom functions to suit the particular purpose
- use pointers to avoid copying or use proto.Clone where necessary to copy messages

fix build and test errors

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

fix more test

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

replace whitespaces

Signed-off-by: Alex Jahl <alexander.jahl@tngtech.com>

fix more test

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

add compare method that circumvents random whitespaces insertion in string representations of proto messages

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

add separators

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

refactor assertMapsEqual, add to proto utils

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

add compare for ExpectedErrorSubstring and add separators in expeceted errors and substrings

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* pin golang.org/x/net to revision that is compatible with go versions 1.15

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

* update and sync dependencies with go mod tidy

Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>

Signed-off-by: Cameron Voisey <cameron.voisey@tngtech.com>
  • Loading branch information
alexzurbonsen authored and emakeev committed Aug 5, 2022
1 parent 2d54338 commit 79bf5c3
Show file tree
Hide file tree
Showing 194 changed files with 82,258 additions and 44,901 deletions.
7 changes: 5 additions & 2 deletions cwf/cloud/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
//
module magma/cwf/cloud/go

// TODO remove golang.org/x/net line once Go Upgrade (https://github.com/magma/magma/pull/12151) is merged
replace (
golang.org/x/net => golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
magma/feg/cloud/go => ../../../feg/cloud/go
magma/feg/cloud/go/protos => ../../../feg/cloud/go/protos
magma/gateway => ../../../orc8r/gateway/go
Expand All @@ -27,13 +29,14 @@ require (
github.com/go-openapi/swag v0.19.15
github.com/go-openapi/validate v0.19.3
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.5.0
github.com/golang/protobuf v1.5.2
github.com/labstack/echo v3.3.10+incompatible
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/common v0.9.1
github.com/stretchr/testify v1.7.0
google.golang.org/grpc v1.31.0
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.28.0
magma/feg/cloud/go v0.0.0
magma/feg/cloud/go/protos v0.0.0
magma/lte/cloud/go v0.0.0
Expand Down
106 changes: 68 additions & 38 deletions cwf/cloud/go/go.sum

Large diffs are not rendered by default.

325 changes: 217 additions & 108 deletions cwf/cloud/go/protos/mconfig/mconfigs.pb.go

Large diffs are not rendered by default.

0 comments on commit 79bf5c3

Please sign in to comment.