Skip to content

Commit

Permalink
Remove hook-class-names from provider.yaml (#24702)
Browse files Browse the repository at this point in the history
* Remove `hook-class-names` from provider.yaml
now that providers>=2.2 there is no need for the hook-class-names any longer.
refrence to #17775

* fix `airflow/provider.yaml.schema.json` and `provider_info.schema.json`

* undo changes in `provider_info.schema.json`
  • Loading branch information
eladkal committed Jun 28, 2022
1 parent 1429091 commit 510a6ba
Show file tree
Hide file tree
Showing 57 changed files with 0 additions and 187 deletions.
11 changes: 0 additions & 11 deletions airflow/provider.yaml.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,6 @@
]
}
},
"hook-class-names": {
"type": "array",
"description": "Hook class names that provide connection types to core (deprecated by connection-types)",
"items": {
"type": "string"
},
"deprecated": {
"description": "The hook-class-names property has been deprecated in favour of connection-types which is more performant version allowing to only import individual Hooks rather than all hooks at once",
"deprecatedVersion": "2.2"
}
},
"connection-types": {
"type": "array",
"description": "Array of connection types mapped to hook class names",
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/airbyte/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ sensors:
python-modules:
- airflow.providers.airbyte.sensors.airbyte

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.airbyte.hooks.airbyte.AirbyteHook

connection-types:
- hook-class-name: airflow.providers.airbyte.hooks.airbyte.AirbyteHook
connection-type: airbyte
2 changes: 0 additions & 2 deletions airflow/providers/alibaba/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ hooks:
python-modules:
- airflow.providers.alibaba.cloud.hooks.oss

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.alibaba.cloud.hooks.oss.OSSHook

connection-types:
- hook-class-name: airflow.providers.alibaba.cloud.hooks.oss.OSSHook
Expand Down
5 changes: 0 additions & 5 deletions airflow/providers/amazon/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,6 @@ transfers:
how-to-guide: /docs/apache-airflow-providers-amazon/operators/transfer/sql_to_s3.rst
python-module: airflow.providers.amazon.aws.transfers.sql_to_s3

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.amazon.aws.hooks.s3.S3Hook
- airflow.providers.amazon.aws.hooks.base_aws.AwsBaseHook
- airflow.providers.amazon.aws.hooks.emr.EmrHook
- airflow.providers.amazon.aws.hooks.redshift_sql.RedshiftSQLHook

extra-links:
- airflow.providers.amazon.aws.links.batch.BatchJobDefinitionLink
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/apache/cassandra/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ hooks:
python-modules:
- airflow.providers.apache.cassandra.hooks.cassandra

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.cassandra.hooks.cassandra.CassandraHook

connection-types:
- hook-class-name: airflow.providers.apache.cassandra.hooks.cassandra.CassandraHook
connection-type: cassandra
3 changes: 0 additions & 3 deletions airflow/providers/apache/drill/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ hooks:
python-modules:
- airflow.providers.apache.drill.hooks.drill

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.drill.hooks.drill.DrillHook

connection-types:
- hook-class-name: airflow.providers.apache.drill.hooks.drill.DrillHook
connection-type: drill
2 changes: 0 additions & 2 deletions airflow/providers/apache/druid/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ hooks:
python-modules:
- airflow.providers.apache.druid.hooks.druid

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.druid.hooks.druid.DruidDbApiHook

connection-types:
- hook-class-name: airflow.providers.apache.druid.hooks.druid.DruidDbApiHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/apache/hdfs/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ hooks:
python-modules:
- airflow.providers.apache.hdfs.hooks.webhdfs

hook-class-names:
# deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.hdfs.hooks.hdfs.HDFSHook

connection-types:
- hook-class-name: airflow.providers.apache.hdfs.hooks.hdfs.HDFSHook
Expand Down
6 changes: 0 additions & 6 deletions airflow/providers/apache/hive/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ transfers:
target-integration-name: Apache Hive
python-module: airflow.providers.apache.hive.transfers.mssql_to_hive

hook-class-names:
# deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.hive.hooks.hive.HiveCliHook
- airflow.providers.apache.hive.hooks.hive.HiveServer2Hook
- airflow.providers.apache.hive.hooks.hive.HiveMetastoreHook

connection-types:
- hook-class-name: airflow.providers.apache.hive.hooks.hive.HiveCliHook
connection-type: hive_cli
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/apache/livy/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ hooks:
python-modules:
- airflow.providers.apache.livy.hooks.livy

hook-class-names:
# deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.livy.hooks.livy.LivyHook

connection-types:
- hook-class-name: airflow.providers.apache.livy.hooks.livy.LivyHook
Expand Down
4 changes: 0 additions & 4 deletions airflow/providers/apache/pig/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ hooks:
python-modules:
- airflow.providers.apache.pig.hooks.pig

hook-class-names:
# deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.pig.hooks.pig.PigCliHook

connection-types:
- connection-type: pig_cli
hook-class-name: airflow.providers.apache.pig.hooks.pig.PigCliHook
4 changes: 0 additions & 4 deletions airflow/providers/apache/spark/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ hooks:
- airflow.providers.apache.spark.hooks.spark_sql
- airflow.providers.apache.spark.hooks.spark_submit

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.spark.hooks.spark_jdbc.SparkJDBCHook
- airflow.providers.apache.spark.hooks.spark_sql.SparkSqlHook
- airflow.providers.apache.spark.hooks.spark_submit.SparkSubmitHook

connection-types:
- hook-class-name: airflow.providers.apache.spark.hooks.spark_jdbc.SparkJDBCHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/apache/sqoop/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ hooks:
python-modules:
- airflow.providers.apache.sqoop.hooks.sqoop

hook-class-names:
# deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.apache.sqoop.hooks.sqoop.SqoopHook

connection-types:
- hook-class-name: airflow.providers.apache.sqoop.hooks.sqoop.SqoopHook
Expand Down
2 changes: 0 additions & 2 deletions airflow/providers/asana/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ hooks:
python-modules:
- airflow.providers.asana.hooks.asana

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.asana.hooks.asana.AsanaHook

connection-types:
- hook-class-name: airflow.providers.asana.hooks.asana.AsanaHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/cloudant/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ hooks:
python-modules:
- airflow.providers.cloudant.hooks.cloudant

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.cloudant.hooks.cloudant.CloudantHook

connection-types:
- hook-class-name: airflow.providers.cloudant.hooks.cloudant.CloudantHook
connection-type: cloudant
2 changes: 0 additions & 2 deletions airflow/providers/cncf/kubernetes/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ hooks:
python-modules:
- airflow.providers.cncf.kubernetes.hooks.kubernetes

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.cncf.kubernetes.hooks.kubernetes.KubernetesHook

connection-types:
- hook-class-name: airflow.providers.cncf.kubernetes.hooks.kubernetes.KubernetesHook
Expand Down
2 changes: 0 additions & 2 deletions airflow/providers/databricks/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ hooks:
python-modules:
- airflow.providers.databricks.hooks.databricks_sql

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.databricks.hooks.databricks.DatabricksHook

connection-types:
- hook-class-name: airflow.providers.databricks.hooks.databricks.DatabricksHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/dbt/cloud/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ hooks:
python-modules:
- airflow.providers.dbt.cloud.hooks.dbt

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.dbt.cloud.hooks.dbt.DbtCloudHook

connection-types:
- hook-class-name: airflow.providers.dbt.cloud.hooks.dbt.DbtCloudHook
connection-type: dbt_cloud
Expand Down
2 changes: 0 additions & 2 deletions airflow/providers/dingding/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ hooks:
python-modules:
- airflow.providers.dingding.hooks.dingding

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.dingding.hooks.dingding.DingdingHook

connection-types:
- hook-class-name: airflow.providers.dingding.hooks.dingding.DingdingHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/discord/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ hooks:
python-modules:
- airflow.providers.discord.hooks.discord_webhook

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.discord.hooks.discord_webhook.DiscordWebhookHook

connection-types:
- hook-class-name: airflow.providers.discord.hooks.discord_webhook.DiscordWebhookHook
connection-type: discord
3 changes: 0 additions & 3 deletions airflow/providers/docker/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ hooks:
python-modules:
- airflow.providers.docker.hooks.docker

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.docker.hooks.docker.DockerHook

connection-types:
- hook-class-name: airflow.providers.docker.hooks.docker.DockerHook
connection-type: docker
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/elasticsearch/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ hooks:
python-modules:
- airflow.providers.elasticsearch.hooks.elasticsearch

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.elasticsearch.hooks.elasticsearch.ElasticsearchHook

connection-types:
- hook-class-name: airflow.providers.elasticsearch.hooks.elasticsearch.ElasticsearchHook
connection-type: elasticsearch
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/exasol/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ hooks:
python-modules:
- airflow.providers.exasol.hooks.exasol

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.exasol.hooks.exasol.ExasolHook

connection-types:
- hook-class-name: airflow.providers.exasol.hooks.exasol.ExasolHook
connection-type: exasol
3 changes: 0 additions & 3 deletions airflow/providers/facebook/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ hooks:
python-modules:
- airflow.providers.facebook.ads.hooks.ads

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.facebook.ads.hooks.ads.FacebookAdsReportingHook

connection-types:
- hook-class-name: airflow.providers.facebook.ads.hooks.ads.FacebookAdsReportingHook
connection-type: facebook_social
3 changes: 0 additions & 3 deletions airflow/providers/ftp/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ hooks:
python-modules:
- airflow.providers.ftp.hooks.ftp

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.ftp.hooks.ftp.FTPHook

connection-types:
- hook-class-name: airflow.providers.ftp.hooks.ftp.FTPHook
connection-type: ftp
8 changes: 0 additions & 8 deletions airflow/providers/google/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -853,14 +853,6 @@ transfers:
python-module: airflow.providers.google.cloud.transfers.mssql_to_gcs
how-to-guide: /docs/apache-airflow-providers-google/operators/transfer/mssql_to_gcs.rst

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.google.common.hooks.base_google.GoogleBaseHook
- airflow.providers.google.cloud.hooks.dataprep.GoogleDataprepHook
- airflow.providers.google.cloud.hooks.cloud_sql.CloudSQLHook
- airflow.providers.google.cloud.hooks.cloud_sql.CloudSQLDatabaseHook
- airflow.providers.google.cloud.hooks.compute_ssh.ComputeEngineSSHHook
- airflow.providers.google.cloud.hooks.bigquery.BigQueryHook
- airflow.providers.google.leveldb.hooks.leveldb.LevelDBHook

connection-types:
- hook-class-name: airflow.providers.google.common.hooks.base_google.GoogleBaseHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/grpc/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ hooks:
python-modules:
- airflow.providers.grpc.hooks.grpc

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.grpc.hooks.grpc.GrpcHook

connection-types:
- hook-class-name: airflow.providers.grpc.hooks.grpc.GrpcHook
connection-type: grpc
3 changes: 0 additions & 3 deletions airflow/providers/hashicorp/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ hooks:
python-modules:
- airflow.providers.hashicorp.hooks.vault

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.hashicorp.hooks.vault.VaultHook

connection-types:
- hook-class-name: airflow.providers.hashicorp.hooks.vault.VaultHook
connection-type: vault
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/http/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ hooks:
python-modules:
- airflow.providers.http.hooks.http

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.http.hooks.http.HttpHook

connection-types:
- hook-class-name: airflow.providers.http.hooks.http.HttpHook
connection-type: http
3 changes: 0 additions & 3 deletions airflow/providers/imap/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ hooks:
python-modules:
- airflow.providers.imap.hooks.imap

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.imap.hooks.imap.ImapHook

connection-types:
- hook-class-name: airflow.providers.imap.hooks.imap.ImapHook
connection-type: imap
2 changes: 0 additions & 2 deletions airflow/providers/jdbc/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ hooks:
python-modules:
- airflow.providers.jdbc.hooks.jdbc

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.jdbc.hooks.jdbc.JdbcHook

connection-types:
- hook-class-name: airflow.providers.jdbc.hooks.jdbc.JdbcHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/jenkins/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ sensors:
python-modules:
- 'airflow.providers.jenkins.sensors.jenkins'

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.jenkins.hooks.jenkins.JenkinsHook

connection-types:
- hook-class-name: airflow.providers.jenkins.hooks.jenkins.JenkinsHook
connection-type: jenkins
3 changes: 0 additions & 3 deletions airflow/providers/jira/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ hooks:
python-modules:
- airflow.providers.jira.hooks.jira

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.jira.hooks.jira.JiraHook

connection-types:
- hook-class-name: airflow.providers.jira.hooks.jira.JiraHook
connection-type: jira
13 changes: 0 additions & 13 deletions airflow/providers/microsoft/azure/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,6 @@ transfers:
how-to-guide: /docs/apache-airflow-providers-microsoft-azure/operators/sftp_to_wasb.rst
python-module: airflow.providers.microsoft.azure.transfers.sftp_to_wasb

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.microsoft.azure.hooks.base_azure.AzureBaseHook
- airflow.providers.microsoft.azure.hooks.adx.AzureDataExplorerHook
- airflow.providers.microsoft.azure.hooks.batch.AzureBatchHook
- airflow.providers.microsoft.azure.hooks.cosmos.AzureCosmosDBHook
- airflow.providers.microsoft.azure.hooks.data_lake.AzureDataLakeHook
- airflow.providers.microsoft.azure.hooks.fileshare.AzureFileShareHook
- airflow.providers.microsoft.azure.hooks.container_volume.AzureContainerVolumeHook
- airflow.providers.microsoft.azure.hooks.container_instance.AzureContainerInstanceHook
- airflow.providers.microsoft.azure.hooks.wasb.WasbHook
- airflow.providers.microsoft.azure.hooks.data_factory.AzureDataFactoryHook
- airflow.providers.microsoft.azure.hooks.container_registry.AzureContainerRegistryHook
- airflow.providers.microsoft.azure.hooks.asb.BaseAzureServiceBusHook

connection-types:
- hook-class-name: airflow.providers.microsoft.azure.hooks.base_azure.AzureBaseHook
Expand Down
3 changes: 0 additions & 3 deletions airflow/providers/microsoft/mssql/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ hooks:
python-modules:
- airflow.providers.microsoft.mssql.hooks.mssql

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.microsoft.mssql.hooks.mssql.MsSqlHook

connection-types:
- hook-class-name: airflow.providers.microsoft.mssql.hooks.mssql.MsSqlHook
connection-type: mssql
3 changes: 0 additions & 3 deletions airflow/providers/mongo/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ hooks:
python-modules:
- airflow.providers.mongo.hooks.mongo

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.mongo.hooks.mongo.MongoHook

connection-types:
- hook-class-name: airflow.providers.mongo.hooks.mongo.MongoHook
connection-type: mongo
2 changes: 0 additions & 2 deletions airflow/providers/mysql/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ transfers:
target-integration-name: MySQL
python-module: airflow.providers.mysql.transfers.trino_to_mysql

hook-class-names: # deprecated - to be removed after providers add dependency on Airflow 2.2.0+
- airflow.providers.mysql.hooks.mysql.MySqlHook

connection-types:
- hook-class-name: airflow.providers.mysql.hooks.mysql.MySqlHook
Expand Down

0 comments on commit 510a6ba

Please sign in to comment.