From 422aabc2dab945e075eb627298e5dc479d0744c7 Mon Sep 17 00:00:00 2001 From: Josh Fell Date: Mon, 8 Nov 2021 22:41:15 -0500 Subject: [PATCH 1/2] Remove unnecessary conn form customizations in Azure --- .../microsoft/azure/hooks/azure_container_volume.py | 7 ------- airflow/providers/microsoft/azure/hooks/azure_fileshare.py | 2 -- 2 files changed, 9 deletions(-) diff --git a/airflow/providers/microsoft/azure/hooks/azure_container_volume.py b/airflow/providers/microsoft/azure/hooks/azure_container_volume.py index 8aae16b491a34..ef256a2f88638 100644 --- a/airflow/providers/microsoft/azure/hooks/azure_container_volume.py +++ b/airflow/providers/microsoft/azure/hooks/azure_container_volume.py @@ -66,13 +66,6 @@ def get_ui_field_behaviour() -> Dict: 'password': 'Azure Secret', }, "placeholders": { - 'extra': json.dumps( - { - "key_path": "path to json file for auth", - "key_json": "specifies json dict for auth", - }, - indent=1, - ), 'login': 'client_id (token credentials auth)', 'password': 'secret (token credentials auth)', 'extra__azure_container_volume__connection_string': 'connection string auth', diff --git a/airflow/providers/microsoft/azure/hooks/azure_fileshare.py b/airflow/providers/microsoft/azure/hooks/azure_fileshare.py index acfa881ddb266..7b78e3310132c 100644 --- a/airflow/providers/microsoft/azure/hooks/azure_fileshare.py +++ b/airflow/providers/microsoft/azure/hooks/azure_fileshare.py @@ -71,12 +71,10 @@ def get_ui_field_behaviour() -> Dict: "relabeling": { 'login': 'Blob Storage Login (optional)', 'password': 'Blob Storage Key (optional)', - 'host': 'Account Name (Active Directory Auth)', }, "placeholders": { 'login': 'account name', 'password': 'secret', - 'host': 'account url', 'extra__azure_fileshare__sas_token': 'account url or token (optional)', 'extra__azure_fileshare__connection_string': 'account url or token (optional)', 'extra__azure_fileshare__protocol': 'account url or token (optional)', From 26c93cc9f79f16f94475a53b4d252c01bbcc9884 Mon Sep 17 00:00:00 2001 From: Josh Fell Date: Tue, 9 Nov 2021 00:30:43 -0500 Subject: [PATCH 2/2] Fixup! Remove unused import --- .../providers/microsoft/azure/hooks/azure_container_volume.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/airflow/providers/microsoft/azure/hooks/azure_container_volume.py b/airflow/providers/microsoft/azure/hooks/azure_container_volume.py index ef256a2f88638..cd760abe80bbf 100644 --- a/airflow/providers/microsoft/azure/hooks/azure_container_volume.py +++ b/airflow/providers/microsoft/azure/hooks/azure_container_volume.py @@ -57,8 +57,6 @@ def get_connection_form_widgets() -> Dict[str, Any]: @staticmethod def get_ui_field_behaviour() -> Dict: """Returns custom field behaviour""" - import json - return { "hidden_fields": ['schema', 'port', 'host', "extra"], "relabeling": {