Merge branch 'refs/heads/main' into instance-attach-regional-disk

# Conflicts:
#	compute/client_library/snippets/tests/test_disks.py

Author: Thoughtseize1

.github/blunderbuss.yml

@@ -172,7 +172,7 @@ assign_prs_by:
   - labels:
       - "api: cloudsql"
     to:
-      - GoogleCloudPlatform/infra-db-sdk
+      - GoogleCloudPlatform/cloud-sql-connectors
   - labels:
       - "api: bigtable"
       - "api: datastore"

appengine/standard/flask/tutorial/requirements-test.txt

@@ -1,2 +1,4 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
+pytest==8.3.4; python_version >= '3.0'
+six==1.17.0

appengine/standard/flask/tutorial/requirements.txt

@@ -1,4 +1,4 @@
 Flask==1.1.4; python_version < '3.0'
 Flask==3.0.0; python_version > '3.0'
 Werkzeug==1.0.1; python_version < '3.0'
-Werkzeug==3.0.3; python_version > '3.0'
+Werkzeug==3.0.6; python_version > '3.0'

compute/client_library/ingredients/disks/create_replicated_disk.py

@@ -0,0 +1,60 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# This is an ingredient file. It is not meant to be run directly. Check the samples/snippets
+# folder for complete code samples that are ready to be used.
+# Disabling flake8 for the ingredients file, as it would fail F821 - undefined name check.
+# flake8: noqa
+
+from google.cloud import compute_v1
+
+
+# <INGREDIENT create_replicated_disk>
+def create_regional_replicated_disk(
+    project_id,
+    region,
+    disk_name,
+    size_gb,
+    disk_type: str = "pd-ssd",
+) -> compute_v1.Disk:
+    """Creates a synchronously replicated disk in a region across two zones.
+    Args:
+        project_id (str): The ID of the Google Cloud project.
+        region (str): The region where the disk will be created.
+        disk_name (str): The name of the disk.
+        size_gb (int): The size of the disk in gigabytes.
+        disk_type (str): The type of the disk. Default is 'pd-ssd'.
+    Returns:
+        compute_v1.Disk: The created disk object.
+    """
+    disk = compute_v1.Disk()
+    disk.name = disk_name
+
+    # You can specify the zones where the disk will be replicated.
+    disk.replica_zones = [
+        f"zones/{region}-a",
+        f"zones/{region}-b",
+    ]
+    disk.size_gb = size_gb
+    disk.type = f"regions/{region}/diskTypes/{disk_type}"
+
+    client = compute_v1.RegionDisksClient()
+    operation = client.insert(project=project_id, region=region, disk_resource=disk)
+
+    wait_for_extended_operation(operation, "Replicated disk creation")
+
+    return client.get(project=project_id, region=region, disk=disk_name)
+
+
+# </INGREDIENT>

compute/client_library/ingredients/disks/сonsistency_groups/clone_disks_consistency_group.py

@@ -0,0 +1,52 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# This is an ingredient file. It is not meant to be run directly. Check the samples/snippets
+# folder for complete code samples that are ready to be used.
+# Disabling flake8 for the ingredients file, as it would fail F821 - undefined name check.
+# flake8: noqa
+
+from google.cloud import compute_v1
+
+
+# <INGREDIENT consistency_group_clone_disks>
+def clone_disks_to_consistency_group(project_id, group_region, group_name):
+    """
+    Clones disks to a consistency group in the specified region.
+    Args:
+        project_id (str): The ID of the Google Cloud project.
+        group_region (str): The region where the consistency group is located.
+        group_name (str): The name of the consistency group.
+    Returns:
+        bool: True if the disks were successfully cloned to the consistency group.
+    """
+    consistency_group_policy = (
+        f"projects/{project_id}/regions/{group_region}/resourcePolicies/{group_name}"
+    )
+
+    resource = compute_v1.BulkInsertDiskResource(
+        source_consistency_group_policy=consistency_group_policy
+    )
+    client = compute_v1.RegionDisksClient()
+    request = compute_v1.BulkInsertRegionDiskRequest(
+        project=project_id,
+        region=group_region,
+        bulk_insert_disk_resource_resource=resource,
+    )
+    operation = client.bulk_insert(request=request)
+    wait_for_extended_operation(operation, verbose_name="bulk insert disk")
+    return True
+
+
+# </INGREDIENT>

compute/client_library/ingredients/disks/сonsistency_groups/remove_disk_consistency_group.py

@@ -11,12 +11,11 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-# flake8: noqa
-
 
-# This file is automatically generated. Please do not modify it directly.
-# Find the relevant recipe file in the samples/recipes or samples/ingredients
-# directory and apply your changes there.
+# This is an ingredient file. It is not meant to be run directly. Check the samples/snippets
+# folder for complete code samples that are ready to be used.
+# Disabling flake8 for the ingredients file, as it would fail F821 - undefined name check.
+# flake8: noqa
 
 
 from google.cloud import compute_v1

compute/client_library/ingredients/disks/сonsistency_groups/stop_replication_consistency_group.py

@@ -0,0 +1,44 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# flake8: noqa
+
+from google.cloud import compute_v1
+
+
+# <INGREDIENT stop_replication_in_consistency_group>
+def stop_replication_consistency_group(project_id, location, consistency_group_name):
+    """
+    Stops the asynchronous replication for a consistency group.
+    Args:
+        project_id (str): The ID of the Google Cloud project.
+        location (str): The region where the consistency group is located.
+        consistency_group_id (str): The ID of the consistency group.
+    Returns:
+        bool: True if the replication was successfully stopped.
+    """
+    consistency_group = compute_v1.DisksStopGroupAsyncReplicationResource(
+        resource_policy=f"regions/{location}/resourcePolicies/{consistency_group_name}"
+    )
+    region_client = compute_v1.RegionDisksClient()
+    operation = region_client.stop_group_async_replication(
+        project=project_id,
+        region=location,
+        disks_stop_group_async_replication_resource_resource=consistency_group,
+    )
+    wait_for_extended_operation(operation, "Stopping replication for consistency group")
+
+    return True
+
+
+# </INGREDIENT>

compute/client_library/recipes/disks/create_replicated_disk.py

@@ -0,0 +1,23 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# flake8: noqa
+
+# <REGION compute_disk_regional_replicated>
+# <IMPORTS/>
+
+# <INGREDIENT wait_for_extended_operation />
+
+# <INGREDIENT create_replicated_disk />
+
+# </REGION compute_disk_regional_replicated>

compute/client_library/recipes/disks/сonsistency_groups/clone_disks_consistency_group.py

@@ -0,0 +1,23 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# flake8: noqa
+
+# <REGION compute_consistency_group_clone>
+# <IMPORTS/>
+
+# <INGREDIENT wait_for_extended_operation />
+
+# <INGREDIENT consistency_group_clone_disks />
+
+# </REGION compute_consistency_group_clone>

compute/client_library/recipes/disks/сonsistency_groups/stop_replication_consistency_group.py

@@ -0,0 +1,24 @@
+#  Copyright 2024 Google LLC
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# flake8: noqa
+
+
+# <REGION compute_consistency_group_stop_replication>
+# <IMPORTS/>
+
+# <INGREDIENT wait_for_extended_operation />
+
+# <INGREDIENT stop_replication_in_consistency_group />
+
+# </REGION compute_consistency_group_stop_replication>