apache · sharon2719 · Oct 13, 2021 · Oct 13, 2021 · Oct 13, 2021 · Oct 14, 2021
diff --git a/=2.1.0 b/=2.1.0
diff --git a/UPDATING.md b/UPDATING.md
@@ -78,8 +78,11 @@ https://developers.google.com/style/inclusive-documentation
 
 -->
 
+
+
 ## Airflow 2.2.1
 
+
 ### ``Param``'s default value for ``default`` removed
 
 ``Param``, introduced in Airflow 2.2.0, accidentally set the default value to ``None``. This default has been removed. If you want ``None`` as your default, explicitly set it as such. For example:

diff --git a/airflow/_vendor/connexion/__init__.py b/airflow/_vendor/connexion/__init__.py
@@ -6,7 +6,13 @@
 from .apps import AbstractApp  # NOQA
 from .decorators.produces import NoContent  # NOQA
 from .exceptions import ProblemException  # NOQA
+
+'main'
+
+# add operation for backwards compatability
+
 # add operation for backwards compatibility
+'main'
 from .operations import compat
 from .problem import problem  # NOQA
 from .resolver import Resolution, Resolver, RestyResolver  # NOQA
@@ -25,9 +31,10 @@ def _required_lib(exc, *args, **kwargs):
 
 
 try:
+    from flask import request  # NOQA
+
     from .apis.flask_api import FlaskApi, context  # NOQA
     from .apps.flask_app import FlaskApp
-    from flask import request  # NOQA
 except ImportError as e:  # pragma: no cover
     _flask_not_installed_error = not_installed_error(e)
     FlaskApi = _flask_not_installed_error

diff --git a/airflow/_vendor/connexion/apis/aiohttp_api.py b/airflow/_vendor/connexion/apis/aiohttp_api.py
@@ -11,15 +11,15 @@
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPNotFound, HTTPPermanentRedirect
 from aiohttp.web_middlewares import normalize_path_middleware
+from werkzeug.exceptions import HTTPException as werkzeug_HTTPException
+
 from airflow._vendor.connexion.apis.abstract import AbstractAPI
 from airflow._vendor.connexion.exceptions import ProblemException
 from airflow._vendor.connexion.handlers import AuthErrorHandler
 from airflow._vendor.connexion.jsonifier import JSONEncoder, Jsonifier
 from airflow._vendor.connexion.lifecycle import ConnexionRequest, ConnexionResponse
 from airflow._vendor.connexion.problem import problem
 from airflow._vendor.connexion.utils import yamldumper
-from werkzeug.exceptions import HTTPException as werkzeug_HTTPException
-
 
 logger = logging.getLogger('connexion.apis.aiohttp_api')
 

diff --git a/airflow/_vendor/connexion/apis/flask_api.py b/airflow/_vendor/connexion/apis/flask_api.py
@@ -3,13 +3,14 @@
 
 import flask
 import werkzeug.exceptions
+from werkzeug.local import LocalProxy
+
 from airflow._vendor.connexion.apis import flask_utils
 from airflow._vendor.connexion.apis.abstract import AbstractAPI
 from airflow._vendor.connexion.handlers import AuthErrorHandler
 from airflow._vendor.connexion.jsonifier import Jsonifier
 from airflow._vendor.connexion.lifecycle import ConnexionRequest, ConnexionResponse
 from airflow._vendor.connexion.utils import is_json_mimetype, yamldumper
-from werkzeug.local import LocalProxy
 
 logger = logging.getLogger('connexion.apis.flask_api')
 

diff --git a/airflow/_vendor/connexion/apps/flask_app.py b/airflow/_vendor/connexion/apps/flask_app.py
@@ -96,9 +96,9 @@ def run(self, port=None, server=None, debug=None, host=None, **options):  # prag
             self.app.run(self.host, port=self.port, debug=self.debug, **options)
         elif self.server == 'tornado':
             try:
-                import tornado.wsgi
                 import tornado.httpserver
                 import tornado.ioloop
+                import tornado.wsgi
             except ImportError:
                 raise Exception('tornado library not installed')
             wsgi_container = tornado.wsgi.WSGIContainer(self.app)

diff --git a/airflow/_vendor/connexion/cli.py b/airflow/_vendor/connexion/cli.py
@@ -3,8 +3,9 @@
 from os import path
 
 import click
-import airflow._vendor.connexion as connexion
 from clickclick import AliasedGroup, fatal_error
+
+import airflow._vendor.connexion as connexion
 from airflow._vendor.connexion.mock import MockResolver
 
 logger = logging.getLogger('connexion.cli')

diff --git a/airflow/_vendor/connexion/decorators/metrics.py b/airflow/_vendor/connexion/decorators/metrics.py
@@ -3,7 +3,9 @@
 import time
 
 from werkzeug.exceptions import HTTPException
+
 from airflow._vendor.connexion.exceptions import ProblemException
+
 try:
     import uwsgi_metrics
     HAS_UWSGI_METRICS = True  # pragma: no cover

diff --git a/airflow/_vendor/connexion/decorators/response.py b/airflow/_vendor/connexion/decorators/response.py
@@ -4,8 +4,7 @@
 
 from jsonschema import ValidationError
 
-from ..exceptions import (NonConformingResponseBody,
-                          NonConformingResponseHeaders)
+from ..exceptions import NonConformingResponseBody, NonConformingResponseHeaders
 from ..utils import all_json, has_coroutine
 from .decorator import BaseDecorator
 from .validation import ResponseBodyValidator

diff --git a/airflow/_vendor/connexion/decorators/security.py b/airflow/_vendor/connexion/decorators/security.py
@@ -1,16 +1,16 @@
 # Authentication and authorization related decorators
 import base64
 import functools
+import http.cookies
 import logging
 import os
 import textwrap
 
 import httpx
+
 from airflow._vendor.connexion.utils import get_function_from_name
-import http.cookies
 
-from ..exceptions import (ConnexionException, OAuthProblem,
-                          OAuthResponseProblem, OAuthScopeProblem)
+from ..exceptions import ConnexionException, OAuthProblem, OAuthResponseProblem, OAuthScopeProblem
 
 logger = logging.getLogger('connexion.api.security')
 # use connection pool for OAuth tokeninfo

diff --git a/airflow/_vendor/connexion/decorators/uri_parsing.py b/airflow/_vendor/connexion/decorators/uri_parsing.py
@@ -1,11 +1,11 @@
 # Decorators to split query and path parameters
 import abc
 import functools
+import json
 import logging
 import re
-import json
-from .. import utils
 
+from .. import utils
 from .decorator import BaseDecorator
 
 logger = logging.getLogger('connexion.decorators.uri_parsing')

diff --git a/airflow/_vendor/connexion/decorators/validation.py b/airflow/_vendor/connexion/decorators/validation.py
@@ -8,7 +8,7 @@
 from jsonschema.validators import extend
 from werkzeug.datastructures import FileStorage
 
-from ..exceptions import ExtraParameterProblem, BadRequestProblem, UnsupportedMediaTypeProblem
+from ..exceptions import BadRequestProblem, ExtraParameterProblem, UnsupportedMediaTypeProblem
 from ..http_facts import FORM_CONTENT_TYPES
 from ..json_schema import Draft4RequestValidator, Draft4ResponseValidator
 from ..utils import all_json, boolean, is_json_mimetype, is_null, is_nullable

diff --git a/airflow/_vendor/connexion/exceptions.py b/airflow/_vendor/connexion/exceptions.py
@@ -1,4 +1,5 @@
 import warnings
+
 from jsonschema.exceptions import ValidationError
 from werkzeug.exceptions import Forbidden, Unauthorized
 

diff --git a/airflow/_vendor/connexion/handlers.py b/airflow/_vendor/connexion/handlers.py
@@ -1,7 +1,7 @@
 import logging
 
-from .operations.secure import SecureOperation
 from .exceptions import AuthenticationProblem, ResolverProblem
+from .operations.secure import SecureOperation
 
 logger = logging.getLogger('connexion.handlers')
 

diff --git a/airflow/_vendor/connexion/operations/secure.py b/airflow/_vendor/connexion/operations/secure.py
@@ -2,12 +2,21 @@
 import logging
 
 from ..decorators.decorator import RequestResponseDecorator
-from ..decorators.security import (get_apikeyinfo_func, get_basicinfo_func,
-                                   get_bearerinfo_func,
-                                   get_scope_validate_func, get_tokeninfo_func,
-                                   security_deny, security_passthrough,
-                                   verify_apikey, verify_basic, verify_bearer,
-                                   verify_none, verify_oauth, verify_security)
+from ..decorators.security import (
+    get_apikeyinfo_func,
+    get_basicinfo_func,
+    get_bearerinfo_func,
+    get_scope_validate_func,
+    get_tokeninfo_func,
+    security_deny,
+    security_passthrough,
+    verify_apikey,
+    verify_basic,
+    verify_bearer,
+    verify_none,
+    verify_oauth,
+    verify_security,
+)
 
 logger = logging.getLogger("connexion.operations.secure")
 

diff --git a/airflow/_vendor/connexion/options.py b/airflow/_vendor/connexion/options.py
@@ -3,8 +3,7 @@
 from typing import Optional  # NOQA
 
 try:
-    from swagger_ui_bundle import (swagger_ui_2_path,
-                                   swagger_ui_3_path)
+    from swagger_ui_bundle import swagger_ui_2_path, swagger_ui_3_path
 except ImportError:
     swagger_ui_2_path = swagger_ui_3_path = None
 

diff --git a/airflow/_vendor/connexion/spec.py b/airflow/_vendor/connexion/spec.py
@@ -1,11 +1,11 @@
 import abc
 import copy
 import pathlib
+from urllib.parse import urlsplit
 
 import jinja2
 import yaml
 from openapi_spec_validator.exceptions import OpenAPIValidationError
-from urllib.parse import urlsplit
 
 from .exceptions import InvalidSpecification
 from .json_schema import resolve_refs

diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
@@ -418,19 +418,27 @@ paths:
             type: boolean
             default: true
           required: false
+
+          description: Only return active DAGs.
+
           description: |
             Only return active DAGs.
 
             *New in version 2.1.1*
+
         - name: dag_id_pattern
           in: query
           schema:
             type: string
           required: false
+
+          description: If set, only return DAGs with dag_ids matching this pattern.
+
           description: |
             If set, only return DAGs with dag_ids matching this pattern.
 
             *New in version 2.3.0*
+
       responses:
         '200':
           description: Success.
@@ -2440,7 +2448,11 @@ components:
           description: |
             The DagRun ID for this task instance
 
+
+            *New in version 2.2.1*
+
             *New in version 2.3.0*
+
         execution_date:
           type: string
           format: datetime

diff --git a/airflow/providers/apache/pinot/example_dags/__init__.py b/airflow/providers/apache/pinot/example_dags/__init__.py
@@ -0,0 +1,16 @@
+# 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.
diff --git a/airflow/providers/apache/pinot/example_dags/example_pinot_dag.py b/airflow/providers/apache/pinot/example_dags/example_pinot_dag.py
@@ -0,0 +1,44 @@
+# 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.
+
+"""Example DAG demonstrating the usage of the PinotAdminHook and PinotDbApiHook."""
+
+from datetime import datetime
+
+from airflow import DAG
+from airflow.providers.apache.pinot.hooks.pinot import PinotAdminHook, PinotDbApiHook
+
+with DAG(
+    dag_id='example_pinot_hook',
+    schedule_interval=None,
+    year=datetime(),
+    tags=['example'],
+) as dag:
+    # [START howto_operator_pinot_admin_hook]
+    run_this = PinotAdminHook(
+        task_id="run_example_pinot_script",
+        pinot="ls /;",
+        pinot_options="-x local",
+    )
+    # [END howto_operator_pinot_admin_hook]
+    # [START howto_operator_pinot_dbapi_example]
+    run_this = PinotDbApiHook(
+        task_id="run_example_pinot_script",
+        pinot="ls /;",
+        pinot_options="-x local",
+    )
+    # [END howto_operator_pinot_dbapi_example]
diff --git a/airflow/providers/apache/pinot/provider.yaml b/airflow/providers/apache/pinot/provider.yaml
@@ -35,8 +35,18 @@ integrations:
     external-doc-url: https://pinot.apache.org/
     logo: /integration-logos/apache/pinot.png
     tags: [apache]
+    how-to-guide:
+      - /docs/apache-airflow-providers-apache-pinot/operators.rst
 
 hooks:
   - integration-name: Apache Pinot
     python-modules:
       - airflow.providers.apache.pinot.hooks.pinot
+
+hook-class-names:
+  - airflow.providers.apache.pinot.hooks.pinot.PinotAdminHook
+  - airflow.providers.apache.pinot.hooks.pinot.PinotDbApiHook
+
+connection-types:
+  - hook-class-name: airflow.providers.apache.pinot.hooks.pinot.PinotHook
+    connection-type: pinot
diff --git a/airflow/providers/microsoft/azure/example_dags/example_fileshare.py b/airflow/providers/microsoft/azure/example_dags/example_fileshare.py
@@ -43,10 +43,14 @@ def delete_fileshare():
     hook.delete_share(NAME)
 
 
+
+with DAG("example_fileshare", schedule_interval="@once", start_date=datetime(2021, 1, 1)) as dag:
+
 with DAG(
     "example_fileshare",
     schedule_interval="@once",
     start_date=datetime(2021, 1, 1),
     catchup=False,
 ) as dag:
+
     create_fileshare() >> delete_fileshare()
diff --git a/airflow/providers/microsoft/azure/example_dags/example_local_to_adls.py b/airflow/providers/microsoft/azure/example_dags/example_local_to_adls.py
@@ -28,7 +28,9 @@
 with models.DAG(
     "example_local_to_adls",
     start_date=datetime(2021, 1, 1),
+
     catchup=False,
+
     schedule_interval=None,
     tags=['example'],
 ) as dag:

diff --git a/airflow/providers/microsoft/azure/example_dags/example_local_to_wasb.py b/airflow/providers/microsoft/azure/example_dags/example_local_to_wasb.py
@@ -28,7 +28,10 @@
     "example_local_to_wasb",
     schedule_interval="@once",
     start_date=datetime(2021, 1, 1),
+
+
     catchup=False,
+
     default_args={"container_name": "mycontainer", "blob_name": "myblob"},
 ) as dag:
     upload = LocalFilesystemToWasbOperator(task_id="upload_file", file_path=PATH_TO_UPLOAD_FILE)
-Original file line number
+Diff line change
@@ Expand Up @@
     -->
     ## Airflow 2.2.1
     ### ``Param``'s default value for ``default`` removed
     ``Param``, introduced in Airflow 2.2.0, accidentally set the default value to ``None``. This default has been removed. If you want ``None`` as your default, explicitly set it as such. For example:
@@ Expand Down @@