Skip to content

Make upgrade#1891

Merged
bufdev merged 3 commits intomainfrom
make-upgrade-20230306
Mar 8, 2023
Merged

Make upgrade#1891
bufdev merged 3 commits intomainfrom
make-upgrade-20230306

Conversation

@bufdev
Copy link
Member

@bufdev bufdev commented Mar 6, 2023

@jhump there's one new failure, I think just a golden test related to protocompile v0.4.0, can you check it out?

--- FAIL: TestPackages (0.05s)
    bufimageutil_test.go:275:
        	Error Trace:	/Users/alice/git/buf/private/bufpkg/bufimage/bufimageutil/bufimageutil_test.go:275
        	           				/Users/alice/git/buf/private/bufpkg/bufimage/bufimageutil/bufimageutil_test.go:119
        	Error:      	Not equal:
        	           	expected: "-- baz1.proto --\nsyntax = \"proto3\";\npackage foo.bar.baz;\nmessage Bar {\n  map<string,int32> attributes = 1;\n}\nmessage Foo {\n  Enum en = 1;\n  string name = 2;\n  oneof loc {\n    string address = 3;\n    uint32 zip_code = 4;\n    uint64 other_xref = 5;\n  }\n  enum Enum {\n    VALUE0 = 0;\n    VALUE1 = 1;\n    VALUE2 = 2;\n  }\n}\nservice BazService {\n  rpc GetBaz ( Foo ) returns ( Bar );\n}\n-- baz2.proto --\nsyntax = \"proto3\";\npackage foo.bar.baz;\nimport \"options.proto\";\nmessage Empty {\n}\nenum AlmostEmpty {\n  UNSET = 0;\n}\nservice NoOp {\n  option (svc_option_str) = \"blah\";\n  rpc Nothing ( Empty ) returns ( Empty );\n}\n-- google/protobuf/descriptor.proto --\nsyntax = \"proto2\";\npackage google.protobuf;\noption cc_enable_arenas = true;\noption csharp_namespace = \"Google.Protobuf.Reflection\";\noption go_package = \"google.golang.org/protobuf/types/descriptorpb\";\noption java_outer_classname = \"DescriptorProtos\";\noption java_package = \"com.google.protobuf\";\noption objc_class_prefix = \"GPB\";\noption optimize_for = SPEED;\nmessage ServiceOptions {\n  optional bool deprecated = 33 [default = false];\n  repeatedUninterpretedOption uninterpreted_option = 999;\n  extensions 1000 to max;\n}\nmessage UninterpretedOption {\n  repeated NamePart name = 2;\n  optional string identifier_value = 3;\n  optional uint64 positive_int_value = 4;\n  optional int64 negative_int_value = 5;\n optional double double_value = 6;\n  optional bytes string_value = 7;\n  optional string aggregate_value = 8;\n  message NamePart {\n    required string name_part = 1;\n    required bool is_extension = 2;\n  }\n}\n-- options.proto --\nsyntax = \"proto3\";\nimport \"google/protobuf/descriptor.proto\";\nextend google.protobuf.ServiceOptions {\n  string svc_option_str = 30000;\n}\n"
        	           	actual  : "-- baz1.proto --\nsyntax = \"proto3\";\npackage foo.bar.baz;\nmessage Bar {\n  map<string,int32> attributes = 1;\n}\nmessage Foo {\n  Enum en = 1;\n  string name = 2;\n  oneof loc {\n    string address = 3;\n    uint32 zip_code = 4;\n    uint64 other_xref = 5;\n  }\n  enum Enum {\n    VALUE0 = 0;\n    VALUE1 = 1;\n    VALUE2 = 2;\n  }\n}\nservice BazService {\n  rpc GetBaz ( Foo ) returns ( Bar );\n}\n-- baz2.proto --\nsyntax = \"proto3\";\npackage foo.bar.baz;\nmessage Empty {\n}\nenumAlmostEmpty {\n  UNSET = 0;\n}\nservice NoOp {\n  rpc Nothing ( Empty ) returns ( Empty );\n}\n"
        	           	
        	           	Diff:
        	           	--- Expected
        	           	+++ Actual
        	           	@@ -26,3 +26,2 @@
        	           	package foo.bar.baz;
        	           	-import "options.proto";
        	           	message Empty {
        	           	@@ -33,39 +32,4 @@
        	           	service NoOp {
        	           	-  option (svc_option_str) = "blah";
        	           	  rpc Nothing ( Empty ) returns ( Empty );
        	           	}
        	           	--- google/protobuf/descriptor.proto --
        	           	-syntax = "proto2";
        	           	-package google.protobuf;
        	           	-option cc_enable_arenas = true;
        	           	-option csharp_namespace = "Google.Protobuf.Reflection";
        	           	-option go_package = "google.golang.org/protobuf/types/descriptorpb";
        	           	-option java_outer_classname = "DescriptorProtos";
        	           	-option java_package = "com.google.protobuf";
        	           	-option objc_class_prefix = "GPB";
        	           	-option optimize_for = SPEED;
        	           	-message ServiceOptions {
        	           	-  optional bool deprecated = 33 [default = false];
        	           	-  repeated UninterpretedOption uninterpreted_option = 999;
        	           	-  extensions 1000 to max;
        	           	-}
        	           	-message UninterpretedOption {
        	           	-  repeated NamePart name = 2;
        	           	-  optional string identifier_value = 3;
        	           	-  optional uint64 positive_int_value = 4;
        	           	-  optional int64 negative_int_value = 5;
        	           	-  optional double double_value = 6;
        	           	-  optional bytes string_value = 7;
        	           	-  optional string aggregate_value = 8;
        	           	-  message NamePart {
        	           	-    required string name_part = 1;
        	           	-    required bool is_extension = 2;
        	           	-  }
        	           	-}
        	           	--- options.proto --
        	           	-syntax = "proto3";
        	           	-import "google/protobuf/descriptor.proto";
        	           	-extend google.protobuf.ServiceOptions {
        	           	-  string svc_option_str = 30000;
        	           	-}
        	           	
        	Test:       	TestPackages
FAIL
FAIL	github.com/bufbuild/buf/private/bufpkg/bufimage/bufimageutil	2.262s

@bufdev bufdev requested a review from jhump March 6, 2023 15:42
@bufdev
Copy link
Member Author

bufdev commented Mar 6, 2023

#1886 #1887 #1888 #1889 #1890 all supplanted by this

@bufdev
Copy link
Member Author

bufdev commented Mar 8, 2023

Let hold off merging until 1.15.1 is released

@bufdev
Copy link
Member Author

bufdev commented Mar 8, 2023

Actually on second thought, we should go for it and stay up to date for this one.

@bufdev bufdev merged commit 246f551 into main Mar 8, 2023
@bufdev bufdev deleted the make-upgrade-20230306 branch March 8, 2023 16:15
Monirul1 pushed a commit to Monirul1/buf that referenced this pull request Apr 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants