[AIRFLOW-5233] Fixed consistency in whitespace (tabs/eols) + common p…

…roblems (#5835)

* [AIRFLOW-5233] Fixed consistency in whitespace (tabs/eols) + common problems

(cherry picked from commit 5cfe9c2)

.pre-commit-config.yaml

@@ -20,6 +20,8 @@ repos:
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.1.6
     hooks:
+      - id: forbid-tabs
+        exclude: ^airflow/_vendor/.*$|^docs/Makefile$
       - id: insert-license
         name: Add licence for all SQL files
         files: \.sql$
@@ -51,6 +53,13 @@ repos:
   - repo: meta
     hooks:
       - id: check-hooks-apply
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-merge-conflict
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
   - repo: local
     hooks:
       - id: lint-dockerfile

CONTRIBUTING.md

@@ -656,6 +656,11 @@ lint-dockerfile                  Lint dockerfile
 mypy                             Run mypy
 pylint                           Run pylint
 flake8                           Run flake8
+forbid-tabs                      Fails if tabs are used in the project
+check-merge-conflict             Checks if merge conflict is being committed
+detect-private-key               Detects if private key is added to the repository
+end-of-file-fixer                Make sure that there is an empty line at the end
+mixed-line-ending                Detects if mixed line ending is used (\r vs. \r\n)
 ```
 ## Using pre-commit hooks
 

LICENSE

@@ -262,4 +262,3 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     (BSD 3 License) d3js v3.5.17 (https://d3js.org)
     (BSD 3 License) parallel-coordinates v0.7.0 (http://syntagmatic.github.com/parallel-coordinates/)
     (BSD 3 License) scikit-learn v0.19.1 (https://github.com/scikit-learn/scikit-learn)
-

NOTICE

@@ -34,5 +34,3 @@ python-nvd3:
 ------------
 
 * Copyright (c) 2013 Arezqui Belaid <areski@gmail.com> and other contributors
-
-

airflow/_vendor/nvd3/templates/cumulativelinechart.html

@@ -8,4 +8,3 @@
 {{super()}}
 
 {% endblock body %}
-

airflow/_vendor/nvd3/templates/linechart.html

@@ -44,4 +44,3 @@
     {% endblock close %}
 
 {% endblock body %}
-

airflow/_vendor/nvd3/templates/lineplusbarchart.html

@@ -41,4 +41,3 @@
     {% endblock close %}
 
 {% endblock body %}
-

airflow/config_templates/default_webserver_config.py

@@ -16,14 +16,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+"""Default configuration for the Airflow webserver"""
 import os
-from airflow import configuration as conf
 from flask_appbuilder.security.manager import AUTH_DB
 # from flask_appbuilder.security.manager import AUTH_LDAP
 # from flask_appbuilder.security.manager import AUTH_OAUTH
 # from flask_appbuilder.security.manager import AUTH_OID
 # from flask_appbuilder.security.manager import AUTH_REMOTE_USER
+
+from airflow import configuration as conf
+
 basedir = os.path.abspath(os.path.dirname(__file__))
 
 # The SQLAlchemy connection string.
@@ -62,7 +64,7 @@
 # When using OAuth Auth, uncomment to setup provider(s) info
 # Google OAuth example:
 # OAUTH_PROVIDERS = [{
-# 	'name':'google',
+#   'name':'google',
 #     'whitelist': ['@YOU_COMPANY_DOMAIN'],  # optional
 #     'token_key':'access_token',
 #     'icon':'fa-google',

airflow/www/templates/airflow/circles.html

@@ -141,4 +141,3 @@ <h1>Airflow 404 = lots of circles</h1>
     toggle();
 
     </script>
-

airflow/www/templates/airflow/task_instance.html

@@ -7,9 +7,9 @@
 # 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
@@ -36,7 +36,7 @@ <h4>
               {{ task_id }}
               <input type="hidden" value="{{ dag.dag_id }}" name="dag_id">
             </span>
-		    {{ form.execution_date(class_="form-control") | safe }}
+        {{ form.execution_date(class_="form-control") | safe }}
 
     </div>
 </form>

airflow/www/templates/airflow/version.html

@@ -7,9 +7,9 @@
 # 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
@@ -23,13 +23,13 @@
 {% block body %}
     {{ super() }}
     <h2>{{ title }}</h2>
-	{% set version_label = 'Version' %}
+  {% set version_label = 'Version' %}
     {% if airflow_version %}
         <h4>{{ version_label }} : <a href="https://pypi.python.org/pypi/apache-airflow/{{ airflow_version }}">{{ airflow_version }}</a></h4>
     {% else %}
         <h4>{{ version_label }} : Not Available</h4>
     {% endif %}
-	<h4>Git Version :{% if git_version %} {{ git_version }} {% else %} Not Available {% endif %}</h4>
+        <h4>Git Version :{% if git_version %} {{ git_version }} {% else %} Not Available {% endif %}</h4>
     <hr>
 
 {% endblock %}

airflow/www_rbac/templates/appbuilder/index.html

@@ -15,4 +15,4 @@
   limitations under the License.
 
 #}
-{% extends "airflow/dag.html" %}
+{% extends "airflow/dag.html" %}

airflow/www_rbac/templates/appbuilder/navbar_menu.html

@@ -54,4 +54,3 @@
         {% endif %}
     {% endif %}
 {% endfor %}
-

airflow/www_rbac/templates/appbuilder/navbar_right.html

@@ -61,4 +61,3 @@
     <li><a href="{{appbuilder.get_url_for_login}}">
     <i class="fa fa-fw fa-sign-in"></i>{{_("Login")}}</a></li>
 {% endif %}
-

dev/README.md

@@ -82,10 +82,10 @@ Users can configure this automatically by running `airflow-pr setup_git_remotes`
 
 ```bash
 $ git remote -v
-github	https://github.com/apache/airflow.git (fetch)
-github	https://github.com/apache/airflow.git (push)
-origin	https://github.com/<USER>/airflow (fetch)
-origin	https://github.com/<USER>/airflow (push)
+github https://github.com/apache/airflow.git (fetch)
+github https://github.com/apache/airflow.git (push)
+origin https://github.com/<USER>/airflow (fetch)
+origin https://github.com/<USER>/airflow (push)
 ```
 
 #### JIRA

dev/requirements.txt

@@ -2,4 +2,3 @@ click>=6.6,<7
 jira>=1.0.7,<2
 keyring==10.1
 gitpython
-

docs/howto/check-health.rst

@@ -46,4 +46,3 @@ To check the health status of your Airflow instance, you can simply access the e
 
 Please keep in mind that the HTTP response code of ``/health`` endpoint **should not** be used to determine the health
 status of the application. The return code is only indicative of the state of the rest call (200 for success).
-

docs/howto/connection/grpc.rst

@@ -70,4 +70,4 @@ Scopes (comma separated) (Optional)
     A list of comma-separated `Google Cloud scopes
     <https://developers.google.com/identity/protocols/googlescopes>`_ to
     authenticate with.
-    Only for `OATH_GOOGLE` type connection
+    Only for `OATH_GOOGLE` type connection

docs/scheduler.rst

@@ -183,4 +183,3 @@ Here are some of the ways you can **unblock tasks**:
   or for instance when the fix has been applied outside of Airflow.
 * The ``airflow backfill`` CLI subcommand has a flag to ``--mark_success`` and allows selecting
   subsections of the DAG as well as specifying date ranges.
-

docs/security.rst

@@ -589,4 +589,3 @@ DAG Level Role
 ``Admin`` can create a set of roles which are only allowed to view a certain set of dags. This is called DAG level access. Each dag defined in the dag model table
 is treated as a ``View`` which has two permissions associated with it (``can_dag_read`` and ``can_dag_edit``). There is a special view called ``all_dags`` which
 allows the role to access all the dags. The default ``Admin``, ``Viewer``, ``User``, ``Op`` roles can all access ``all_dags`` view.
-

docs/timezone.rst

@@ -160,4 +160,3 @@ Time deltas
 For schedules with time deltas Airflow assumes you always will want to run with the specified interval. So if you
 specify a timedelta(hours=2) you will always want to run to hours later. In this case day light savings time will
 be taken into account.
-

licenses/LICENSE-bootstrap.txt

@@ -20,4 +20,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-

licenses/LICENSE-d3-tip.txt

@@ -14,4 +14,3 @@ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONIN
 THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-

licenses/LICENSE-d3js.txt

@@ -25,6 +25,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-

licenses/LICENSE-dagre-d3.txt

@@ -17,5 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-

licenses/LICENSE-datatables.txt

@@ -14,4 +14,3 @@ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONIN
 THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-

licenses/LICENSE-elasticmock.txt

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

licenses/LICENSE-flask-kerberos.txt

@@ -20,4 +20,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

licenses/LICENSE-webgl-2d.txt

@@ -18,6 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-

scripts/ci/kubernetes/docker/bootstrap.sh

@@ -21,10 +21,10 @@
 
 if [[ "$1" = "webserver" ]]
 then
-	exec airflow webserver
+    exec airflow webserver
 fi
 
 if [[ "$1" = "scheduler" ]]
 then
-	exec airflow scheduler
+    exec airflow scheduler
 fi

scripts/ci/minikdc.properties

@@ -25,4 +25,3 @@ max.ticket.lifetime=86400000
 max.renewable.lifetime=604800000
 transport=TCP
 debug=true
-

scripts/systemd/airflow

@@ -21,4 +21,3 @@
 #
 # AIRFLOW_CONFIG=
 # AIRFLOW_HOME=
-

scripts/systemd/airflow-flower.service

@@ -31,4 +31,4 @@ Restart=on-failure
 RestartSec=5s
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

scripts/systemd/airflow-kerberos.service

@@ -31,4 +31,4 @@ Restart=on-failure
 RestartSec=5s
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

scripts/systemd/airflow-worker.service

@@ -31,4 +31,4 @@ Restart=on-failure
 RestartSec=10s
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target