py,go,java: remove send/recv msg size limit (#2900)

googleapis · Aug 1, 2019 · 5cd7aa4 · 5cd7aa4
1 parent 2b20acc
commit 5cd7aa4
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 15 deletions.
diff --git a/src/main/java/com/google/api/codegen/transformer/go/GoGapicSurfaceTransformer.java b/src/main/java/com/google/api/codegen/transformer/go/GoGapicSurfaceTransformer.java
@@ -327,6 +327,7 @@ List<RetryConfigDefinitionView> generateRetryConfigDefinitions(
   void addXApiImports(InterfaceContext context, Collection<MethodModel> methods) {
     ImportTypeTable typeTable = context.getImportTypeTable();
     typeTable.saveNicknameFor("context;;;");
+    typeTable.saveNicknameFor("math;;;");
     typeTable.saveNicknameFor("google.golang.org/grpc;;;");
     typeTable.saveNicknameFor("github.com/googleapis/gax-go/v2;gax;;");
     typeTable.saveNicknameFor("google.golang.org/api/option;;;");
@@ -409,9 +410,7 @@ private enum ImportKind {
                   ImportContext.CLIENT,
                   ImportKind.PAGE_STREAM,
                   ImmutableList.<String>of(
-                      "math;;;",
-                      "google.golang.org/api/iterator;;;",
-                      "github.com/golang/protobuf/proto;;;"))
+                      "google.golang.org/api/iterator;;;", "github.com/golang/protobuf/proto;;;"))
               .put(
                   ImportContext.EXAMPLE,
                   ImportKind.PAGE_STREAM,

diff --git a/src/main/resources/com/google/api/codegen/go/main.snip b/src/main/resources/com/google/api/codegen/go/main.snip
@@ -21,6 +21,8 @@
         return []option.ClientOption{
             option.WithEndpoint("{@view.serviceHostname}:{@view.servicePort}"),
             option.WithScopes(DefaultAuthScopes()...),
+            option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
+            			grpc.MaxCallRecvMsgSize(math.MaxInt32))),
         }
     }
 

diff --git a/src/main/resources/com/google/api/codegen/java/stub_settings.snip b/src/main/resources/com/google/api/codegen/java/stub_settings.snip
@@ -107,7 +107,12 @@
   @if xsettingsClass.hasDefaultServiceAddress
     /** Returns a builder for the default ChannelProvider for this service. */
     public static {@xsettingsClass.instantiatingChannelProvider}.Builder {@xsettingsClass.defaultTransportProviderBuilder}() {
-      return {@xsettingsClass.instantiatingChannelProvider}.newBuilder();
+      @if xsettingsClass.transportProtocol == "GRPC"
+        return {@xsettingsClass.instantiatingChannelProvider}.newBuilder()
+            .setMaxInboundMessageSize(Integer.MAX_VALUE);
+      @else
+        return {@xsettingsClass.instantiatingChannelProvider}.newBuilder();
+      @end
     }
 
     public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/src/main/resources/com/google/api/codegen/py/transport.snip b/src/main/resources/com/google/api/codegen/py/transport.snip
@@ -50,6 +50,10 @@
                 channel = self.create_channel(
                     address=address,
                     credentials=credentials,
+                    options={
+                        'grpc.max_send_message_length': -1,
+                        'grpc.max_receive_message_length': -1,
+                    },
                 )
 
             self._channel = channel

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/go/go_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/go/go_library.baseline
@@ -251,6 +251,8 @@ func defaultClientOptions() []option.ClientOption {
     return []option.ClientOption{
         option.WithEndpoint("library-example.googleapis.com:1234"),
         option.WithScopes(DefaultAuthScopes()...),
+        option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
+        			grpc.MaxCallRecvMsgSize(math.MaxInt32))),
     }
 }
 
@@ -4402,6 +4404,7 @@ package library
 import (
     pb ""
     "context"
+    "math"
 
     gax "github.com/googleapis/gax-go/v2"
     "google.golang.org/api/option"
@@ -4419,6 +4422,8 @@ func defaultMyProtoClientOptions() []option.ClientOption {
     return []option.ClientOption{
         option.WithEndpoint("library-example.googleapis.com:1234"),
         option.WithScopes(DefaultAuthScopes()...),
+        option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
+        			grpc.MaxCallRecvMsgSize(math.MaxInt32))),
     }
 }
 

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/java/java_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/java/java_library.baseline
@@ -11579,7 +11579,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {
@@ -12812,7 +12813,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/java/java_my_streaming_proto.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/java/java_my_streaming_proto.baseline
@@ -996,7 +996,8 @@ public class MyStreamingServiceStubSettings extends StubSettings<MyStreamingServ
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/...m/google/api/codegen/gapic/testdata/java/java_samplegen_config_migration_library.baseline b/...m/google/api/codegen/gapic/testdata/java/java_samplegen_config_migration_library.baseline
@@ -9450,7 +9450,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {
@@ -10683,7 +10684,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline
@@ -4276,6 +4276,10 @@ class LibraryServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel
@@ -4776,6 +4780,10 @@ class MyProtoGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline
@@ -1429,6 +1429,10 @@ class DecrementerServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel
@@ -1553,6 +1557,10 @@ class IncrementerServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline
@@ -1118,6 +1118,10 @@ class NoTemplatesApiServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/...m/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline b/...m/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline
@@ -4267,6 +4267,10 @@ class LibraryServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel
@@ -4767,6 +4771,10 @@ class MyProtoGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/go_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/go_library.baseline
@@ -251,6 +251,8 @@ func defaultClientOptions() []option.ClientOption {
     return []option.ClientOption{
         option.WithEndpoint("library-example.googleapis.com:1234"),
         option.WithScopes(DefaultAuthScopes()...),
+        option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
+        			grpc.MaxCallRecvMsgSize(math.MaxInt32))),
     }
 }
 
@@ -4408,6 +4410,7 @@ package library
 import (
     pb ""
     "context"
+    "math"
 
     gax "github.com/googleapis/gax-go/v2"
     "google.golang.org/api/option"
@@ -4425,6 +4428,8 @@ func defaultMyProtoClientOptions() []option.ClientOption {
     return []option.ClientOption{
         option.WithEndpoint("library-example.googleapis.com:1234"),
         option.WithScopes(DefaultAuthScopes()...),
+        option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
+        			grpc.MaxCallRecvMsgSize(math.MaxInt32))),
     }
 }
 

diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/java_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/java_library.baseline
@@ -11572,7 +11572,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {
@@ -12805,7 +12806,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/...va/com/google/api/codegen/protoannotations/testdata/java_library_no_gapic_config.baseline b/...va/com/google/api/codegen/protoannotations/testdata/java_library_no_gapic_config.baseline
@@ -7172,7 +7172,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {
@@ -8214,7 +8215,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
+    return InstantiatingGrpcChannelProvider.newBuilder()
+        .setMaxInboundMessageSize(Integer.MAX_VALUE);
   }
 
   public static TransportChannelProvider defaultTransportChannelProvider() {

diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline
@@ -4269,6 +4269,10 @@ class LibraryServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel
@@ -4769,6 +4773,10 @@ class MyProtoGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/.../com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline b/.../com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline
@@ -3778,6 +3778,10 @@ class LibraryServiceGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel
@@ -4273,6 +4277,10 @@ class MyProtoGrpcTransport(object):
             channel = self.create_channel(
                 address=address,
                 credentials=credentials,
+                options={
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                },
             )
 
         self._channel = channel

diff --git a/src/test/java/com/google/api/codegen/transformer/go/GoGapicSurfaceTransformerTest.java b/src/test/java/com/google/api/codegen/transformer/go/GoGapicSurfaceTransformerTest.java
@@ -118,7 +118,6 @@ public void testGetImportsPageStream() {
         new ProtoMethodModel(getMethod(context.getInterface(), "PageStreamMethod"));
     transformer.addXApiImports(context, Collections.singletonList(method));
     transformer.generateRetryConfigDefinitions(context, Collections.singletonList(method));
-    assertThat(context.getImportTypeTable().getImports()).containsKey("math");
     assertThat(context.getImportTypeTable().getImports())
         .doesNotContainKey("cloud.google.com/go/longrunning");
   }
@@ -128,7 +127,6 @@ public void testGetImportsLro() {
     MethodModel method = new ProtoMethodModel(getMethod(context.getInterface(), "LroMethod"));
     transformer.addXApiImports(context, Collections.singletonList(method));
     transformer.generateRetryConfigDefinitions(context, Collections.singletonList(method));
-    assertThat(context.getImportTypeTable().getImports()).doesNotContainKey("math");
     assertThat(context.getImportTypeTable().getImports())
         .containsKey("cloud.google.com/go/longrunning");
   }