Add latest Gen2 API updates including Blobstore and Mail APIs (GoogleCloudPlatform#33)

Author: shreejad

setup.py

@@ -19,7 +19,7 @@
         "google-auth>=1.31.0",
         "mock>=4.0.3",
         "Pillow>=8.3.1",
-        "protobuf>=3.18.0",
+        "protobuf>=3.19.0",
         "pytz>=2021.1",
         "requests>=2.25.1",
         "ruamel.yaml>=0.15,<0.16",

src/google/appengine/api/api_base_pb2.py

@@ -19,6 +19,7 @@
 
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
@@ -29,243 +30,17 @@
 
 
 
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='google/appengine/api/api_base.proto',
-  package='google.appengine.base',
-  syntax='proto2',
-  serialized_options=b'\n\037com.google.google.appengine.apiB\tApiBasePb',
-  create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n#google/appengine/api/api_base.proto\x12\x15google.appengine.base\"\x1c\n\x0bStringProto\x12\r\n\x05value\x18\x01 \x02(\t\"\x1f\n\x0eInteger32Proto\x12\r\n\x05value\x18\x01 \x02(\x05\"\x1f\n\x0eInteger64Proto\x12\r\n\x05value\x18\x01 \x02(\x03\"\x1a\n\tBoolProto\x12\r\n\x05value\x18\x01 \x02(\x08\"\x1c\n\x0b\x44oubleProto\x12\r\n\x05value\x18\x01 \x02(\x01\"\x1f\n\nBytesProto\x12\x11\n\x05value\x18\x01 \x02(\x0c\x42\x02\x08\x01\"\x0b\n\tVoidProtoB,\n\x1f\x63om.google.google.appengine.apiB\tApiBasePb'
-)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#google/appengine/api/api_base.proto\x12\x15google.appengine.base\"\x1c\n\x0bStringProto\x12\r\n\x05value\x18\x01 \x02(\t\"\x1f\n\x0eInteger32Proto\x12\r\n\x05value\x18\x01 \x02(\x05\"\x1f\n\x0eInteger64Proto\x12\r\n\x05value\x18\x01 \x02(\x03\"\x1a\n\tBoolProto\x12\r\n\x05value\x18\x01 \x02(\x08\"\x1c\n\x0b\x44oubleProto\x12\r\n\x05value\x18\x01 \x02(\x01\"\x1f\n\nBytesProto\x12\x11\n\x05value\x18\x01 \x02(\x0c\x42\x02\x08\x01\"\x0b\n\tVoidProtoB,\n\x1f\x63om.google.google.appengine.apiB\tApiBasePb')
 
 
 
-
-_STRINGPROTO = _descriptor.Descriptor(
-  name='StringProto',
-  full_name='google.appengine.base.StringProto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.StringProto.value', index=0,
-      number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=b"".decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=62,
-  serialized_end=90,
-)
-
-
-_INTEGER32PROTO = _descriptor.Descriptor(
-  name='Integer32Proto',
-  full_name='google.appengine.base.Integer32Proto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.Integer32Proto.value', index=0,
-      number=1, type=5, cpp_type=1, label=2,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=92,
-  serialized_end=123,
-)
-
-
-_INTEGER64PROTO = _descriptor.Descriptor(
-  name='Integer64Proto',
-  full_name='google.appengine.base.Integer64Proto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.Integer64Proto.value', index=0,
-      number=1, type=3, cpp_type=2, label=2,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=125,
-  serialized_end=156,
-)
-
-
-_BOOLPROTO = _descriptor.Descriptor(
-  name='BoolProto',
-  full_name='google.appengine.base.BoolProto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.BoolProto.value', index=0,
-      number=1, type=8, cpp_type=7, label=2,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=158,
-  serialized_end=184,
-)
-
-
-_DOUBLEPROTO = _descriptor.Descriptor(
-  name='DoubleProto',
-  full_name='google.appengine.base.DoubleProto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.DoubleProto.value', index=0,
-      number=1, type=1, cpp_type=5, label=2,
-      has_default_value=False, default_value=float(0),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=186,
-  serialized_end=214,
-)
-
-
-_BYTESPROTO = _descriptor.Descriptor(
-  name='BytesProto',
-  full_name='google.appengine.base.BytesProto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='value', full_name='google.appengine.base.BytesProto.value', index=0,
-      number=1, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=b"",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=b'\010\001', file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=216,
-  serialized_end=247,
-)
-
-
-_VOIDPROTO = _descriptor.Descriptor(
-  name='VoidProto',
-  full_name='google.appengine.base.VoidProto',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  create_key=_descriptor._internal_create_key,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=249,
-  serialized_end=260,
-)
-
-DESCRIPTOR.message_types_by_name['StringProto'] = _STRINGPROTO
-DESCRIPTOR.message_types_by_name['Integer32Proto'] = _INTEGER32PROTO
-DESCRIPTOR.message_types_by_name['Integer64Proto'] = _INTEGER64PROTO
-DESCRIPTOR.message_types_by_name['BoolProto'] = _BOOLPROTO
-DESCRIPTOR.message_types_by_name['DoubleProto'] = _DOUBLEPROTO
-DESCRIPTOR.message_types_by_name['BytesProto'] = _BYTESPROTO
-DESCRIPTOR.message_types_by_name['VoidProto'] = _VOIDPROTO
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
+_STRINGPROTO = DESCRIPTOR.message_types_by_name['StringProto']
+_INTEGER32PROTO = DESCRIPTOR.message_types_by_name['Integer32Proto']
+_INTEGER64PROTO = DESCRIPTOR.message_types_by_name['Integer64Proto']
+_BOOLPROTO = DESCRIPTOR.message_types_by_name['BoolProto']
+_DOUBLEPROTO = DESCRIPTOR.message_types_by_name['DoubleProto']
+_BYTESPROTO = DESCRIPTOR.message_types_by_name['BytesProto']
+_VOIDPROTO = DESCRIPTOR.message_types_by_name['VoidProto']
 StringProto = _reflection.GeneratedProtocolMessageType('StringProto', (_message.Message,), {
   'DESCRIPTOR' : _STRINGPROTO,
   '__module__' : 'google.appengine.api.api_base_pb2'
@@ -315,7 +90,24 @@
   })
 _sym_db.RegisterMessage(VoidProto)
 
-
-DESCRIPTOR._options = None
-_BYTESPROTO.fields_by_name['value']._options = None
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\037com.google.google.appengine.apiB\tApiBasePb'
+  _BYTESPROTO.fields_by_name['value']._options = None
+  _BYTESPROTO.fields_by_name['value']._serialized_options = b'\010\001'
+  _STRINGPROTO._serialized_start=62
+  _STRINGPROTO._serialized_end=90
+  _INTEGER32PROTO._serialized_start=92
+  _INTEGER32PROTO._serialized_end=123
+  _INTEGER64PROTO._serialized_start=125
+  _INTEGER64PROTO._serialized_end=156
+  _BOOLPROTO._serialized_start=158
+  _BOOLPROTO._serialized_end=184
+  _DOUBLEPROTO._serialized_start=186
+  _DOUBLEPROTO._serialized_end=214
+  _BYTESPROTO._serialized_start=216
+  _BYTESPROTO._serialized_end=247
+  _VOIDPROTO._serialized_start=249
+  _VOIDPROTO._serialized_end=260
 

src/google/appengine/api/app_identity/app_identity_defaultcredentialsbased_stub.py

@@ -26,13 +26,6 @@
 import time
 import typing
 
-from pyasn1.codec.der import decoder
-from pyasn1_modules.rfc2459 import Certificate
-import rsa
-import six
-from six.moves import range
-from six.moves import urllib
-
 from google.appengine.api import urlfetch
 from google.appengine.api.app_identity import app_identity_service_pb2
 from google.appengine.api.app_identity import app_identity_stub_base
@@ -45,6 +38,13 @@
 from google.auth.transport import requests as transport
 from google.oauth2 import service_account as oauth2_service_account
 
+from pyasn1.codec.der import decoder
+from pyasn1_modules.rfc2459 import Certificate
+import rsa
+import six
+from six.moves import range
+from six.moves import urllib
+
 
 def BitStringToByteString(bs):
   """Convert a pyasn1.type.univ.BitString object to a string of bytes."""
@@ -162,12 +162,7 @@ def _Dynamic_GetPublicCertificatesForApp(self, request, response):
 
   def _Dynamic_GetServiceAccountName(self, request, response):
     """Implementation of AppIdentityService::GetServiceAccountName."""
-    if self._non_service_account_credentials:
-
-
-      response.service_account_name = ''
-    else:
-      response.service_account_name = self._credentials.service_account_email
+    response.service_account_name = self.get_service_account_name()
 
   def _Dynamic_GetDefaultGcsBucketName(self, unused_request, response):
     """Implementation of AppIdentityService::GetDefaultGcsBucketName."""
@@ -180,7 +175,7 @@ def SetDefaultGcsBucketName(self, default_gcs_bucket_name):
       self._default_gcs_bucket_name = (
           app_identity_stub_base.APP_DEFAULT_GCS_BUCKET_NAME)
 
-  def _patch_get_service_account_token(self, scopes, service_account=None):
+  def get_service_account_token(self, scopes, service_account=None):
     """Implementation of AppIdentityService::GetAccessToken.
 
     This API requires internet access.
@@ -219,6 +214,13 @@ def _patch_get_service_account_token(self, scopes, service_account=None):
 
     return rv['access_token'], rv['expires']
 
+  def get_service_account_name(self):
+    if self._non_service_account_credentials:
+
+
+      return ''
+    return self._credentials.service_account_email
+
 
 def TimestampFromNaiveUtcDatetime(dt):
   if dt.tzinfo is not None:

src/google/appengine/api/app_identity/app_identity_keybased_stub.py

@@ -163,7 +163,7 @@ def _Dynamic_GetPublicCertificatesForApp(self, request, response):
 
   def _Dynamic_GetServiceAccountName(self, request, response):
     """Implementation of AppIdentityService::GetServiceAccountName."""
-    response.service_account_name = self.__email_address
+    response.service_account_name = self.get_service_account_name()
 
   def _Dynamic_GetDefaultGcsBucketName(self, unused_request, response):
     """Implementation of AppIdentityService::GetDefaultGcsBucketName."""
@@ -176,7 +176,7 @@ def SetDefaultGcsBucketName(self, default_gcs_bucket_name):
       self.__default_gcs_bucket_name = (
           app_identity_stub_base.APP_DEFAULT_GCS_BUCKET_NAME)
 
-  def _patch_get_service_account_token(self, scopes, service_account=None):
+  def get_service_account_token(self, scopes, service_account=None):
     """Implementation of AppIdentityService::GetAccessToken.
 
     This API requires internet access.
@@ -244,3 +244,6 @@ def _patch_get_service_account_token(self, scopes, service_account=None):
         self.__access_token_cache[scope] = rv
 
     return rv['access_token'], rv['expires']
+
+  def get_service_account_name(self):
+    return self.__email_address