[airflow] branch main updated: Remove required validations in Hashicorp Vault conn form (#30138)

[eladkal]

This is an automated email from the ASF dual-hosted git repository.

eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new b3d5a176ba Remove required validations in Hashicorp Vault conn form 
(#30138)
b3d5a176ba is described below

commit b3d5a176baac530a25ec9d1c8838115d9d156f0b
Author: Josh Fell <48934154+josh-f...@users.noreply.github.com>
AuthorDate: Thu Mar 16 03:35:47 2023 -0400

    Remove required validations in Hashicorp Vault conn form (#30138)
    
    #30057 added a couple field validators in a new connection form for 
Hashicorp Vault. Behind the scenes, all connection form data is persisted upon 
submission. When creating a new connection that isn't Hashicrop Vault, these 
fields would not contain values that satisfy the validators of the fields.
    
    Making sure these offending fields are either optional or have a default 
value in the Hashicorp Vault conn form.
---
 airflow/providers/hashicorp/hooks/vault.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/airflow/providers/hashicorp/hooks/vault.py 
b/airflow/providers/hashicorp/hooks/vault.py
index 74d164fbb7..dc92d07405 100644
--- a/airflow/providers/hashicorp/hooks/vault.py
+++ b/airflow/providers/hashicorp/hooks/vault.py
@@ -369,7 +369,7 @@ class VaultHook(BaseHook):
         from flask_appbuilder.fieldwidgets import BS3TextFieldWidget
         from flask_babel import lazy_gettext
         from wtforms import BooleanField, IntegerField, StringField
-        from wtforms.validators import NumberRange, any_of
+        from wtforms.validators import NumberRange, Optional, any_of
 
         return {
             "auth_type": StringField(lazy_gettext("Auth type"), 
widget=BS3TextFieldWidget()),
@@ -378,6 +378,8 @@ class VaultHook(BaseHook):
                 lazy_gettext("KV engine version"),
                 validators=[any_of([1, 2])],
                 widget=BS3TextFieldWidget(),
+                description="Must be 1 or 2.",
+                default=DEFAULT_KV_ENGINE_VERSION,
             ),
             "role_id": StringField(lazy_gettext("Role ID (deprecated)"), 
widget=BS3TextFieldWidget()),
             "kubernetes_role": StringField(lazy_gettext("Kubernetes role"), 
widget=BS3TextFieldWidget()),
@@ -392,8 +394,8 @@ class VaultHook(BaseHook):
             "radius_host": StringField(lazy_gettext("Radius host"), 
widget=BS3TextFieldWidget()),
             "radius_port": IntegerField(
                 lazy_gettext("Radius port"),
-                validators=[NumberRange(min=0)],
                 widget=BS3TextFieldWidget(),
+                validators=[Optional(), NumberRange(min=0)],
             ),
             "use_tls": BooleanField(lazy_gettext("Use TLS"), default=True),
         }