Skip to content

Move template-field validation out of GoogleCampaignManagerDeleteRepo… #71343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bujjibabukatta wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −6
Open

Move template-field validation out of GoogleCampaignManagerDeleteRepo… #71343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...ders/google/src/airflow/providers/google/marketing_platform/operators/campaign_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ def __init__(
**kwargs,
) -> None:
super().__init__(**kwargs)
if not (report_name or report_id):
raise AirflowException("Please provide `report_name` or `report_id`.")
if report_name and report_id:
raise AirflowException("Please provide only one parameter `report_name` or `report_id`.")

self.profile_id = profile_id
self.report_name = report_name
self.report_id = report_id
Expand All @@ -97,6 +92,11 @@ def __init__(
self.impersonation_chain = impersonation_chain

def execute(self, context: Context) -> None:
if not (self.report_name or self.report_id):
raise AirflowException("Please provide `report_name` or `report_id`.")
if self.report_name and self.report_id:
raise AirflowException("Please provide only one parameter `report_name` or `report_id`.")

hook = GoogleCampaignManagerHook(
gcp_conn_id=self.gcp_conn_id,
api_version=self.api_version,
Expand Down
29 changes: 29 additions & 0 deletions providers/google/tests/unit/google/marketing_platform/operators/test_campaign_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import pytest
from sqlalchemy import delete

from airflow.exceptions import AirflowException
from airflow.models import TaskInstance as TI
from airflow.providers.common.compat.sdk import timezone
from airflow.providers.google.marketing_platform.operators.campaign_manager import (
Expand Down Expand Up @@ -87,6 +88,34 @@ def test_execute(self, mock_base_op, hook_mock):
profile_id=PROFILE_ID, report_id=REPORT_ID
)

@mock.patch(
"airflow.providers.google.marketing_platform.operators.campaign_manager.GoogleCampaignManagerHook"
)
@mock.patch("airflow.providers.google.marketing_platform.operators.campaign_manager.BaseOperator")
def test_execute_raises_when_both_report_name_and_id(self, mock_base_op, hook_mock):
op = GoogleCampaignManagerDeleteReportOperator(
profile_id=PROFILE_ID,
report_name=REPORT_NAME,
report_id=REPORT_ID,
api_version=API_VERSION,
task_id="test_task",
)
with pytest.raises(AirflowException, match="only one parameter"):
op.execute(context=None)

@mock.patch(
"airflow.providers.google.marketing_platform.operators.campaign_manager.GoogleCampaignManagerHook"
)
@mock.patch("airflow.providers.google.marketing_platform.operators.campaign_manager.BaseOperator")
def test_execute_raises_when_neither_report_name_nor_id(self, mock_base_op, hook_mock):
op = GoogleCampaignManagerDeleteReportOperator(
profile_id=PROFILE_ID,
api_version=API_VERSION,
task_id="test_task",
)
with pytest.raises(AirflowException, match="Please provide"):
op.execute(context=None)


@pytest.mark.db_test
class TestGoogleCampaignManagerDownloadReportOperator:
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/prek/validate_operators_init_exemptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ providers/google/src/airflow/providers/google/cloud/sensors/bigquery_dts.py::Big
providers/google/src/airflow/providers/google/cloud/sensors/cloud_composer.py::CloudComposerExternalTaskSensor
providers/google/src/airflow/providers/google/cloud/transfers/azure_fileshare_to_gcs.py::AzureFileShareToGCSOperator
providers/google/src/airflow/providers/google/cloud/transfers/gcs_to_bigquery.py::GCSToBigQueryOperator
providers/google/src/airflow/providers/google/marketing_platform/operators/campaign_manager.py::GoogleCampaignManagerDeleteReportOperator
providers/microsoft/azure/src/airflow/providers/microsoft/azure/transfers/gcs_to_wasb.py::GCSToAzureBlobStorageOperator
providers/microsoft/psrp/src/airflow/providers/microsoft/psrp/operators/psrp.py::PsrpOperator