Re-generate DLP (googleapis#5131)

Jon Wayne Parrott · web-flow · commit c087f09989c3 · 2018-03-30T09:14:26.000-07:00
* Regenerate DLP v2

Command log:

```
set DEST ~/workspace/google-cloud-python/dlp

cd /tmp
git clone git@github.com:googleapis/googleapis.git
cd googleapis
artman --root (pwd) --config google/privacy/dlp/artman_dlp_v2.yaml generate python_gapic

set SRC ./artman-genfiles/python/dlp-v2
set IMPORT_PKG dlp_v2
cp -r $SRC/docs $DEST
cp -r $SRC/google/cloud/$IMPORT_PKG $DEST/google/cloud/
mkdir -p $DEST/tests/unit/gapic
cp -r $SRC/tests/unit/gapic $DEST/tests/unit
```

* Manually fix protos

* Manually fix docs

* Add coding
diff --git a/dlp/docs/gapic/v2/api.rst b/dlp/docs/gapic/v2/api.rst
@@ -1,5 +1,5 @@
-Client for DLP API
-==================
+Client for Cloud Data Loss Prevention (DLP) API
+===============================================
 
 .. automodule:: google.cloud.dlp_v2
     :members:
diff --git a/dlp/docs/gapic/v2/types.rst b/dlp/docs/gapic/v2/types.rst
@@ -1,5 +1,5 @@
-Types for DLP API Client
-========================
+Types for Cloud Data Loss Prevention (DLP) API Client
+=====================================================
 
 .. automodule:: google.cloud.dlp_v2.types
     :members:
diff --git a/dlp/docs/index.rst b/dlp/docs/index.rst
@@ -1,13 +1,14 @@
-Python Client for DLP API (`Alpha`_)
-====================================
+Python Client for Cloud Data Loss Prevention (DLP) API (`Alpha`_)
+=================================================================
 
-`DLP API`_:
+`Cloud Data Loss Prevention (DLP) API`_: Provides methods for detection of privacy-sensitive fragments in text,
+images, and Google Cloud Platform storage repositories.
 
 - `Client Library Documentation`_
 - `Product Documentation`_
 
 .. _Alpha: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
-.. _DLP API: https://cloud.google.com/dlp
+.. _Cloud Data Loss Prevention (DLP) API: https://cloud.google.com/dlp
 .. _Client Library Documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/dlp/usage.html
 .. _Product Documentation:  https://cloud.google.com/dlp
 
@@ -18,12 +19,12 @@ In order to use this library, you first need to go through the following steps:
 
 1. `Select or create a Cloud Platform project.`_
 2. `Enable billing for your project.`_
-3. `Enable the DLP API.`_
+3. `Enable the Cloud Data Loss Prevention (DLP) API.`_
 4. `Setup Authentication.`_
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
 .. _Enable billing for your project.: https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project
-.. _Enable the DLP API.:  https://cloud.google.com/dlp
+.. _Enable the Cloud Data Loss Prevention (DLP) API.:  https://cloud.google.com/dlp
 .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/core/auth.html
 
 Installation
@@ -64,14 +65,14 @@ Windows
 Next Steps
 ~~~~~~~~~~
 
--  Read the `Client Library Documentation`_ for DLP API
+-  Read the `Client Library Documentation`_ for Cloud Data Loss Prevention (DLP) API
    API to see other available methods on the client.
--  Read the `DLP API Product documentation`_ to learn
+-  Read the `Cloud Data Loss Prevention (DLP) API Product documentation`_ to learn
    more about the product and see How-to Guides.
 -  View this `repository’s main README`_ to see the full list of Cloud
    APIs that we cover.
 
-.. _DLP API Product documentation:  https://cloud.google.com/dlp
+.. _Cloud Data Loss Prevention (DLP) API Product documentation:  https://cloud.google.com/dlp
 .. _repository’s main README: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/README.rst
 
 Api Reference
diff --git a/dlp/google/cloud/dlp_v2/gapic/dlp_service_client.py b/dlp/google/cloud/dlp_v2/gapic/dlp_service_client.py
@@ -27,6 +27,7 @@
 from google.cloud.dlp_v2.gapic import dlp_service_client_config
 from google.cloud.dlp_v2.gapic import enums
 from google.cloud.dlp_v2.proto import dlp_pb2
+from google.cloud.dlp_v2.proto import dlp_pb2_grpc
 from google.protobuf import empty_pb2
 from google.protobuf import field_mask_pb2
 
@@ -36,7 +37,7 @@
 
 class DlpServiceClient(object):
     """
-    The DLP API is a service that allows clients
+    The Cloud Data Loss Prevention (DLP) API is a service that allows clients
     to detect the presence of Personally Identifiable Information (PII) and other
     privacy-sensitive data in user-supplied, unstructured data streams, like text
     blocks or images.
@@ -167,7 +168,7 @@ def __init__(self,
             )
 
         # Create the gRPC stubs.
-        self.dlp_service_stub = (dlp_pb2.DlpServiceStub(channel))
+        self.dlp_service_stub = (dlp_pb2_grpc.DlpServiceStub(channel))
 
         if client_info is None:
             client_info = (
@@ -562,7 +563,7 @@ def reidentify_content(self,
                            timeout=google.api_core.gapic_v1.method.DEFAULT,
                            metadata=None):
         """
-        Re-identify content that has been de-identified.
+        Re-identifies content that has been de-identified.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -583,7 +584,7 @@ def reidentify_content(self,
                 reverse. This requires that only reversible transformations
                 be provided here. The reversible transformations are::
 
-                     - ``CryptoReplaceFfxFpeConfig``
+                 - ``CryptoReplaceFfxFpeConfig``
 
                 If a dict is provided, it must be of the same form as the protobuf
                 message :class:`~google.cloud.dlp_v2.types.DeidentifyConfig`
@@ -644,7 +645,9 @@ def list_info_types(self,
                         timeout=google.api_core.gapic_v1.method.DEFAULT,
                         metadata=None):
         """
-        Returns sensitive information types DLP supports.
+        Returns a list of the sensitive information types that the DLP API
+        supports. For more information, see [Listing supported predefined
+        infoTypes](/dlp/docs/listing-infotypes).
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -940,7 +943,7 @@ def delete_inspect_template(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Deletes inspect templates.
+        Deletes an inspect template.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -987,7 +990,7 @@ def create_deidentify_template(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Creates an Deidentify template for re-using frequently used configuration
+        Creates a de-identify template for re-using frequently used configuration
         for Deidentifying content, images, and storage.
 
         Example:
@@ -1048,7 +1051,7 @@ def update_deidentify_template(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Updates the inspect template.
+        Updates the de-identify template.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -1106,7 +1109,7 @@ def get_deidentify_template(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Gets an inspect template.
+        Gets a de-identify template.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -1155,7 +1158,7 @@ def list_deidentify_templates(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Lists inspect templates.
+        Lists de-identify templates.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -1234,7 +1237,7 @@ def delete_deidentify_template(
             timeout=google.api_core.gapic_v1.method.DEFAULT,
             metadata=None):
         """
-        Deletes inspect templates.
+        Deletes a de-identify template.
 
         Example:
             >>> from google.cloud import dlp_v2
@@ -1281,7 +1284,7 @@ def create_dlp_job(self,
                        timeout=google.api_core.gapic_v1.method.DEFAULT,
                        metadata=None):
         """
-        Create a new job to inspect storage or calculate risk metrics [How-to
+        Creates a new job to inspect storage or calculate risk metrics [How-to
         guide](/dlp/docs/compute-risk-analysis).
 
         Example:
@@ -1546,7 +1549,7 @@ def cancel_dlp_job(self,
                        timeout=google.api_core.gapic_v1.method.DEFAULT,
                        metadata=None):
         """
-        Starts asynchronous cancellation on a long-running DlpJob.  The server
+        Starts asynchronous cancellation on a long-running DlpJob. The server
         makes a best effort to cancel the DlpJob, but success is not
         guaranteed.
 
@@ -1833,8 +1836,8 @@ def create_job_trigger(self,
                            timeout=google.api_core.gapic_v1.method.DEFAULT,
                            metadata=None):
         """
-        Creates a job to run DLP actions such as scanning storage for sensitive
-        information on a set schedule.
+        Creates a job trigger to run DLP actions such as scanning storage for
+        sensitive information on a set schedule.
 
         Example:
             >>> from google.cloud import dlp_v2
diff --git a/dlp/google/cloud/dlp_v2/gapic/enums.py b/dlp/google/cloud/dlp_v2/gapic/enums.py
@@ -35,6 +35,25 @@ class Likelihood(object):
     VERY_LIKELY = 5
 
 
+class FileType(object):
+    """
+    Definitions of file type groups to scan.
+
+    Attributes:
+      FILE_TYPE_UNSPECIFIED (int): Includes all files.
+      BINARY_FILE (int): Includes all file extensions not covered by other types.
+      TEXT_FILE (int): Included file extensions:
+        c, cc, cpp, cxx, c++, cs, css, dart, eml, go, h, hh, hpp, hxx, h++, hs,
+        html, htm, shtml, shtm, xhtml, lhs, ini, java, js, json, ocaml, md, mkd,
+        markdown, m, ml, mli, pl, pm, php, phtml, pht, py, pyw, rb, rbw, rs, rc,
+        scala, sh, sql, tex, txt, asc, text, brf, vcard, vcs, wml, xml, xsl, xsd,
+        yml, yaml.
+    """
+    FILE_TYPE_UNSPECIFIED = 0
+    BINARY_FILE = 1
+    TEXT_FILE = 2
+
+
 class DayOfWeek(object):
     """
     Represents a day of week.
@@ -130,13 +149,15 @@ class BytesType(object):
         """
         Attributes:
           BYTES_TYPE_UNSPECIFIED (int)
+          IMAGE (int)
           IMAGE_JPEG (int)
           IMAGE_BMP (int)
           IMAGE_PNG (int)
           IMAGE_SVG (int)
           TEXT_UTF8 (int)
         """
         BYTES_TYPE_UNSPECIFIED = 0
+        IMAGE = 6
         IMAGE_JPEG = 1
         IMAGE_BMP = 2
         IMAGE_PNG = 3
diff --git a/dlp/google/cloud/dlp_v2/proto/dlp_pb2.py b/dlp/google/cloud/dlp_v2/proto/dlp_pb2.py
diff --git a/dlp/google/cloud/dlp_v2/proto/dlp_pb2_grpc.py b/dlp/google/cloud/dlp_v2/proto/dlp_pb2_grpc.py
@@ -1,12 +1,12 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-import google.cloud.privacy.dlp_v2.proto.dlp_pb2 as google_dot_cloud_dot_privacy_dot_dlp__v2_dot_proto_dot_dlp__pb2
-import google.protobuf.empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from google.cloud.dlp_v2.proto import dlp_pb2 as google_dot_cloud_dot_privacy_dot_dlp__v2_dot_proto_dot_dlp__pb2
+from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
 
 
 class DlpServiceStub(object):
-  """The DLP API is a service that allows clients
+  """The Cloud Data Loss Prevention (DLP) API is a service that allows clients
   to detect the presence of Personally Identifiable Information (PII) and other
   privacy-sensitive data in user-supplied, unstructured data streams, like text
   blocks or images.
@@ -148,7 +148,7 @@ def __init__(self, channel):
 
 
 class DlpServiceServicer(object):
-  """The DLP API is a service that allows clients
+  """The Cloud Data Loss Prevention (DLP) API is a service that allows clients
   to detect the presence of Personally Identifiable Information (PII) and other
   privacy-sensitive data in user-supplied, unstructured data streams, like text
   blocks or images.
@@ -185,14 +185,16 @@ def DeidentifyContent(self, request, context):
     raise NotImplementedError('Method not implemented!')
 
   def ReidentifyContent(self, request, context):
-    """Re-identify content that has been de-identified.
+    """Re-identifies content that has been de-identified.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def ListInfoTypes(self, request, context):
-    """Returns sensitive information types DLP supports.
+    """Returns a list of the sensitive information types that the DLP API
+    supports. For more information, see [Listing supported predefined
+    infoTypes](/dlp/docs/listing-infotypes).
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
@@ -228,51 +230,51 @@ def ListInspectTemplates(self, request, context):
     raise NotImplementedError('Method not implemented!')
 
   def DeleteInspectTemplate(self, request, context):
-    """Deletes inspect templates.
+    """Deletes an inspect template.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def CreateDeidentifyTemplate(self, request, context):
-    """Creates an Deidentify template for re-using frequently used configuration
+    """Creates a de-identify template for re-using frequently used configuration
     for Deidentifying content, images, and storage.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def UpdateDeidentifyTemplate(self, request, context):
-    """Updates the inspect template.
+    """Updates the de-identify template.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def GetDeidentifyTemplate(self, request, context):
-    """Gets an inspect template.
+    """Gets a de-identify template.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def ListDeidentifyTemplates(self, request, context):
-    """Lists inspect templates.
+    """Lists de-identify templates.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def DeleteDeidentifyTemplate(self, request, context):
-    """Deletes inspect templates.
+    """Deletes a de-identify template.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
     raise NotImplementedError('Method not implemented!')
 
   def CreateJobTrigger(self, request, context):
-    """Creates a job to run DLP actions such as scanning storage for sensitive
-    information on a set schedule.
+    """Creates a job trigger to run DLP actions such as scanning storage for
+    sensitive information on a set schedule.
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
     context.set_details('Method not implemented!')
@@ -307,7 +309,7 @@ def DeleteJobTrigger(self, request, context):
     raise NotImplementedError('Method not implemented!')
 
   def CreateDlpJob(self, request, context):
-    """Create a new job to inspect storage or calculate risk metrics [How-to
+    """Creates a new job to inspect storage or calculate risk metrics [How-to
     guide](/dlp/docs/compute-risk-analysis).
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -338,7 +340,7 @@ def DeleteDlpJob(self, request, context):
     raise NotImplementedError('Method not implemented!')
 
   def CancelDlpJob(self, request, context):
-    """Starts asynchronous cancellation on a long-running DlpJob.  The server
+    """Starts asynchronous cancellation on a long-running DlpJob. The server
     makes a best effort to cancel the DlpJob, but success is not
     guaranteed.
     """
diff --git a/dlp/google/cloud/dlp_v2/proto/storage_pb2.py b/dlp/google/cloud/dlp_v2/proto/storage_pb2.py
