Merge branch 'main' into iennae-patch-2

Author: iennae

bigquery-datatransfer/snippets/manage_transfer_configs.py

@@ -13,27 +13,6 @@
 # limitations under the License.
 
 
-def list_configs(override_values={}):
-    # [START bigquerydatatransfer_list_configs]
-    from google.cloud import bigquery_datatransfer
-
-    transfer_client = bigquery_datatransfer.DataTransferServiceClient()
-
-    project_id = "my-project"
-    # [END bigquerydatatransfer_list_configs]
-    # To facilitate testing, we replace values with alternatives
-    # provided by the testing harness.
-    project_id = override_values.get("project_id", project_id)
-    # [START bigquerydatatransfer_list_configs]
-    parent = transfer_client.common_project_path(project_id)
-
-    configs = transfer_client.list_transfer_configs(parent=parent)
-    print("Got the following configs:")
-    for config in configs:
-        print(f"\tID: {config.name}, Schedule: {config.schedule}")
-    # [END bigquerydatatransfer_list_configs]
-
-
 def update_config(override_values={}):
     # [START bigquerydatatransfer_update_config]
     from google.cloud import bigquery_datatransfer

bigquery-datatransfer/snippets/manage_transfer_configs_test.py

@@ -15,13 +15,6 @@
 from . import manage_transfer_configs
 
 
-def test_list_configs(capsys, project_id, transfer_config_name):
-    manage_transfer_configs.list_configs({"project_id": project_id})
-    out, _ = capsys.readouterr()
-    assert "Got the following configs:" in out
-    assert transfer_config_name in out
-
-
 def test_update_config(capsys, transfer_config_name):
     manage_transfer_configs.update_config(
         {

composer/airflow_1_samples/gke_operator.py

@@ -92,7 +92,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image="gcr.io/gcp-runtimes/ubuntu_18_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
     )
     # [END composer_gkeoperator_minconfig_airflow_1]
 

composer/airflow_1_samples/kubernetes_pod_operator.py

@@ -93,7 +93,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image="gcr.io/gcp-runtimes/ubuntu_18_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
     )
     # [END composer_kubernetespodoperator_minconfig_airflow_1]
     # [START composer_kubernetespodoperator_templateconfig_airflow_1]

composer/airflow_1_samples/noxfile_config.py

@@ -32,7 +32,7 @@
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to numpy compilation failure.
     # Skipping 3.6 and 3.7, they are more out of date
-    "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11", "3.12", "3.13"],
+    "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

composer/workflows/gke_operator.py

@@ -29,7 +29,7 @@
 
 with models.DAG(
     "example_gcp_gke",
-    schedule_interval=None,  # Override to match your needs
+    schedule=None,  # Override to match your needs
     start_date=days_ago(1),
     tags=["example"],
 ) as dag:
@@ -86,7 +86,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image="gcr.io/gcp-runtimes/ubuntu_18_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
     )
     # [END composer_gkeoperator_minconfig]
 

composer/workflows/kubernetes_pod_operator.py

@@ -96,7 +96,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image="gcr.io/gcp-runtimes/ubuntu_18_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
     )
     # [END composer_kubernetespodoperator_minconfig]
     # [START composer_kubernetespodoperator_templateconfig]

composer/workflows/kubernetes_pod_operator_c2.py

@@ -17,10 +17,11 @@
 import datetime
 
 from airflow import models
-from airflow.kubernetes.secret import Secret
+
 from airflow.providers.cncf.kubernetes.operators.pod import (
     KubernetesPodOperator,
 )
+from airflow.providers.cncf.kubernetes.secret import Secret
 from kubernetes.client import models as k8s_models
 
 # A Secret is an object that contains a small amount of sensitive data such as
@@ -60,7 +61,7 @@
 # required to debug.
 with models.DAG(
     dag_id="composer_sample_kubernetes_pod",
-    schedule_interval=datetime.timedelta(days=1),
+    schedule=datetime.timedelta(days=1),
     start_date=YESTERDAY,
 ) as dag:
     # Only name, image, and task_id are required to create a
@@ -88,7 +89,7 @@
         # project-id as the gcr.io images and the service account that Composer
         # uses has permission to access the Google Container Registry
         # (the default service account has permission)
-        image="gcr.io/gcp-runtimes/ubuntu_20_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
         # Specifies path to kubernetes config. The config_file is templated.
         config_file="/home/airflow/composer_kube_config",
         # Identifier of connection that should be used
@@ -130,7 +131,7 @@
         task_id="ex-kube-secrets",
         name="ex-kube-secrets",
         namespace="composer-user-workloads",
-        image="gcr.io/gcp-runtimes/ubuntu_20_0_4",
+        image="marketplace.gcr.io/google/ubuntu2204",
         startup_timeout_seconds=300,
         # The secrets to pass to Pod, the Pod will fail to create if the
         # secrets you specify in a Secret object do not exist in Kubernetes.

composer/workflows/noxfile_config.py

@@ -39,6 +39,7 @@
         "3.10",
         "3.12",
         "3.13",
+        "3.14",
     ],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them