[GitHub] stale[bot] closed pull request #3783: [AIRFLOW-2937] Support HTTPS in Http connection form environment variables

[GitBox <gi...@apache.org>]

stale[bot] closed pull request #3783: [AIRFLOW-2937] Support HTTPS in Http connection form environment variables
URL: https://github.com/apache/incubator-airflow/pull/3783
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/airflow/hooks/http_hook.py b/airflow/hooks/http_hook.py
index c449fe0c15..359e588a96 100644
--- a/airflow/hooks/http_hook.py
+++ b/airflow/hooks/http_hook.py
@@ -62,7 +62,7 @@ def get_conn(self, headers=None):
             self.base_url = conn.host
         else:
             # schema defaults to HTTP
-            schema = conn.schema if conn.schema else "http"
+            schema = conn.conn_type if conn.conn_type else conn.schema if conn.schema else "http"
             self.base_url = schema + "://" + conn.host
 
         if conn.port:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services