diff --git a/airflow/providers/google/cloud/hooks/cloud_memorystore.py b/airflow/providers/google/cloud/hooks/cloud_memorystore.py index caf1cd6cf6e2c..8f4165ba4675e 100644 --- a/airflow/providers/google/cloud/hooks/cloud_memorystore.py +++ b/airflow/providers/google/cloud/hooks/cloud_memorystore.py @@ -487,8 +487,8 @@ def update_instance( - ``redisConfig`` If a dict is provided, it must be of the same form as the protobuf message - :class:`~google.cloud.redis_v1.types.FieldMask` - :type update_mask: Union[Dict, google.cloud.redis_v1.types.FieldMask] + :class:`~google.protobuf.field_mask_pb2.FieldMask` + :type update_mask: Union[Dict, google.protobuf.field_mask_pb2.FieldMask] :param instance: Required. Update description. Only fields specified in ``update_mask`` are updated. If a dict is provided, it must be of the same form as the protobuf message @@ -871,7 +871,7 @@ def list_instances( @GoogleBaseHook.fallback_to_default_project_id def update_instance( self, - update_mask: Union[Dict, cloud_memcache.field_mask.FieldMask], + update_mask: Union[Dict, FieldMask], instance: Union[Dict, cloud_memcache.Instance], project_id: str, location: Optional[str] = None, @@ -889,9 +889,9 @@ def update_instance( - ``displayName`` If a dict is provided, it must be of the same form as the protobuf message - :class:`~google.cloud.memcache_v1beta2.types.cloud_memcache.field_mask.FieldMask` + :class:`~google.protobuf.field_mask_pb2.FieldMask`) :type update_mask: - Union[Dict, google.cloud.memcache_v1beta2.types.cloud_memcache.field_mask.FieldMask] + Union[Dict, google.protobuf.field_mask_pb2.FieldMask] :param instance: Required. Update description. Only fields specified in ``update_mask`` are updated. If a dict is provided, it must be of the same form as the protobuf message @@ -935,7 +935,7 @@ def update_instance( @GoogleBaseHook.fallback_to_default_project_id def update_parameters( self, - update_mask: Union[Dict, cloud_memcache.field_mask.FieldMask], + update_mask: Union[Dict, FieldMask], parameters: Union[Dict, cloud_memcache.MemcacheParameters], project_id: str, location: str, @@ -951,9 +951,9 @@ def update_parameters( :param update_mask: Required. Mask of fields to update. If a dict is provided, it must be of the same form as the protobuf message - :class:`~google.cloud.memcache_v1beta2.types.cloud_memcache.field_mask.FieldMask` + :class:`~google.protobuf.field_mask_pb2.FieldMask` :type update_mask: - Union[Dict, google.cloud.memcache_v1beta2.types.cloud_memcache.field_mask.FieldMask] + Union[Dict, google.protobuf.field_mask_pb2.FieldMask] :param parameters: The parameters to apply to the instance. If a dict is provided, it must be of the same form as the protobuf message :class:`~google.cloud.memcache_v1beta2.types.cloud_memcache.MemcacheParameters` diff --git a/setup.py b/setup.py index 8a1e26965c418..0ec5e9f31dd28 100644 --- a/setup.py +++ b/setup.py @@ -292,7 +292,9 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version 'google-cloud-kms>=2.0.0,<3.0.0', 'google-cloud-language>=1.1.1,<2.0.0', 'google-cloud-logging>=2.1.1,<3.0.0', - 'google-cloud-memcache>=0.2.0', + # 1.1.0 removed field_mask and broke import for released providers + # We can remove the <1.1.0 limitation after we release new Google Provider + 'google-cloud-memcache>=0.2.0,<1.1.0', 'google-cloud-monitoring>=2.0.0,<3.0.0', 'google-cloud-os-login>=2.0.0,<3.0.0', 'google-cloud-pubsub>=2.0.0,<3.0.0',