Merge branch 'main' into renovate/grpcio-1.x

Author: leahecole

automl/beta/requirements.txt

@@ -1 +1 @@
-google-cloud-automl==2.9.0
+google-cloud-automl==2.11.1

automl/snippets/requirements.txt

@@ -1,3 +1,3 @@
 google-cloud-translate==3.8.4
 google-cloud-storage==2.8.0
-google-cloud-automl==2.9.0
+google-cloud-automl==2.11.1

automl/tables/requirements.txt

@@ -1 +1 @@
-google-cloud-automl==2.9.0
+google-cloud-automl==2.11.1

batch/requirements.txt

@@ -1,2 +1,2 @@
-google-cloud-batch==0.5.0
+google-cloud-batch==0.10.0
 google-cloud-logging==3.5.0

cloud-sql/mysql/sqlalchemy/connect_connector.py

@@ -33,7 +33,7 @@ def connect_with_connector() -> sqlalchemy.engine.base.Engine:
     # keep secrets safe.
 
     instance_connection_name = os.environ["INSTANCE_CONNECTION_NAME"]  # e.g. 'project:region:instance'
-    db_user = os.environ.get("DB_USER", "")  # e.g. 'my-db-user'
+    db_user = os.environ["DB_USER"]  # e.g. 'my-db-user'
     db_pass = os.environ["DB_PASS"]  # e.g. 'my-db-password'
     db_name = os.environ["DB_NAME"]  # e.g. 'my-database'
 

dlp/snippets/redact.py

@@ -277,6 +277,52 @@ def redact_image_listed_info_types(
 # [END dlp_redact_image_listed_infotypes]
 
 
+# [START dlp_redact_image_all_infotypes]
+def redact_image_all_info_types(
+    project,
+    filename,
+    output_filename,
+):
+    """Uses the Data Loss Prevention API to redact protected data in an image.
+       Args:
+           project: The Google Cloud project id to use as a parent resource.
+           filename: The path to the file to inspect.
+           output_filename: The path to which the redacted image will be written.
+               A full list of info type categories can be fetched from the API.
+       Returns:
+           None; the response from the API is printed to the terminal.
+    """
+
+    # Import the client library
+    import google.cloud.dlp
+
+    # Instantiate a client.
+    dlp = google.cloud.dlp_v2.DlpServiceClient()
+
+    # Construct the byte_item, containing the file's byte data.
+    with open(filename, mode="rb") as f:
+        byte_item = {"type_": google.cloud.dlp_v2.FileType.IMAGE, "data": f.read()}
+
+    # Convert the project id into a full resource id.
+    parent = f"projects/{project}"
+
+    # Call the API.
+    response = dlp.redact_image(
+        request={
+            "parent": parent,
+            "byte_item": byte_item,
+        }
+    )
+
+    # Write out the results.
+    with open(output_filename, mode="wb") as f:
+        f.write(response.redacted_image)
+    print(f"Wrote {len(response.redacted_image)} to {output_filename}")
+
+
+# [END dlp_redact_image_all_infotypes]
+
+
 if __name__ == "__main__":
     default_project = os.environ.get("GOOGLE_CLOUD_PROJECT")
 
@@ -364,6 +410,12 @@ def redact_image_listed_info_types(
         default=None,
     )
 
+    all_info_types_parser = subparsers.add_parser(
+        "all_info_types",
+        help="Redact all infoTypes from an image.",
+        parents=[common_args_parser],
+    )
+
     args = parser.parse_args()
 
     if args.content == "info_types":
@@ -390,3 +442,9 @@ def redact_image_listed_info_types(
             min_likelihood=args.min_likelihood,
             mime_type=args.mime_type,
         )
+    elif args.content == "all_info_types":
+        redact_image_all_info_types(
+            args.project,
+            args.filename,
+            args.output_filename,
+        )

dlp/snippets/redact_test.py

@@ -73,3 +73,17 @@ def test_redact_image_listed_info_types(tempdir, capsys):
 
     out, _ = capsys.readouterr()
     assert output_filepath in out
+
+
+def test_redact_image_all_info_types(tempdir, capsys):
+    test_filepath = os.path.join(RESOURCE_DIRECTORY, "test.png")
+    output_filepath = os.path.join(tempdir, "redacted.png")
+
+    redact.redact_image_all_info_types(
+        GCLOUD_PROJECT,
+        test_filepath,
+        output_filepath,
+    )
+
+    out, _ = capsys.readouterr()
+    assert output_filepath in out

retail/interactive-tutorials/events/requirements.txt

@@ -1,4 +1,4 @@
 google==3.0.0
-google-cloud-retail==1.16.0
+google-cloud-retail==1.16.1
 google-cloud-storage==2.8.0
 google-cloud-bigquery==3.5.0

retail/interactive-tutorials/product/requirements.txt

@@ -1,4 +1,4 @@
 google==3.0.0
-google-cloud-retail==1.16.0
+google-cloud-retail==1.16.1
 google-cloud-storage==2.8.0
 google-cloud-bigquery==3.5.0

retail/interactive-tutorials/search/requirements.txt

@@ -1,4 +1,4 @@
 google==3.0.0
-google-cloud-retail==1.16.0
+google-cloud-retail==1.16.1
 google-cloud-storage==2.8.0
 google-cloud-bigquery==3.5.0