Skip to content

Update composer_storage_trigger.py script to support stable API #6632

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

Merged
merged 6 commits into from
Sep 1, 2021
Merged

Update composer_storage_trigger.py script to support stable API #6632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74a6e34
Update composer_storage_trigger.py script to support stable API for A…
kosteev Aug 27, 2021
c4f3b9d
Merge branch 'master' into composer-trigger-dag-script-stable-api
leahecole Aug 31, 2021
a46ce30
Merge branch 'master' into composer-trigger-dag-script-stable-api
leahecole Sep 1, 2021
c1f8de0
Update composer/functions/composer_storage_trigger.py
leahecole Sep 1, 2021
f500190
Merge branch 'master' into composer-trigger-dag-script-stable-api
leahecole Sep 1, 2021
42c6a7b
Apply suggestions from code review
leahecole Sep 1, 2021
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
17 changes: 13 additions & 4 deletions composer/functions/composer_storage_trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

IAM_SCOPE = 'https://www.googleapis.com/auth/iam'
OAUTH_TOKEN_URI = 'https://www.googleapis.com/oauth2/v4/token'
# If you are using the stable API, set this value to False
# For more info about Airflow APIs see https://cloud.google.com/composer/docs/access-airflow-api
USE_EXPERIMENTAL_API = True


def trigger_dag(data, context=None):
Expand All @@ -46,16 +49,22 @@ def trigger_dag(data, context=None):
webserver_id = 'YOUR-TENANT-PROJECT'
# The name of the DAG you wish to trigger
dag_name = 'composer_sample_trigger_response_dag'

if USE_EXPERIMENTAL_API:
endpoint = f'api/experimental/dags/{dag_name}/dag_runs'
json_data = {'conf': data, 'replace_microseconds': 'false'}
else:
endpoint = f'api/v1/dags/{dag_name}/dagRuns'
json_data = {'conf': data}
webserver_url = (
'https://'
+ webserver_id
+ '.appspot.com/api/experimental/dags/'
+ dag_name
+ '/dag_runs'
+ '.appspot.com/'
+ endpoint
)
# Make a POST request to IAP which then Triggers the DAG
make_iap_request(
webserver_url, client_id, method='POST', json={"conf": data, "replace_microseconds": 'false'})
webserver_url, client_id, method='POST', json=json_data)


# This code is copied from
Expand Down
23 changes: 23 additions & 0 deletions composer/functions/composer_storage_trigger_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,26 @@ def test_iap_response_error(make_iap_request_mock):
trigger_event = {'file': 'some-gcs-file'}
with pytest.raises(Exception):
composer_storage_trigger.trigger_dag(trigger_event)


@mock.patch('composer_storage_trigger.make_iap_request', autospec=True)
def test_experimental_api_endpoint(make_iap_request_mock):
composer_storage_trigger.trigger_dag({'test': 'a'})

make_iap_request_mock.assert_called_once_with(
'https://YOUR-TENANT-PROJECT.appspot.com/api/experimental/dags/composer_sample_trigger_response_dag/dag_runs',
'YOUR-CLIENT-ID', method='POST',
json={'conf': {'test': 'a'}, 'replace_microseconds': 'false'},
)


@mock.patch('composer_storage_trigger.make_iap_request', autospec=True)
@mock.patch('composer_storage_trigger.USE_EXPERIMENTAL_API', False)
def test_stable_api_endpoint(make_iap_request_mock):
composer_storage_trigger.trigger_dag({'test': 'a'})

make_iap_request_mock.assert_called_once_with(
'https://YOUR-TENANT-PROJECT.appspot.com/api/v1/dags/composer_sample_trigger_response_dag/dagRuns',
'YOUR-CLIENT-ID', method='POST',
json={'conf': {'test': 'a'}},
)