Add path-construction helpers to GAPIC clients (via synth). (#8631)

Author: yoshi-automation

google/cloud/logging_v2/gapic/config_service_v2_client.py

@@ -80,6 +80,31 @@ def from_service_account_file(cls, filename, *args, **kwargs):
 
     from_service_account_json = from_service_account_file
 
+    @classmethod
+    def billing_path(cls, billing_account):
+        """Return a fully-qualified billing string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}", billing_account=billing_account
+        )
+
+    @classmethod
+    def billing_exclusion_path(cls, billing_account, exclusion):
+        """Return a fully-qualified billing_exclusion string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}/exclusions/{exclusion}",
+            billing_account=billing_account,
+            exclusion=exclusion,
+        )
+
+    @classmethod
+    def billing_sink_path(cls, billing_account, sink):
+        """Return a fully-qualified billing_sink string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}/sinks/{sink}",
+            billing_account=billing_account,
+            sink=sink,
+        )
+
     @classmethod
     def exclusion_path(cls, project, exclusion):
         """Return a fully-qualified exclusion string."""
@@ -89,6 +114,52 @@ def exclusion_path(cls, project, exclusion):
             exclusion=exclusion,
         )
 
+    @classmethod
+    def folder_path(cls, folder):
+        """Return a fully-qualified folder string."""
+        return google.api_core.path_template.expand("folders/{folder}", folder=folder)
+
+    @classmethod
+    def folder_exclusion_path(cls, folder, exclusion):
+        """Return a fully-qualified folder_exclusion string."""
+        return google.api_core.path_template.expand(
+            "folders/{folder}/exclusions/{exclusion}",
+            folder=folder,
+            exclusion=exclusion,
+        )
+
+    @classmethod
+    def folder_sink_path(cls, folder, sink):
+        """Return a fully-qualified folder_sink string."""
+        return google.api_core.path_template.expand(
+            "folders/{folder}/sinks/{sink}", folder=folder, sink=sink
+        )
+
+    @classmethod
+    def organization_path(cls, organization):
+        """Return a fully-qualified organization string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}", organization=organization
+        )
+
+    @classmethod
+    def organization_exclusion_path(cls, organization, exclusion):
+        """Return a fully-qualified organization_exclusion string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}/exclusions/{exclusion}",
+            organization=organization,
+            exclusion=exclusion,
+        )
+
+    @classmethod
+    def organization_sink_path(cls, organization, sink):
+        """Return a fully-qualified organization_sink string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}/sinks/{sink}",
+            organization=organization,
+            sink=sink,
+        )
+
     @classmethod
     def project_path(cls, project):
         """Return a fully-qualified project string."""

google/cloud/logging_v2/gapic/logging_service_v2_client.py

@@ -74,13 +74,57 @@ def from_service_account_file(cls, filename, *args, **kwargs):
 
     from_service_account_json = from_service_account_file
 
+    @classmethod
+    def billing_path(cls, billing_account):
+        """Return a fully-qualified billing string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}", billing_account=billing_account
+        )
+
+    @classmethod
+    def billing_log_path(cls, billing_account, log):
+        """Return a fully-qualified billing_log string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}/logs/{log}",
+            billing_account=billing_account,
+            log=log,
+        )
+
+    @classmethod
+    def folder_path(cls, folder):
+        """Return a fully-qualified folder string."""
+        return google.api_core.path_template.expand("folders/{folder}", folder=folder)
+
+    @classmethod
+    def folder_log_path(cls, folder, log):
+        """Return a fully-qualified folder_log string."""
+        return google.api_core.path_template.expand(
+            "folders/{folder}/logs/{log}", folder=folder, log=log
+        )
+
     @classmethod
     def log_path(cls, project, log):
         """Return a fully-qualified log string."""
         return google.api_core.path_template.expand(
             "projects/{project}/logs/{log}", project=project, log=log
         )
 
+    @classmethod
+    def organization_path(cls, organization):
+        """Return a fully-qualified organization string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}", organization=organization
+        )
+
+    @classmethod
+    def organization_log_path(cls, organization, log):
+        """Return a fully-qualified organization_log string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}/logs/{log}",
+            organization=organization,
+            log=log,
+        )
+
     @classmethod
     def project_path(cls, project):
         """Return a fully-qualified project string."""

google/cloud/logging_v2/gapic/metrics_service_v2_client.py

@@ -79,13 +79,32 @@ def from_service_account_file(cls, filename, *args, **kwargs):
 
     from_service_account_json = from_service_account_file
 
+    @classmethod
+    def billing_path(cls, billing_account):
+        """Return a fully-qualified billing string."""
+        return google.api_core.path_template.expand(
+            "billingAccounts/{billing_account}", billing_account=billing_account
+        )
+
+    @classmethod
+    def folder_path(cls, folder):
+        """Return a fully-qualified folder string."""
+        return google.api_core.path_template.expand("folders/{folder}", folder=folder)
+
     @classmethod
     def metric_path(cls, project, metric):
         """Return a fully-qualified metric string."""
         return google.api_core.path_template.expand(
             "projects/{project}/metrics/{metric}", project=project, metric=metric
         )
 
+    @classmethod
+    def organization_path(cls, organization):
+        """Return a fully-qualified organization string."""
+        return google.api_core.path_template.expand(
+            "organizations/{organization}", organization=organization
+        )
+
     @classmethod
     def project_path(cls, project):
         """Return a fully-qualified project string."""

synth.metadata

@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-06-29T12:26:54.494632Z",
+  "updateTime": "2019-07-10T12:23:32.614992Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.29.2",
-        "dockerImage": "googleapis/artman@sha256:45263333b058a4b3c26a8b7680a2710f43eae3d250f791a6cb66423991dcb2df"
+        "version": "0.29.4",
+        "dockerImage": "googleapis/artman@sha256:63f21e83cb92680b7001dc381069e962c9e6dee314fd8365ac554c07c89221fb"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "84c8ad4e52f8eec8f08a60636cfa597b86969b5c",
-        "internalRef": "255474859"
+        "sha": "16c0ea3cde17a897ba04b7b94d9bf4dd57e3227e",
+        "internalRef": "257239177"
       }
     },
     {