refactor to use environment variables insnstead of arguments in pytho…

[Marlene-M-Hirose]

…n command

Checklist for reviewer:

• [ ] Commits should reference a bug or github issue, if relevant (if a bug is referenced, the pull request should include the bug number in the title).
• [ ] If the PR comes from a fork, trigger integration CI tests by running the Push to upstream workflow and provide the <username>:<branch> of the fork as parameter. The parameter will also show up in the logs of the manual-trigger-required-for-fork CI task together with more detailed instructions.
• [ ] If adding a new field to a query, ensure that the schema and dependent downstream schemas have been updated.
• [ ] When adding a new derived dataset, ensure that data is not available already (fully or partially) and recommend extending an existing dataset in favor of creating new ones. Data can be available in the bigquery-etl repository, looker-hub or in looker-spoke-default.

For modifications to schemas in restricted namespaces (see CODEOWNERS):

• [ ] Follow the change control procedure

┆Issue is synchronized with this Jira Task

[dataops-ci-bot]

Integration report for "Merge branch 'main' into deng_2361_update_query.py_to_use_os_vars"

sql.diff

Click to expand!

```diff diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_acquisitions_v1/query.py /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_acquisitions_v1/query.py --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_acquisitions_v1/query.py 2024-06-18 19:47:30.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_acquisitions_v1/query.py 2024-06-18 19:47:19.000000000 +0000 @@ -2,6 +2,7 @@ import csv import json +import os import tempfile from argparse import ArgumentParser @@ -32,6 +33,11 @@ "purchase_tax_local_amount", ] +MS_CLIENT_ID = os.environ.get("MICROSOFT_CLIENT_ID") +MS_CLIENT_SECRET = os.environ.get("MICROSOFT_CLIENT_SECRET") +MS_APP_LIST = os.environ.get("MICROSOFT_STORE_APP_LIST") +MS_TENANT_ID = os.environ.get("MICROSOFT_TENANT_ID") + def post_response(url, headers, data): """POST response function.""" @@ -197,10 +203,6 @@ """Input data, call functions, get stuff done.""" parser = ArgumentParser(description=__doc__) parser.add_argument("--date", required=True) - parser.add_argument("--microsoft_store_client_id", required=True) - parser.add_argument("--microsoft_store_client_secret", required=True) - parser.add_argument("--microsoft_store_app_list", required=True) - parser.add_argument("--microsoft_store_tenant_id", required=True) parser.add_argument("--project", default="moz-fx-data-shared-prod") parser.add_argument("--dataset", default="microsoft_derived") @@ -213,10 +215,10 @@ table_name = "microsoft_app_acquisitions" date = args.date - client_id = args.microsoft_store_client_id - client_secret = args.microsoft_store_client_secret - app_list = args.microsoft_store_app_list - tenant_id = args.microsoft_store_tenant_id + client_id = MS_CLIENT_ID + client_secret = MS_CLIENT_SECRET + app_list = MS_APP_LIST + tenant_id = MS_TENANT_ID resource_url = API_URI data = [] diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_conversions_v1/query.py /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_conversions_v1/query.py --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_conversions_v1/query.py 2024-06-18 19:47:30.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_conversions_v1/query.py 2024-06-18 19:47:19.000000000 +0000 @@ -2,6 +2,7 @@ import csv import json +import os import tempfile from argparse import ArgumentParser @@ -29,6 +30,11 @@ "conversion_count", ] +MS_CLIENT_ID = os.environ.get("MICROSOFT_CLIENT_ID") +MS_CLIENT_SECRET = os.environ.get("MICROSOFT_CLIENT_SECRET") +MS_APP_LIST = os.environ.get("MICROSOFT_STORE_APP_LIST") +MS_TENANT_ID = os.environ.get("MICROSOFT_TENANT_ID") + def post_response(url, headers, data): """POST response function.""" @@ -188,10 +194,6 @@ """Input data, call functions, get stuff done.""" parser = ArgumentParser(description=__doc__) parser.add_argument("--date", required=True) - parser.add_argument("--microsoft_store_client_id", required=True) - parser.add_argument("--microsoft_store_client_id", required=True) - parser.add_argument("--microsoft_store_app_list", required=True) - parser.add_argument("--microsoft_store_tenant_id", required=True) parser.add_argument("--project", default="moz-fx-data-shared-prod") parser.add_argument("--dataset", default="microsoft_derived") @@ -204,10 +206,10 @@ table_name = "microsoft_app_conversions" date = args.date - client_id = args.microsoft_store_client_id - client_secret = args.microsoft_store_client_secret - app_list = args.microsoft_store_app_list - tenant_id = args.microsoft_store_tenant_id + client_id = MS_CLIENT_ID + client_secret = MS_CLIENT_SECRET + app_list = MS_APP_LIST + tenant_id = MS_TENANT_ID resource_url = API_URI data = [] diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_installs_v1/query.py /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_installs_v1/query.py --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_installs_v1/query.py 2024-06-18 19:47:30.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/microsoft_derived/app_installs_v1/query.py 2024-06-18 19:47:19.000000000 +0000 @@ -2,6 +2,7 @@ import csv import json +import os import tempfile from argparse import ArgumentParser @@ -26,6 +27,11 @@ "successful_install_count", ] +MS_CLIENT_ID = os.environ.get("MICROSOFT_CLIENT_ID") +MS_CLIENT_SECRET = os.environ.get("MICROSOFT_CLIENT_SECRET") +MS_APP_LIST = os.environ.get("MICROSOFT_STORE_APP_LIST") +MS_TENANT_ID = os.environ.get("MICROSOFT_TENANT_ID") + def post_response(url, headers, data): """POST response function.""" @@ -174,10 +180,6 @@ """Input data, call functions, get stuff done.""" parser = ArgumentParser(description=__doc__) parser.add_argument("--date", required=True) - parser.add_argument("--microsoft_store_client_id", required=True) - parser.add_argument("--microsoft_store_client_id", required=True) - parser.add_argument("--microsoft_store_app_list", required=True) - parser.add_argument("--microsoft_store_tenant_id", required=True) parser.add_argument("--project", default="moz-fx-data-shared-prod") parser.add_argument("--dataset", default="microsoft_derived") @@ -190,10 +192,10 @@ table_name = "microsoft_app_installs" date = args.date - client_id = args.microsoft_store_client_id - client_secret = args.microsoft_store_client_secret - app_list = args.microsoft_store_app_list - tenant_id = args.microsoft_store_tenant_id + client_id = MS_CLIENT_ID + client_secret = MS_CLIENT_SECRET + app_list = MS_APP_LIST + tenant_id = MS_TENANT_ID resource_url = API_URI data = [] ```

Link to full diff