GAPIC generation fixes. (#7061)

* Pick up stub docstring fix from GAPIC generator.

* Pick up order-of-enum fix from GAPIC generator.

Author: tseaver

google/cloud/logging_v2/gapic/enums.py

@@ -61,20 +61,6 @@ class LaunchStage(enum.IntEnum):
     DEPRECATED = 5
 
 
-class NullValue(enum.IntEnum):
-    """
-    ``NullValue`` is a singleton enumeration to represent the null value for
-    the ``Value`` type union.
-
-    The JSON representation for ``NullValue`` is JSON ``null``.
-
-    Attributes:
-      NULL_VALUE (int): Null value.
-    """
-
-    NULL_VALUE = 0
-
-
 class LogSeverity(enum.IntEnum):
     """
     The severity of the event described in a log entry, expressed as one of
@@ -120,6 +106,20 @@ class LogSeverity(enum.IntEnum):
     EMERGENCY = 800
 
 
+class NullValue(enum.IntEnum):
+    """
+    ``NullValue`` is a singleton enumeration to represent the null value for
+    the ``Value`` type union.
+
+    The JSON representation for ``NullValue`` is JSON ``null``.
+
+    Attributes:
+      NULL_VALUE (int): Null value.
+    """
+
+    NULL_VALUE = 0
+
+
 class LabelDescriptor(object):
     class ValueType(enum.IntEnum):
         """
@@ -136,6 +136,38 @@ class ValueType(enum.IntEnum):
         INT64 = 2
 
 
+class LogMetric(object):
+    class ApiVersion(enum.IntEnum):
+        """
+        Logging API version.
+
+        Attributes:
+          V2 (int): Logging API v2.
+          V1 (int): Logging API v1.
+        """
+
+        V2 = 0
+        V1 = 1
+
+
+class LogSink(object):
+    class VersionFormat(enum.IntEnum):
+        """
+        Available log entry formats. Log entries can be written to
+        Logging in either format and can be exported in either format.
+        Version 2 is the preferred format.
+
+        Attributes:
+          VERSION_FORMAT_UNSPECIFIED (int): An unspecified format version that will default to V2.
+          V2 (int): ``LogEntry`` version 2 format.
+          V1 (int): ``LogEntry`` version 1 format.
+        """
+
+        VERSION_FORMAT_UNSPECIFIED = 0
+        V2 = 1
+        V1 = 2
+
+
 class MetricDescriptor(object):
     class MetricKind(enum.IntEnum):
         """
@@ -180,35 +212,3 @@ class ValueType(enum.IntEnum):
         STRING = 4
         DISTRIBUTION = 5
         MONEY = 6
-
-
-class LogMetric(object):
-    class ApiVersion(enum.IntEnum):
-        """
-        Logging API version.
-
-        Attributes:
-          V2 (int): Logging API v2.
-          V1 (int): Logging API v1.
-        """
-
-        V2 = 0
-        V1 = 1
-
-
-class LogSink(object):
-    class VersionFormat(enum.IntEnum):
-        """
-        Available log entry formats. Log entries can be written to
-        Logging in either format and can be exported in either format.
-        Version 2 is the preferred format.
-
-        Attributes:
-          VERSION_FORMAT_UNSPECIFIED (int): An unspecified format version that will default to V2.
-          V2 (int): ``LogEntry`` version 2 format.
-          V1 (int): ``LogEntry`` version 1 format.
-        """
-
-        VERSION_FORMAT_UNSPECIFIED = 0
-        V2 = 1
-        V1 = 2

google/cloud/logging_v2/gapic/transports/config_service_v2_grpc_transport.py

@@ -105,7 +105,7 @@ def channel(self):
 
     @property
     def list_sinks(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.list_sinks`.
 
         Lists sinks.
 
@@ -118,7 +118,7 @@ def list_sinks(self):
 
     @property
     def get_sink(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.get_sink`.
 
         Gets a sink.
 
@@ -131,7 +131,7 @@ def get_sink(self):
 
     @property
     def create_sink(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.create_sink`.
 
         Creates a sink that exports specified log entries to a destination. The
         export of newly-ingested log entries begins immediately, unless the
@@ -147,7 +147,7 @@ def create_sink(self):
 
     @property
     def update_sink(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.update_sink`.
 
         Updates a sink. This method replaces the following fields in the
         existing sink with values from the new sink: ``destination``, and
@@ -163,7 +163,7 @@ def update_sink(self):
 
     @property
     def delete_sink(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.delete_sink`.
 
         Deletes a sink. If the sink has a unique ``writer_identity``, then that
         service account is also deleted.
@@ -177,7 +177,7 @@ def delete_sink(self):
 
     @property
     def list_exclusions(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.list_exclusions`.
 
         Lists all the exclusions in a parent resource.
 
@@ -190,7 +190,7 @@ def list_exclusions(self):
 
     @property
     def get_exclusion(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.get_exclusion`.
 
         Gets the description of an exclusion.
 
@@ -203,7 +203,7 @@ def get_exclusion(self):
 
     @property
     def create_exclusion(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.create_exclusion`.
 
         Creates a new exclusion in a specified parent resource.
         Only log entries belonging to that resource can be excluded.
@@ -218,7 +218,7 @@ def create_exclusion(self):
 
     @property
     def update_exclusion(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.update_exclusion`.
 
         Changes one or more properties of an existing exclusion.
 
@@ -231,7 +231,7 @@ def update_exclusion(self):
 
     @property
     def delete_exclusion(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`ConfigServiceV2Client.delete_exclusion`.
 
         Deletes an exclusion.
 

google/cloud/logging_v2/gapic/transports/logging_service_v2_grpc_transport.py

@@ -103,7 +103,7 @@ def channel(self):
 
     @property
     def delete_log(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`LoggingServiceV2Client.delete_log`.
 
         Deletes all the log entries in a log.
         The log reappears if it receives new entries.
@@ -119,7 +119,7 @@ def delete_log(self):
 
     @property
     def write_log_entries(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`LoggingServiceV2Client.write_log_entries`.
 
         Writes log entries to Logging. This API method is the
         only way to send log entries to Logging. This method
@@ -138,7 +138,7 @@ def write_log_entries(self):
 
     @property
     def list_log_entries(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`LoggingServiceV2Client.list_log_entries`.
 
         Lists log entries. Use this method to retrieve log entries from Logging.
         For ways to export log entries, see `Exporting
@@ -153,7 +153,7 @@ def list_log_entries(self):
 
     @property
     def list_monitored_resource_descriptors(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`LoggingServiceV2Client.list_monitored_resource_descriptors`.
 
         Lists the descriptors for monitored resource types used by Logging.
 
@@ -166,7 +166,7 @@ def list_monitored_resource_descriptors(self):
 
     @property
     def list_logs(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`LoggingServiceV2Client.list_logs`.
 
         Lists the logs in projects, organizations, folders, or billing accounts.
         Only logs that have entries are listed.

google/cloud/logging_v2/gapic/transports/metrics_service_v2_grpc_transport.py

@@ -105,7 +105,7 @@ def channel(self):
 
     @property
     def list_log_metrics(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`MetricsServiceV2Client.list_log_metrics`.
 
         Lists logs-based metrics.
 
@@ -118,7 +118,7 @@ def list_log_metrics(self):
 
     @property
     def get_log_metric(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`MetricsServiceV2Client.get_log_metric`.
 
         Gets a logs-based metric.
 
@@ -131,7 +131,7 @@ def get_log_metric(self):
 
     @property
     def create_log_metric(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`MetricsServiceV2Client.create_log_metric`.
 
         Creates a logs-based metric.
 
@@ -144,7 +144,7 @@ def create_log_metric(self):
 
     @property
     def update_log_metric(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`MetricsServiceV2Client.update_log_metric`.
 
         Creates or updates a logs-based metric.
 
@@ -157,7 +157,7 @@ def update_log_metric(self):
 
     @property
     def delete_log_metric(self):
-        """Return the gRPC stub for {$apiMethod.name}.
+        """Return the gRPC stub for :meth:`MetricsServiceV2Client.delete_log_metric`.
 
         Deletes a logs-based metric.
 

synth.metadata

@@ -0,0 +1,39 @@
+{
+  "updateTime": "2019-01-05T17:54:33.074139Z",
+  "sources": [
+    {
+      "generator": {
+        "name": "artman",
+        "version": "0.16.4",
+        "dockerImage": "googleapis/artman@sha256:8b45fae963557c3299921037ecbb86f0689f41b1b4aea73408ebc50562cb2857"
+      }
+    },
+    {
+      "git": {
+        "name": "googleapis",
+        "remote": "https://github.com/googleapis/googleapis.git",
+        "sha": "a111a53c0c6722afcd793b64724ceef7862db5b9",
+        "internalRef": "227896184"
+      }
+    },
+    {
+      "template": {
+        "name": "python_library",
+        "origin": "synthtool.gcp",
+        "version": "2018.12.6"
+      }
+    }
+  ],
+  "destinations": [
+    {
+      "client": {
+        "source": "googleapis",
+        "apiName": "logging",
+        "apiVersion": "v2",
+        "language": "python",
+        "generator": "gapic",
+        "config": "google/logging/artman_logging.yaml"
+      }
+    }
+  ]
+}