Merge branch 'main' into master

rogers140 · web-flow · commit eb3a08b160d2 · 2023-06-28T10:48:58.000-07:00
diff --git a/compute/client_library/ingredients/instances/create_instance.py b/compute/client_library/ingredients/instances/create_instance.py
@@ -88,7 +88,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create.py b/compute/client_library/snippets/instances/create.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_from_custom_image.py b/compute/client_library/snippets/instances/create_start_instance/create_from_custom_image.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_from_public_image.py b/compute/client_library/snippets/instances/create_start_instance/create_from_public_image.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_from_snapshot.py b/compute/client_library/snippets/instances/create_start_instance/create_from_snapshot.py
@@ -178,7 +178,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_windows_instance.py b/compute/client_library/snippets/instances/create_start_instance/create_windows_instance.py
@@ -197,7 +197,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_with_additional_disk.py b/compute/client_library/snippets/instances/create_start_instance/create_with_additional_disk.py
@@ -226,7 +226,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_with_existing_disks.py b/compute/client_library/snippets/instances/create_start_instance/create_with_existing_disks.py
@@ -154,7 +154,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_with_local_ssd.py b/compute/client_library/snippets/instances/create_start_instance/create_with_local_ssd.py
@@ -216,7 +216,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_start_instance/create_with_snapshotted_data_disk.py b/compute/client_library/snippets/instances/create_start_instance/create_with_snapshotted_data_disk.py
@@ -233,7 +233,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/create_with_subnet.py b/compute/client_library/snippets/instances/create_with_subnet.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/custom_hostname/create.py b/compute/client_library/snippets/instances/custom_hostname/create.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/custom_machine_types/create_shared_with_helper.py b/compute/client_library/snippets/instances/custom_machine_types/create_shared_with_helper.py
@@ -390,7 +390,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/custom_machine_types/create_with_helper.py b/compute/client_library/snippets/instances/custom_machine_types/create_with_helper.py
@@ -390,7 +390,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/custom_machine_types/create_without_helper.py b/compute/client_library/snippets/instances/custom_machine_types/create_without_helper.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/custom_machine_types/extra_mem_no_helper.py b/compute/client_library/snippets/instances/custom_machine_types/extra_mem_no_helper.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/delete_protection/create.py b/compute/client_library/snippets/instances/delete_protection/create.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/preemptible/create_preemptible.py b/compute/client_library/snippets/instances/preemptible/create_preemptible.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/compute/client_library/snippets/instances/spot/create.py b/compute/client_library/snippets/instances/spot/create.py
@@ -196,7 +196,7 @@ def create_instance(
 
     # Use the network interface provided in the network_link argument.
     network_interface = compute_v1.NetworkInterface()
-    network_interface.name = network_link
+    network_interface.network = network_link
     if subnetwork_link:
         network_interface.subnetwork = subnetwork_link
 
diff --git a/dlp/snippets/inspect_content.py b/dlp/snippets/inspect_content.py
@@ -335,9 +335,7 @@ def inspect_column_values_w_custom_hotwords(
     headers = [{"name": val} for val in table_header]
     rows = []
     for row in table_rows:
-        rows.append(
-            {"values": [{"string_value": cell_val} for cell_val in row]}
-        )
+        rows.append({"values": [{"string_value": cell_val} for cell_val in row]})
     table = {"headers": headers, "rows": rows}
 
     # Construct the `item` for table to be inspected.
@@ -397,6 +395,7 @@ def inspect_column_values_w_custom_hotwords(
     else:
         print("No findings.")
 
+
 # [END dlp_inspect_column_values_w_custom_hotwords]
 
 
@@ -1122,6 +1121,7 @@ def inspect_image_file(
     else:
         print("No findings.")
 
+
 # [END dlp_inspect_image_file]
 
 
@@ -1698,7 +1698,7 @@ def inspect_data_to_hybrid_job_trigger(
     parser_table_hotword = subparsers.add_parser(
         "table_w_custom_hotword",
         help="Inspect a table and exclude column values when matched "
-             "with custom hot-word.",
+        "with custom hot-word.",
     )
     parser_table_hotword.add_argument(
         "--project",
@@ -1708,23 +1708,23 @@ def inspect_data_to_hybrid_job_trigger(
     parser_table_hotword.add_argument(
         "--table_header",
         help="List of strings representing table field names."
-             "Example include '['Fake_Email_Address', 'Real_Email_Address]'. "
-             "The method can be used to exclude matches from entire column"
-             '"Fake_Email_Address".',
+        "Example include '['Fake_Email_Address', 'Real_Email_Address]'. "
+        "The method can be used to exclude matches from entire column"
+        '"Fake_Email_Address".',
     )
     parser_table_hotword.add_argument(
         "--table_rows",
         help="List of rows representing table values."
-             'Example: '
-             '"[["example1@example.org", "test1@example.com],'
-             '["example2@example.org", "test2@example.com]]"',
+        "Example: "
+        '"[["example1@example.org", "test1@example.com],'
+        '["example2@example.org", "test2@example.com]]"',
     )
     parser_table_hotword.add_argument(
         "--info_types",
         action="append",
         help="Strings representing info types to look for. A full list of "
-             "info categories and types is available from the API. Examples "
-             'include "FIRST_NAME", "LAST_NAME", "EMAIL_ADDRESS". '
+        "info categories and types is available from the API. Examples "
+        'include "FIRST_NAME", "LAST_NAME", "EMAIL_ADDRESS". ',
     )
     parser_table_hotword.add_argument(
         "custom_hotword",
@@ -2104,11 +2104,13 @@ def inspect_data_to_hybrid_job_trigger(
         help="The Google Cloud project id to use as a parent resource.",
         default=default_project,
     )
-    parser_image_default_infotypes.add_argument("filename", help="The path to the file to inspect.")
+    parser_image_default_infotypes.add_argument(
+        "filename", help="The path to the file to inspect."
+    )
     parser_image_default_infotypes.add_argument(
         "--include_quote",
         help="A Boolean for whether to display a quote of the detected"
-             "information in the results.",
+        "information in the results.",
         default=True,
     )
 
diff --git a/dlp/snippets/inspect_content_test.py b/dlp/snippets/inspect_content_test.py
@@ -232,8 +232,8 @@ def test_inspect_column_values_w_custom_hotwords(capsys):
         "rows": [
             ["111-11-1111", "222-22-2222"],
             ["987-23-1234", "333-33-3333"],
-            ["678-12-0909", "444-44-4444"]
-        ]
+            ["678-12-0909", "444-44-4444"],
+        ],
     }
     inspect_content.inspect_column_values_w_custom_hotwords(
         GCLOUD_PROJECT,
diff --git a/dlp/snippets/stored_infotype_test.py b/dlp/snippets/stored_infotype_test.py
@@ -29,7 +29,7 @@
 TEST_BUCKET_NAME = GCLOUD_PROJECT + "-dlp-python-client-test" + UNIQUE_STRING
 RESOURCE_DIRECTORY = os.path.join(os.path.dirname(__file__), "resources")
 RESOURCE_FILE_NAMES = ["term_list.txt"]
-STORED_INFO_TYPE_ID = "github-usernames"
+STORED_INFO_TYPE_ID = "github-usernames" + UNIQUE_STRING
 
 DLP_CLIENT = google.cloud.dlp_v2.DlpServiceClient()
 
