You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2022/08/19 20:14:31 UTC
[GitHub] [airflow] blag commented on a diff in pull request #24679: Warning for using listing conns & vars with secrets backend
blag commented on code in PR #24679:
URL: https://github.com/apache/airflow/pull/24679#discussion_r950525200
##########
airflow/www/templates/airflow/variable_list.html:
##########
@@ -1,45 +1,52 @@
{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-#}
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ #}
Review Comment:
```suggestion
#}
```
##########
airflow/www/templates/airflow/connection_list.html:
##########
@@ -0,0 +1,34 @@
+{#
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ #}
+
+ {% extends 'appbuilder/general/model/list.html' %}
+ {% from 'airflow/_messages.html' import show_message %}
+
+ {% block content %}
+ {% if is_using_secrets_backend() %}
+ {% call show_message(category='warning') %}
+ <b>WARNING:</b> {{ warn_list_secrets_alternative_backend("ui", "connection") }}
+ {% endcall %}
+ {% endif %}
+ {{ super() }}
+ <style>
+ td { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; max-width:1px;}
+ th { resize: horizontal; overflow: auto;}
+ </style>
+ {% endblock %}
Review Comment:
This indentation can be made a bit more consistent.
```suggestion
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
#}
{% extends 'appbuilder/general/model/list.html' %}
{% from 'airflow/_messages.html' import show_message %}
{% block content %}
{% if is_using_secrets_backend() %}
{% call show_message(category='warning') %}
<b>WARNING:</b> {{ warn_list_secrets_alternative_backend("ui", "connection") }}
{% endcall %}
{% endif %}
{{ super() }}
<style>
td { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; max-width:1px;}
th { resize: horizontal; overflow: auto;}
</style>
{% endblock %}
```
##########
airflow/www/templates/airflow/variable_list.html:
##########
@@ -1,45 +1,52 @@
{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-#}
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ #}
-{% extends 'appbuilder/general/model/list.html' %}
+ {% extends 'appbuilder/general/model/list.html' %}
+ {% from 'airflow/_messages.html' import show_message %}
Review Comment:
```suggestion
{% extends 'appbuilder/general/model/list.html' %}
{% from 'airflow/_messages.html' import show_message %}
```
##########
airflow/www/templates/airflow/variable_list.html:
##########
@@ -1,45 +1,52 @@
{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-#}
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ #}
-{% extends 'appbuilder/general/model/list.html' %}
+ {% extends 'appbuilder/general/model/list.html' %}
+ {% from 'airflow/_messages.html' import show_message %}
-{% block content %}
- {% if can_create_variable() %}
- <div class="well well-sm pull-left">
- <form class="form-inline" action="{{ url_for('VariableModelView.varimport') }}" method="post" enctype="multipart/form-data">
- {% if csrf_token %}
- <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
- {% endif %}
- <div class="form-group">
- <input class="form-control-file" type="file" name="file">
- </div>
- <button type="submit" class="btn">
- <span class="material-icons">cloud_upload</span>
- Import Variables
- </button>
- </form>
- </div>
- <div class="clearfix"></div>
- {% endif %}
- {{ super() }}
- <style>
- td { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; max-width:1px;}
- th { resize: horizontal; overflow: auto;}
- </style>
-{% endblock %}
+ {% block content %}
+
+ {% if is_using_secrets_backend() %}
+ {% call show_message(category='warning') %}
+ <b>WARNING:</b> {{ warn_list_secrets_alternative_backend("ui", "variable") }}
+ {% endcall %}
+ {% endif %}
+ {% if can_create_variable() %}
+ <div class="well well-sm pull-left">
+ <form class="form-inline" action="{{ url_for('VariableModelView.varimport') }}" method="post" enctype="multipart/form-data">
+ {% if csrf_token %}
+ <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+ {% endif %}
+ <div class="form-group">
+ <input class="form-control-file" type="file" name="file">
+ </div>
+ <button type="submit" class="btn">
+ <span class="material-icons">cloud_upload</span>
+ Import Variables
+ </button>
+ </form>
+ </div>
+ <div class="clearfix"></div>
+ {% endif %}
+ {{ super() }}
+ <style>
+ td { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; max-width:1px;}
+ th { resize: horizontal; overflow: auto;}
+ </style>
+ {% endblock %}
Review Comment:
```suggestion
{% block content %}
{% if is_using_secrets_backend() %}
{% call show_message(category='warning') %}
<b>WARNING:</b> {{ warn_list_secrets_alternative_backend("ui", "variable") }}
{% endcall %}
{% endif %}
{% if can_create_variable() %}
<div class="well well-sm pull-left">
<form class="form-inline" action="{{ url_for('VariableModelView.varimport') }}" method="post" enctype="multipart/form-data">
{% if csrf_token %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
{% endif %}
<div class="form-group">
<input class="form-control-file" type="file" name="file">
</div>
<button type="submit" class="btn">
<span class="material-icons">cloud_upload</span>
Import Variables
</button>
</form>
</div>
<div class="clearfix"></div>
{% endif %}
{{ super() }}
<style>
td { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; max-width:1px;}
th { resize: horizontal; overflow: auto;}
</style>
{% endblock %}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org