From ec307f9a5e05a62085a827420efffe40ff6fb0e6 Mon Sep 17 00:00:00 2001 From: josix Date: Wed, 29 Jan 2025 04:23:29 +0800 Subject: [PATCH] refactor(providers/opensearch): move opensearch provider to new structure --- .github/boring-cyborg.yml | 5 +- docs/.gitignore | 1 + .../changelog.rst | 25 -- providers/opensearch/README.rst | 62 +++++ .../docs}/.latest-doc-only-change.txt | 0 .../docs/changelog.rst} | 0 .../opensearch/docs}/commits.rst | 0 .../opensearch/docs}/configurations-ref.rst | 0 .../opensearch/docs}/connections/index.rst | 0 .../docs}/connections/opensearch.rst | 0 .../opensearch/docs}/index.rst | 0 .../installing-providers-from-sources.rst | 0 .../docs/integration-logos}/opensearch.png | Bin .../opensearch/docs}/logging/index.rst | 0 .../opensearch/docs}/operators/index.rst | 0 .../opensearch/docs}/operators/opensearch.rst | 6 +- .../opensearch/docs}/security.rst | 0 .../providers => }/opensearch/provider.yaml | 6 +- providers/opensearch/pyproject.toml | 78 +++++++ .../src/airflow/providers/opensearch/LICENSE | 201 ++++++++++++++++ .../airflow/providers/opensearch/__init__.py | 0 .../providers/opensearch/get_provider_info.py | 220 ++++++++++++++++++ .../providers/opensearch/hooks/__init__.py | 0 .../providers/opensearch/hooks/opensearch.py | 0 .../providers/opensearch/log/__init__.py | 0 .../opensearch/log/os_json_formatter.py | 0 .../providers/opensearch/log/os_response.py | 0 .../opensearch/log/os_task_handler.py | 0 .../opensearch/operators/__init__.py | 0 .../opensearch/operators/opensearch.py | 0 .../providers/opensearch/version_compat.py | 0 providers/opensearch/tests/conftest.py | 32 +++ .../tests/provider_tests/__init__.py | 17 ++ .../provider_tests}/opensearch/__init__.py | 0 .../provider_tests}/opensearch/conftest.py | 0 .../opensearch/hooks/__init__.py | 0 .../opensearch/hooks/test_opensearch.py | 3 +- .../opensearch/log/__init__.py | 0 .../opensearch/log/test_os_json_formatter.py | 3 +- .../opensearch/log/test_os_response.py | 3 +- .../opensearch/log/test_os_task_handler.py | 5 +- .../opensearch/operators/__init__.py | 0 .../opensearch/operators/test_opensearch.py | 4 +- .../tests/system/opensearch/__init__.py | 0 .../system/opensearch/example_opensearch.py | 0 pyproject.toml | 3 + scripts/ci/docker-compose/remove-sources.yml | 1 + scripts/ci/docker-compose/tests-sources.yml | 1 + 48 files changed, 627 insertions(+), 49 deletions(-) delete mode 100644 docs/apache-airflow-providers-opensearch/changelog.rst create mode 100644 providers/opensearch/README.rst rename providers/{src/airflow/providers/opensearch => opensearch/docs}/.latest-doc-only-change.txt (100%) rename providers/{src/airflow/providers/opensearch/CHANGELOG.rst => opensearch/docs/changelog.rst} (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/commits.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/configurations-ref.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/connections/index.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/connections/opensearch.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/index.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/installing-providers-from-sources.rst (100%) rename {docs/integration-logos/opensearch => providers/opensearch/docs/integration-logos}/opensearch.png (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/logging/index.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/operators/index.rst (100%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/operators/opensearch.rst (88%) rename {docs/apache-airflow-providers-opensearch => providers/opensearch/docs}/security.rst (100%) rename providers/{src/airflow/providers => }/opensearch/provider.yaml (97%) create mode 100644 providers/opensearch/pyproject.toml create mode 100644 providers/opensearch/src/airflow/providers/opensearch/LICENSE rename providers/{ => opensearch}/src/airflow/providers/opensearch/__init__.py (100%) create mode 100644 providers/opensearch/src/airflow/providers/opensearch/get_provider_info.py rename providers/{ => opensearch}/src/airflow/providers/opensearch/hooks/__init__.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/hooks/opensearch.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/log/__init__.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/log/os_json_formatter.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/log/os_response.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/log/os_task_handler.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/operators/__init__.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/operators/opensearch.py (100%) rename providers/{ => opensearch}/src/airflow/providers/opensearch/version_compat.py (100%) create mode 100644 providers/opensearch/tests/conftest.py create mode 100644 providers/opensearch/tests/provider_tests/__init__.py rename providers/{tests => opensearch/tests/provider_tests}/opensearch/__init__.py (100%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/conftest.py (100%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/hooks/__init__.py (100%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/hooks/test_opensearch.py (99%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/log/__init__.py (100%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/log/test_os_json_formatter.py (99%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/log/test_os_response.py (99%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/log/test_os_task_handler.py (99%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/operators/__init__.py (100%) rename providers/{tests => opensearch/tests/provider_tests}/opensearch/operators/test_opensearch.py (99%) rename providers/{ => opensearch}/tests/system/opensearch/__init__.py (100%) rename providers/{ => opensearch}/tests/system/opensearch/example_opensearch.py (100%) diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 360de1e96236d..b54f554b247c6 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -270,10 +270,7 @@ labelPRBasedOnFilePath: - providers/openlineage/** provider:opensearch: - - providers/src/airflow/providers/opensearch/**/* - - docs/apache-airflow-providers-opensearch/**/* - - providers/tests/opensearch/**/* - - providers/tests/system/opensearch/**/* + - providers/opensearch/** provider:opsgenie: - providers/opsgenie/** diff --git a/docs/.gitignore b/docs/.gitignore index 1f80c74e825a2..9dea0b3a30a4f 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -35,6 +35,7 @@ apache-airflow-providers-imap apache-airflow-providers-neo4j apache-airflow-providers-openai apache-airflow-providers-openfaas +apache-airflow-providers-opensearch apache-airflow-providers-opsgenie apache-airflow-providers-papermill apache-airflow-providers-pgvector diff --git a/docs/apache-airflow-providers-opensearch/changelog.rst b/docs/apache-airflow-providers-opensearch/changelog.rst deleted file mode 100644 index 21f39a6c1f6ea..0000000000000 --- a/docs/apache-airflow-providers-opensearch/changelog.rst +++ /dev/null @@ -1,25 +0,0 @@ - - .. 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. - - .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE - OVERWRITTEN WHEN PREPARING PACKAGES. - - .. IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE - `PROVIDER_CHANGELOG_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY - -.. include:: ../../providers/src/airflow/providers/opensearch/CHANGELOG.rst diff --git a/providers/opensearch/README.rst b/providers/opensearch/README.rst new file mode 100644 index 0000000000000..640015fdeacbb --- /dev/null +++ b/providers/opensearch/README.rst @@ -0,0 +1,62 @@ + + .. 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. + + .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN! + + .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE + `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY + + +Package ``apache-airflow-providers-opensearch`` + +Release: ``1.6.0`` + + +`OpenSearch `__ + + +Provider package +---------------- + +This is a provider package for ``opensearch`` provider. All classes for this provider package +are in ``airflow.providers.opensearch`` python package. + +You can find package information and changelog for the provider +in the `documentation `_. + +Installation +------------ + +You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below +for the minimum Airflow version supported) via +``pip install apache-airflow-providers-opensearch`` + +The package supports the following python versions: 3.9,3.10,3.11,3.12 + +Requirements +------------ + +================== ================== +PIP package Version required +================== ================== +``apache-airflow`` ``>=2.9.0`` +``opensearch-py`` ``>=2.2.0`` +================== ================== + +The changelog for the provider package can be found in the +`changelog `_. diff --git a/providers/src/airflow/providers/opensearch/.latest-doc-only-change.txt b/providers/opensearch/docs/.latest-doc-only-change.txt similarity index 100% rename from providers/src/airflow/providers/opensearch/.latest-doc-only-change.txt rename to providers/opensearch/docs/.latest-doc-only-change.txt diff --git a/providers/src/airflow/providers/opensearch/CHANGELOG.rst b/providers/opensearch/docs/changelog.rst similarity index 100% rename from providers/src/airflow/providers/opensearch/CHANGELOG.rst rename to providers/opensearch/docs/changelog.rst diff --git a/docs/apache-airflow-providers-opensearch/commits.rst b/providers/opensearch/docs/commits.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/commits.rst rename to providers/opensearch/docs/commits.rst diff --git a/docs/apache-airflow-providers-opensearch/configurations-ref.rst b/providers/opensearch/docs/configurations-ref.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/configurations-ref.rst rename to providers/opensearch/docs/configurations-ref.rst diff --git a/docs/apache-airflow-providers-opensearch/connections/index.rst b/providers/opensearch/docs/connections/index.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/connections/index.rst rename to providers/opensearch/docs/connections/index.rst diff --git a/docs/apache-airflow-providers-opensearch/connections/opensearch.rst b/providers/opensearch/docs/connections/opensearch.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/connections/opensearch.rst rename to providers/opensearch/docs/connections/opensearch.rst diff --git a/docs/apache-airflow-providers-opensearch/index.rst b/providers/opensearch/docs/index.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/index.rst rename to providers/opensearch/docs/index.rst diff --git a/docs/apache-airflow-providers-opensearch/installing-providers-from-sources.rst b/providers/opensearch/docs/installing-providers-from-sources.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/installing-providers-from-sources.rst rename to providers/opensearch/docs/installing-providers-from-sources.rst diff --git a/docs/integration-logos/opensearch/opensearch.png b/providers/opensearch/docs/integration-logos/opensearch.png similarity index 100% rename from docs/integration-logos/opensearch/opensearch.png rename to providers/opensearch/docs/integration-logos/opensearch.png diff --git a/docs/apache-airflow-providers-opensearch/logging/index.rst b/providers/opensearch/docs/logging/index.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/logging/index.rst rename to providers/opensearch/docs/logging/index.rst diff --git a/docs/apache-airflow-providers-opensearch/operators/index.rst b/providers/opensearch/docs/operators/index.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/operators/index.rst rename to providers/opensearch/docs/operators/index.rst diff --git a/docs/apache-airflow-providers-opensearch/operators/opensearch.rst b/providers/opensearch/docs/operators/opensearch.rst similarity index 88% rename from docs/apache-airflow-providers-opensearch/operators/opensearch.rst rename to providers/opensearch/docs/operators/opensearch.rst index b85a014ebefee..fc66fa0548842 100644 --- a/docs/apache-airflow-providers-opensearch/operators/opensearch.rst +++ b/providers/opensearch/docs/operators/opensearch.rst @@ -35,7 +35,7 @@ to create a new index in an OpenSearch domain. -.. exampleinclude:: /../../providers/tests/system/opensearch/example_opensearch.py +.. exampleinclude:: /../../providers/opensearch/tests/system/opensearch/example_opensearch.py :language: python :start-after: [START howto_operator_opensearch_create_index] :dedent: 4 @@ -50,7 +50,7 @@ Add a Document to an Index on OpenSearch Use :class:`~airflow.providers.opensearch.operators.opensearch.OpenSearchAddDocumentOperator` to add single documents to an OpenSearch Index -.. exampleinclude:: /../../providers/tests/system/opensearch/example_opensearch.py +.. exampleinclude:: /../../providers/opensearch/tests/system/opensearch/example_opensearch.py :language: python :start-after: [START howto_operator_opensearch_add_document] :dedent: 4 @@ -65,7 +65,7 @@ Run a query against an OpenSearch Index Use :class:`~airflow.providers.opensearch.operators.opensearch.OpenSearchQueryOperator` to run a query against an OpenSearch index. -.. exampleinclude:: /../../providers/tests/system/opensearch/example_opensearch.py +.. exampleinclude:: /../../providers/opensearch/tests/system/opensearch/example_opensearch.py :language: python :start-after: [START howto_operator_opensearch_query] :dedent: 4 diff --git a/docs/apache-airflow-providers-opensearch/security.rst b/providers/opensearch/docs/security.rst similarity index 100% rename from docs/apache-airflow-providers-opensearch/security.rst rename to providers/opensearch/docs/security.rst diff --git a/providers/src/airflow/providers/opensearch/provider.yaml b/providers/opensearch/provider.yaml similarity index 97% rename from providers/src/airflow/providers/opensearch/provider.yaml rename to providers/opensearch/provider.yaml index 04ce301b905a6..288d39dca4a56 100644 --- a/providers/src/airflow/providers/opensearch/provider.yaml +++ b/providers/opensearch/provider.yaml @@ -36,16 +36,12 @@ versions: - 1.1.0 - 1.0.0 -dependencies: - - apache-airflow>=2.9.0 - - opensearch-py>=2.2.0 - integrations: - integration-name: OpenSearch external-doc-url: https://opensearch.org/ how-to-guide: - /docs/apache-airflow-providers-opensearch/operators/opensearch.rst - logo: /integration-logos/opensearch/opensearch.png + logo: /docs/integration-logos/opensearch.png tags: [software] hooks: diff --git a/providers/opensearch/pyproject.toml b/providers/opensearch/pyproject.toml new file mode 100644 index 0000000000000..3015634ad4293 --- /dev/null +++ b/providers/opensearch/pyproject.toml @@ -0,0 +1,78 @@ +# 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. + +# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN! + +# IF YOU WANT TO MODIFY THIS FILE EXCEPT DEPENDENCIES, YOU SHOULD MODIFY THE TEMPLATE +# `pyproject_TEMPLATE.toml.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY +[build-system] +requires = ["flit_core==3.10.1"] +build-backend = "flit_core.buildapi" + +[project] +name = "apache-airflow-providers-opensearch" +version = "1.6.0" +description = "Provider package apache-airflow-providers-opensearch for Apache Airflow" +readme = "README.rst" +authors = [ + {name="Apache Software Foundation", email="dev@airflow.apache.org"}, +] +maintainers = [ + {name="Apache Software Foundation", email="dev@airflow.apache.org"}, +] +keywords = [ "airflow-provider", "opensearch", "airflow", "integration" ] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Environment :: Web Environment", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Framework :: Apache Airflow", + "Framework :: Apache Airflow :: Provider", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Topic :: System :: Monitoring", +] +requires-python = "~=3.9" + +# The dependencies should be modified in place in the generated file +# Any change in the dependencies is preserved when the file is regenerated +dependencies = [ + "apache-airflow>=2.9.0", + "opensearch-py>=2.2.0", +] + +[project.urls] +"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-opensearch/1.6.0" +"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-opensearch/1.6.0/changelog.html" +"Bug Tracker" = "https://github.com/apache/airflow/issues" +"Source Code" = "https://github.com/apache/airflow" +"Slack Chat" = "https://s.apache.org/airflow-slack" +"Twitter" = "https://x.com/ApacheAirflow" +"YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/" + +[project.entry-points."apache_airflow_provider"] +provider_info = "airflow.providers.opensearch.get_provider_info:get_provider_info" + +[tool.flit.module] +name = "airflow.providers.opensearch" + +[tool.pytest.ini_options] +ignore = "tests/system/" diff --git a/providers/opensearch/src/airflow/providers/opensearch/LICENSE b/providers/opensearch/src/airflow/providers/opensearch/LICENSE new file mode 100644 index 0000000000000..11069edd79019 --- /dev/null +++ b/providers/opensearch/src/airflow/providers/opensearch/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed 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/providers/src/airflow/providers/opensearch/__init__.py b/providers/opensearch/src/airflow/providers/opensearch/__init__.py similarity index 100% rename from providers/src/airflow/providers/opensearch/__init__.py rename to providers/opensearch/src/airflow/providers/opensearch/__init__.py diff --git a/providers/opensearch/src/airflow/providers/opensearch/get_provider_info.py b/providers/opensearch/src/airflow/providers/opensearch/get_provider_info.py new file mode 100644 index 0000000000000..feb4f5639507a --- /dev/null +++ b/providers/opensearch/src/airflow/providers/opensearch/get_provider_info.py @@ -0,0 +1,220 @@ +# 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. + +# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN! +# +# IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE +# `get_provider_info_TEMPLATE.py.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY + + +def get_provider_info(): + return { + "package-name": "apache-airflow-providers-opensearch", + "name": "OpenSearch", + "description": "`OpenSearch `__\n", + "state": "ready", + "source-date-epoch": 1734536033, + "versions": [ + "1.6.0", + "1.5.0", + "1.4.0", + "1.3.0", + "1.2.1", + "1.2.0", + "1.1.2", + "1.1.1", + "1.1.0", + "1.0.0", + ], + "integrations": [ + { + "integration-name": "OpenSearch", + "external-doc-url": "https://opensearch.org/", + "how-to-guide": ["/docs/apache-airflow-providers-opensearch/operators/opensearch.rst"], + "logo": "/docs/integration-logos/opensearch.png", + "tags": ["software"], + } + ], + "hooks": [ + { + "integration-name": "OpenSearch", + "python-modules": ["airflow.providers.opensearch.hooks.opensearch"], + } + ], + "operators": [ + { + "integration-name": "OpenSearch", + "python-modules": ["airflow.providers.opensearch.operators.opensearch"], + } + ], + "connection-types": [ + { + "hook-class-name": "airflow.providers.opensearch.hooks.opensearch.OpenSearchHook", + "connection-type": "opensearch", + } + ], + "logging": ["airflow.providers.opensearch.log.os_task_handler.OpensearchTaskHandler"], + "config": { + "opensearch": { + "description": None, + "options": { + "host": { + "description": "Opensearch host\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "", + }, + "port": { + "description": "The port number of Opensearch host\n", + "version_added": "1.5.0", + "type": "integer", + "example": None, + "default": "", + }, + "username": { + "description": "The username for connecting to Opensearch\n", + "version_added": "1.5.0", + "type": "string", + "sensitive": True, + "example": None, + "default": "", + }, + "password": { + "description": "The password for connecting to Opensearch\n", + "version_added": "1.5.0", + "type": "string", + "sensitive": True, + "example": None, + "default": "", + }, + "log_id_template": { + "description": "Format of the log_id, which is used to query for a given tasks logs\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "is_template": True, + "default": "{dag_id}-{task_id}-{run_id}-{map_index}-{try_number}", + }, + "end_of_log_mark": { + "description": "Used to mark the end of a log stream for a task\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "end_of_log", + }, + "write_stdout": { + "description": "Write the task logs to the stdout of the worker, rather than the default files\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "json_format": { + "description": "Instead of the default log formatter, write the log lines as JSON\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "json_fields": { + "description": "Log fields to also attach to the json output, if enabled\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "asctime, filename, lineno, levelname, message", + }, + "host_field": { + "description": "The field where host name is stored (normally either `host` or `host.name`)\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "host", + }, + "offset_field": { + "description": "The field where offset is stored (normally either `offset` or `log.offset`)\n", + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "offset", + }, + "index_patterns": { + "description": "Comma separated list of index patterns to use when searching for logs (default: `_all`).\nThe index_patterns_callable takes precedence over this.\n", + "version_added": "1.5.0", + "type": "string", + "example": "something-*", + "default": "_all", + }, + "index_patterns_callable": { + "description": "A string representing the full path to the Python callable path which accept TI object and\nreturn comma separated list of index patterns. This will takes precedence over index_patterns.\n", + "version_added": "1.5.0", + "type": "string", + "example": "module.callable", + "default": "", + }, + }, + }, + "opensearch_configs": { + "description": None, + "options": { + "http_compress": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "use_ssl": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "verify_certs": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "ssl_assert_hostname": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "ssl_show_warn": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "False", + }, + "ca_certs": { + "description": None, + "version_added": "1.5.0", + "type": "string", + "example": None, + "default": "", + }, + }, + }, + }, + "dependencies": ["apache-airflow>=2.9.0", "opensearch-py>=2.2.0"], + } diff --git a/providers/src/airflow/providers/opensearch/hooks/__init__.py b/providers/opensearch/src/airflow/providers/opensearch/hooks/__init__.py similarity index 100% rename from providers/src/airflow/providers/opensearch/hooks/__init__.py rename to providers/opensearch/src/airflow/providers/opensearch/hooks/__init__.py diff --git a/providers/src/airflow/providers/opensearch/hooks/opensearch.py b/providers/opensearch/src/airflow/providers/opensearch/hooks/opensearch.py similarity index 100% rename from providers/src/airflow/providers/opensearch/hooks/opensearch.py rename to providers/opensearch/src/airflow/providers/opensearch/hooks/opensearch.py diff --git a/providers/src/airflow/providers/opensearch/log/__init__.py b/providers/opensearch/src/airflow/providers/opensearch/log/__init__.py similarity index 100% rename from providers/src/airflow/providers/opensearch/log/__init__.py rename to providers/opensearch/src/airflow/providers/opensearch/log/__init__.py diff --git a/providers/src/airflow/providers/opensearch/log/os_json_formatter.py b/providers/opensearch/src/airflow/providers/opensearch/log/os_json_formatter.py similarity index 100% rename from providers/src/airflow/providers/opensearch/log/os_json_formatter.py rename to providers/opensearch/src/airflow/providers/opensearch/log/os_json_formatter.py diff --git a/providers/src/airflow/providers/opensearch/log/os_response.py b/providers/opensearch/src/airflow/providers/opensearch/log/os_response.py similarity index 100% rename from providers/src/airflow/providers/opensearch/log/os_response.py rename to providers/opensearch/src/airflow/providers/opensearch/log/os_response.py diff --git a/providers/src/airflow/providers/opensearch/log/os_task_handler.py b/providers/opensearch/src/airflow/providers/opensearch/log/os_task_handler.py similarity index 100% rename from providers/src/airflow/providers/opensearch/log/os_task_handler.py rename to providers/opensearch/src/airflow/providers/opensearch/log/os_task_handler.py diff --git a/providers/src/airflow/providers/opensearch/operators/__init__.py b/providers/opensearch/src/airflow/providers/opensearch/operators/__init__.py similarity index 100% rename from providers/src/airflow/providers/opensearch/operators/__init__.py rename to providers/opensearch/src/airflow/providers/opensearch/operators/__init__.py diff --git a/providers/src/airflow/providers/opensearch/operators/opensearch.py b/providers/opensearch/src/airflow/providers/opensearch/operators/opensearch.py similarity index 100% rename from providers/src/airflow/providers/opensearch/operators/opensearch.py rename to providers/opensearch/src/airflow/providers/opensearch/operators/opensearch.py diff --git a/providers/src/airflow/providers/opensearch/version_compat.py b/providers/opensearch/src/airflow/providers/opensearch/version_compat.py similarity index 100% rename from providers/src/airflow/providers/opensearch/version_compat.py rename to providers/opensearch/src/airflow/providers/opensearch/version_compat.py diff --git a/providers/opensearch/tests/conftest.py b/providers/opensearch/tests/conftest.py new file mode 100644 index 0000000000000..068fe6bbf5ae9 --- /dev/null +++ b/providers/opensearch/tests/conftest.py @@ -0,0 +1,32 @@ +# 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. +from __future__ import annotations + +import pathlib + +import pytest + +pytest_plugins = "tests_common.pytest_plugin" + + +@pytest.hookimpl(tryfirst=True) +def pytest_configure(config: pytest.Config) -> None: + deprecations_ignore_path = pathlib.Path(__file__).parent.joinpath("deprecations_ignore.yml") + dep_path = [deprecations_ignore_path] if deprecations_ignore_path.exists() else [] + config.inicfg["airflow_deprecations_ignore"] = ( + config.inicfg.get("airflow_deprecations_ignore", []) + dep_path # type: ignore[assignment,operator] + ) diff --git a/providers/opensearch/tests/provider_tests/__init__.py b/providers/opensearch/tests/provider_tests/__init__.py new file mode 100644 index 0000000000000..e8fd22856438c --- /dev/null +++ b/providers/opensearch/tests/provider_tests/__init__.py @@ -0,0 +1,17 @@ +# 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. +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/providers/tests/opensearch/__init__.py b/providers/opensearch/tests/provider_tests/opensearch/__init__.py similarity index 100% rename from providers/tests/opensearch/__init__.py rename to providers/opensearch/tests/provider_tests/opensearch/__init__.py diff --git a/providers/tests/opensearch/conftest.py b/providers/opensearch/tests/provider_tests/opensearch/conftest.py similarity index 100% rename from providers/tests/opensearch/conftest.py rename to providers/opensearch/tests/provider_tests/opensearch/conftest.py diff --git a/providers/tests/opensearch/hooks/__init__.py b/providers/opensearch/tests/provider_tests/opensearch/hooks/__init__.py similarity index 100% rename from providers/tests/opensearch/hooks/__init__.py rename to providers/opensearch/tests/provider_tests/opensearch/hooks/__init__.py diff --git a/providers/tests/opensearch/hooks/test_opensearch.py b/providers/opensearch/tests/provider_tests/opensearch/hooks/test_opensearch.py similarity index 99% rename from providers/tests/opensearch/hooks/test_opensearch.py rename to providers/opensearch/tests/provider_tests/opensearch/hooks/test_opensearch.py index 53364a50072f7..79ca0a34a363d 100644 --- a/providers/tests/opensearch/hooks/test_opensearch.py +++ b/providers/opensearch/tests/provider_tests/opensearch/hooks/test_opensearch.py @@ -20,14 +20,13 @@ from unittest import mock import pytest - -opensearchpy = pytest.importorskip("opensearchpy") from opensearchpy import Urllib3HttpConnection from airflow.exceptions import AirflowException from airflow.models import Connection from airflow.providers.opensearch.hooks.opensearch import OpenSearchHook +opensearchpy = pytest.importorskip("opensearchpy") pytestmark = pytest.mark.db_test diff --git a/providers/tests/opensearch/log/__init__.py b/providers/opensearch/tests/provider_tests/opensearch/log/__init__.py similarity index 100% rename from providers/tests/opensearch/log/__init__.py rename to providers/opensearch/tests/provider_tests/opensearch/log/__init__.py diff --git a/providers/tests/opensearch/log/test_os_json_formatter.py b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_json_formatter.py similarity index 99% rename from providers/tests/opensearch/log/test_os_json_formatter.py rename to providers/opensearch/tests/provider_tests/opensearch/log/test_os_json_formatter.py index bae039e199bdb..e85f02b56beea 100644 --- a/providers/tests/opensearch/log/test_os_json_formatter.py +++ b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_json_formatter.py @@ -24,12 +24,11 @@ import pendulum import pytest -opensearchpy = pytest.importorskip("opensearchpy") - from airflow.providers.opensearch.log.os_task_handler import ( OpensearchJSONFormatter, ) +opensearchpy = pytest.importorskip("opensearchpy") pytestmark = pytest.mark.db_test diff --git a/providers/tests/opensearch/log/test_os_response.py b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_response.py similarity index 99% rename from providers/tests/opensearch/log/test_os_response.py rename to providers/opensearch/tests/provider_tests/opensearch/log/test_os_response.py index 5b2f36d3c21b9..31af433754ff4 100644 --- a/providers/tests/opensearch/log/test_os_response.py +++ b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_response.py @@ -22,8 +22,6 @@ import pytest -opensearchpy = pytest.importorskip("opensearchpy") - from airflow.providers.opensearch.log.os_response import ( AttributeList, Hit, @@ -32,6 +30,7 @@ ) from airflow.providers.opensearch.log.os_task_handler import OpensearchTaskHandler +opensearchpy = pytest.importorskip("opensearchpy") pytestmark = pytest.mark.db_test diff --git a/providers/tests/opensearch/log/test_os_task_handler.py b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_task_handler.py similarity index 99% rename from providers/tests/opensearch/log/test_os_task_handler.py rename to providers/opensearch/tests/provider_tests/opensearch/log/test_os_task_handler.py index 4d7c9eb53a790..cbe9f086950cc 100644 --- a/providers/tests/opensearch/log/test_os_task_handler.py +++ b/providers/opensearch/tests/provider_tests/opensearch/log/test_os_task_handler.py @@ -29,8 +29,6 @@ import pendulum import pytest - -opensearchpy = pytest.importorskip("opensearchpy") from opensearchpy.exceptions import NotFoundError from airflow.configuration import conf @@ -43,12 +41,13 @@ from airflow.utils import timezone from airflow.utils.state import DagRunState, TaskInstanceState from airflow.utils.timezone import datetime +from provider_tests.opensearch.conftest import MockClient -from providers.tests.opensearch.conftest import MockClient from tests_common.test_utils.config import conf_vars from tests_common.test_utils.db import clear_db_dags, clear_db_runs from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS +opensearchpy = pytest.importorskip("opensearchpy") pytestmark = pytest.mark.db_test AIRFLOW_SOURCES_ROOT_DIR = Path(__file__).parents[4].resolve() diff --git a/providers/tests/opensearch/operators/__init__.py b/providers/opensearch/tests/provider_tests/opensearch/operators/__init__.py similarity index 100% rename from providers/tests/opensearch/operators/__init__.py rename to providers/opensearch/tests/provider_tests/opensearch/operators/__init__.py diff --git a/providers/tests/opensearch/operators/test_opensearch.py b/providers/opensearch/tests/provider_tests/opensearch/operators/test_opensearch.py similarity index 99% rename from providers/tests/opensearch/operators/test_opensearch.py rename to providers/opensearch/tests/provider_tests/opensearch/operators/test_opensearch.py index 63ad7eafe48de..fd42a91a71dd6 100644 --- a/providers/tests/opensearch/operators/test_opensearch.py +++ b/providers/opensearch/tests/provider_tests/opensearch/operators/test_opensearch.py @@ -17,9 +17,6 @@ from __future__ import annotations import pytest - -opensearchpy = pytest.importorskip("opensearchpy") - from opensearchpy import Document, Keyword, Text from airflow.models import DAG @@ -30,6 +27,7 @@ ) from airflow.utils.timezone import datetime +opensearchpy = pytest.importorskip("opensearchpy") pytestmark = pytest.mark.db_test diff --git a/providers/tests/system/opensearch/__init__.py b/providers/opensearch/tests/system/opensearch/__init__.py similarity index 100% rename from providers/tests/system/opensearch/__init__.py rename to providers/opensearch/tests/system/opensearch/__init__.py diff --git a/providers/tests/system/opensearch/example_opensearch.py b/providers/opensearch/tests/system/opensearch/example_opensearch.py similarity index 100% rename from providers/tests/system/opensearch/example_opensearch.py rename to providers/opensearch/tests/system/opensearch/example_opensearch.py diff --git a/pyproject.toml b/pyproject.toml index 8f3418fc5a409..cb60d5c69917a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -656,6 +656,7 @@ dev = [ "apache-airflow-providers-neo4j", "apache-airflow-providers-openai", "apache-airflow-providers-openfaas", + "apache-airflow-providers-opensearch", "apache-airflow-providers-opsgenie", "apache-airflow-providers-papermill", "apache-airflow-providers-pgvector", @@ -727,6 +728,7 @@ apache-airflow-providers-openai = { workspace = true } apache-airflow-providers-jenkins = { workspace = true } apache-airflow-providers-mysql = { workspace = true } apache-airflow-providers-odbc = { workspace = true } +apache-airflow-providers-opensearch = { workspace = true } apache-airflow-providers-pagerduty = { workspace = true } apache-airflow-providers-openfaas = { workspace = true } apache-airflow-providers-opsgenie = { workspace = true } @@ -795,6 +797,7 @@ members = [ "providers/openai", "providers/openfaas", "providers/openlineage", + "providers/opensearch", "providers/opsgenie", "providers/pagerduty", "providers/papermill", diff --git a/scripts/ci/docker-compose/remove-sources.yml b/scripts/ci/docker-compose/remove-sources.yml index 3e72fa832f890..5cb6240768dd9 100644 --- a/scripts/ci/docker-compose/remove-sources.yml +++ b/scripts/ci/docker-compose/remove-sources.yml @@ -70,6 +70,7 @@ services: - ../../../empty:/opt/airflow/providers/openai/src - ../../../empty:/opt/airflow/providers/openfaas/src - ../../../empty:/opt/airflow/providers/openlineage/src + - ../../../empty:/opt/airflow/providers/opensearch/src - ../../../empty:/opt/airflow/providers/opsgenie/src - ../../../empty:/opt/airflow/providers/pagerduty/src - ../../../empty:/opt/airflow/providers/papermill/src diff --git a/scripts/ci/docker-compose/tests-sources.yml b/scripts/ci/docker-compose/tests-sources.yml index 4864c3f5b51e8..ad6193c8f9f05 100644 --- a/scripts/ci/docker-compose/tests-sources.yml +++ b/scripts/ci/docker-compose/tests-sources.yml @@ -77,6 +77,7 @@ services: - ../../../providers/openai/tests:/opt/airflow/providers/openai/tests - ../../../providers/openfaas/tests:/opt/airflow/providers/openfaas/tests - ../../../providers/openlineage/tests:/opt/airflow/providers/openlineage/tests + - ../../../providers/opensearch/tests:/opt/airflow/providers/opensearch/tests - ../../../providers/opsgenie/tests:/opt/airflow/providers/opsgenie/tests - ../../../providers/pagerduty/tests:/opt/airflow/providers/pagerduty/tests - ../../../providers/papermill/tests:/opt/airflow/providers/papermill/tests