Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(orc8r): Protobuf upgrade #12546

Merged
merged 8 commits into from
Apr 28, 2022
Merged

chore(orc8r): Protobuf upgrade #12546

merged 8 commits into from
Apr 28, 2022

Commits on Apr 27, 2022

  1. 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>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    b7b28a1 View commit details
    Browse the repository at this point in the history

  2. 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>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    505d359 View commit details
    Browse the repository at this point in the history

  3. add missing go_package option 

    Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    1bfd859 View commit details
    Browse the repository at this point in the history

  4. ./build.py --generate 

    Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    9bb22d8 View commit details
    Browse the repository at this point in the history

  5. add untracked proto generated file 

    Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    4074830 View commit details
    Browse the repository at this point in the history

  6. 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>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    c6bcb30 View commit details
    Browse the repository at this point in the history

  7. 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>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    5d16d33 View commit details
    Browse the repository at this point in the history

  8. 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>
    @alexzurbonsen
    alexzurbonsen committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    1d9642a View commit details
    Browse the repository at this point in the history