fix: Fixed object paths in autogenerated code in owlbot.py (#804)

* fix: Fixed object paths in autogenerated code in owlbot.py * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Nov 1, 2023 · b14bb14 · b14bb14
1 parent fe8111a
commit b14bb14
Show file tree

Hide file tree

Showing 87 changed files with 293 additions and 188 deletions.
diff --git a/owlbot.py b/owlbot.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import glob
 import json
 import os
 import shutil
@@ -139,6 +140,110 @@ def place_before(path, text, *before_text, escape=None):
 
 python.py_samples()
 
+# For autogenerated sample code, resolve object paths by finding the specific subpackage
+# the object belongs to. This is because we leave out all autogenerated packages from the
+# __init__.py of logging_v2. For now, this is manually copy-pasted from the __all__s of each
+# subpackage's __init__.py.
+gapic_objects =  {
+    "logging_v2.services.config_service_v2": [
+        "ConfigServiceV2Client",
+        "ConfigServiceV2AsyncClient"
+    ],
+    "logging_v2.services.logging_service_v2": [
+        "LoggingServiceV2Client",
+        "LoggingServiceV2AsyncClient"
+    ],
+    "logging_v2.services.metrics_service_v2": [
+        "MetricsServiceV2Client",
+        "MetricsServiceV2AsyncClient"
+    ],
+    "logging_v2.types": [
+        "LogEntry",
+        "LogEntryOperation",
+        "LogEntrySourceLocation",
+        "LogSplit",
+        "DeleteLogRequest",
+        "ListLogEntriesRequest",
+        "ListLogEntriesResponse",
+        "ListLogsRequest",
+        "ListLogsResponse",
+        "ListMonitoredResourceDescriptorsRequest",
+        "ListMonitoredResourceDescriptorsResponse",
+        "TailLogEntriesRequest",
+        "TailLogEntriesResponse",
+        "WriteLogEntriesPartialErrors",
+        "WriteLogEntriesRequest",
+        "WriteLogEntriesResponse",
+        "BigQueryDataset",
+        "BigQueryOptions",
+        "BucketMetadata",
+        "CmekSettings",
+        "CopyLogEntriesMetadata",
+        "CopyLogEntriesRequest",
+        "CopyLogEntriesResponse",
+        "CreateBucketRequest",
+        "CreateExclusionRequest",
+        "CreateLinkRequest",
+        "CreateSinkRequest",
+        "CreateViewRequest",
+        "DeleteBucketRequest",
+        "DeleteExclusionRequest",
+        "DeleteLinkRequest",
+        "DeleteSinkRequest",
+        "DeleteViewRequest",
+        "GetBucketRequest",
+        "GetCmekSettingsRequest",
+        "GetExclusionRequest",
+        "GetLinkRequest",
+        "GetSettingsRequest",
+        "GetSinkRequest",
+        "GetViewRequest",
+        "IndexConfig",
+        "Link",
+        "LinkMetadata",
+        "ListBucketsRequest",
+        "ListBucketsResponse",
+        "ListExclusionsRequest",
+        "ListExclusionsResponse",
+        "ListLinksRequest",
+        "ListLinksResponse",
+        "ListSinksRequest",
+        "ListSinksResponse",
+        "ListViewsRequest",
+        "ListViewsResponse",
+        "LocationMetadata",
+        "LogBucket",
+        "LogExclusion",
+        "LogSink",
+        "LogView",
+        "Settings",
+        "UndeleteBucketRequest",
+        "UpdateBucketRequest",
+        "UpdateCmekSettingsRequest",
+        "UpdateExclusionRequest",
+        "UpdateSettingsRequest",
+        "UpdateSinkRequest",
+        "UpdateViewRequest",
+        "IndexType",
+        "LifecycleState",
+        "OperationState",
+        "CreateLogMetricRequest",
+        "DeleteLogMetricRequest",
+        "GetLogMetricRequest",
+        "ListLogMetricsRequest",
+        "ListLogMetricsResponse",
+        "LogMetric",
+        "UpdateLogMetricRequest"
+    ]
+}
+
+sample_files = glob.glob("samples/generated_samples/logging_v2_*.py")
+for subpackage_name in gapic_objects:
+    for object_name in gapic_objects[subpackage_name]:
+        text = "logging_v2." + object_name
+        replacement = subpackage_name + "." + object_name
+        s.replace(sample_files, text, replacement)
+
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)
 s.shell.run(["nox", "-s", "blacken"], cwd="samples/snippets", hide_output=False)
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_copy_log_entries_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_copy_log_entries_async.py
@@ -36,10 +36,10 @@
 
 async def sample_copy_log_entries():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.CopyLogEntriesRequest(
+    request = logging_v2.types.CopyLogEntriesRequest(
         name="name_value",
         destination="destination_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_copy_log_entries_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_copy_log_entries_sync.py
@@ -36,10 +36,10 @@
 
 def sample_copy_log_entries():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.CopyLogEntriesRequest(
+    request = logging_v2.types.CopyLogEntriesRequest(
         name="name_value",
         destination="destination_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async.py
@@ -36,10 +36,10 @@
 
 async def sample_create_bucket():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateBucketRequest(
+    request = logging_v2.types.CreateBucketRequest(
         parent="parent_value",
         bucket_id="bucket_id_value",
     )

diff --git a/...les/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async_async.py b/...les/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async_async.py
@@ -36,10 +36,10 @@
 
 async def sample_create_bucket_async():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateBucketRequest(
+    request = logging_v2.types.CreateBucketRequest(
         parent="parent_value",
         bucket_id="bucket_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_async_sync.py
@@ -36,10 +36,10 @@
 
 def sample_create_bucket_async():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateBucketRequest(
+    request = logging_v2.types.CreateBucketRequest(
         parent="parent_value",
         bucket_id="bucket_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_bucket_sync.py
@@ -36,10 +36,10 @@
 
 def sample_create_bucket():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateBucketRequest(
+    request = logging_v2.types.CreateBucketRequest(
         parent="parent_value",
         bucket_id="bucket_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_exclusion_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_exclusion_async.py
@@ -36,14 +36,14 @@
 
 async def sample_create_exclusion():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    exclusion = logging_v2.LogExclusion()
+    exclusion = logging_v2.types.LogExclusion()
     exclusion.name = "name_value"
     exclusion.filter = "filter_value"
 
-    request = logging_v2.CreateExclusionRequest(
+    request = logging_v2.types.CreateExclusionRequest(
         parent="parent_value",
         exclusion=exclusion,
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_exclusion_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_exclusion_sync.py
@@ -36,14 +36,14 @@
 
 def sample_create_exclusion():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    exclusion = logging_v2.LogExclusion()
+    exclusion = logging_v2.types.LogExclusion()
     exclusion.name = "name_value"
     exclusion.filter = "filter_value"
 
-    request = logging_v2.CreateExclusionRequest(
+    request = logging_v2.types.CreateExclusionRequest(
         parent="parent_value",
         exclusion=exclusion,
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_link_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_link_async.py
@@ -36,10 +36,10 @@
 
 async def sample_create_link():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateLinkRequest(
+    request = logging_v2.types.CreateLinkRequest(
         parent="parent_value",
         link_id="link_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_link_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_link_sync.py
@@ -36,10 +36,10 @@
 
 def sample_create_link():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateLinkRequest(
+    request = logging_v2.types.CreateLinkRequest(
         parent="parent_value",
         link_id="link_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_sink_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_sink_async.py
@@ -36,14 +36,14 @@
 
 async def sample_create_sink():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    sink = logging_v2.LogSink()
+    sink = logging_v2.types.LogSink()
     sink.name = "name_value"
     sink.destination = "destination_value"
 
-    request = logging_v2.CreateSinkRequest(
+    request = logging_v2.types.CreateSinkRequest(
         parent="parent_value",
         sink=sink,
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_sink_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_sink_sync.py
@@ -36,14 +36,14 @@
 
 def sample_create_sink():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    sink = logging_v2.LogSink()
+    sink = logging_v2.types.LogSink()
     sink.name = "name_value"
     sink.destination = "destination_value"
 
-    request = logging_v2.CreateSinkRequest(
+    request = logging_v2.types.CreateSinkRequest(
         parent="parent_value",
         sink=sink,
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_view_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_view_async.py
@@ -36,10 +36,10 @@
 
 async def sample_create_view():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateViewRequest(
+    request = logging_v2.types.CreateViewRequest(
         parent="parent_value",
         view_id="view_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_create_view_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_create_view_sync.py
@@ -36,10 +36,10 @@
 
 def sample_create_view():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.CreateViewRequest(
+    request = logging_v2.types.CreateViewRequest(
         parent="parent_value",
         view_id="view_id_value",
     )

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_bucket_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_bucket_async.py
@@ -36,10 +36,10 @@
 
 async def sample_delete_bucket():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteBucketRequest(
+    request = logging_v2.types.DeleteBucketRequest(
         name="name_value",
     )
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_bucket_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_bucket_sync.py
@@ -36,10 +36,10 @@
 
 def sample_delete_bucket():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteBucketRequest(
+    request = logging_v2.types.DeleteBucketRequest(
         name="name_value",
     )
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_exclusion_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_exclusion_async.py
@@ -36,10 +36,10 @@
 
 async def sample_delete_exclusion():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteExclusionRequest(
+    request = logging_v2.types.DeleteExclusionRequest(
         name="name_value",
     )
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_exclusion_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_exclusion_sync.py
@@ -36,10 +36,10 @@
 
 def sample_delete_exclusion():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteExclusionRequest(
+    request = logging_v2.types.DeleteExclusionRequest(
         name="name_value",
     )
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_link_async.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_link_async.py
@@ -36,10 +36,10 @@
 
 async def sample_delete_link():
     # Create a client
-    client = logging_v2.ConfigServiceV2AsyncClient()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2AsyncClient()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteLinkRequest(
+    request = logging_v2.types.DeleteLinkRequest(
         name="name_value",
     )
 

diff --git a/samples/generated_samples/logging_v2_generated_config_service_v2_delete_link_sync.py b/samples/generated_samples/logging_v2_generated_config_service_v2_delete_link_sync.py
@@ -36,10 +36,10 @@
 
 def sample_delete_link():
     # Create a client
-    client = logging_v2.ConfigServiceV2Client()
+    client = logging_v2.services.config_service_v2.ConfigServiceV2Client()
 
     # Initialize request argument(s)
-    request = logging_v2.DeleteLinkRequest(
+    request = logging_v2.types.DeleteLinkRequest(
         name="name_value",
     )