airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-1887] Renamed endpoint url variable
Date Thu, 07 Dec 2017 13:54:41 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master 4b4e504ee -> 9ad6d1202


[AIRFLOW-1887] Renamed endpoint url variable

s3_endpoint_url is a legacy name from when AwsHook
was only used to
connect to S3. The endpoint_url is more general
and what is effectively
used elsewhere for this piece of information.

Closes #2848 from villasv/AIRFLOW-1887


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/9ad6d120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/9ad6d120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/9ad6d120

Branch: refs/heads/master
Commit: 9ad6d1202d0466d67b920ce8b316fd0e7b68ed88
Parents: 4b4e504
Author: Victor Villas <villasv@outlook.com>
Authored: Thu Dec 7 13:54:34 2017 +0000
Committer: Bolke de Bruin <bolke@xs4all.nl>
Committed: Thu Dec 7 13:54:34 2017 +0000

----------------------------------------------------------------------
 airflow/contrib/hooks/aws_hook.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/9ad6d120/airflow/contrib/hooks/aws_hook.py
----------------------------------------------------------------------
diff --git a/airflow/contrib/hooks/aws_hook.py b/airflow/contrib/hooks/aws_hook.py
index 8573db3..fac0ab7 100644
--- a/airflow/contrib/hooks/aws_hook.py
+++ b/airflow/contrib/hooks/aws_hook.py
@@ -33,9 +33,9 @@ def _parse_s3_config(config_file_name, config_format='boto', profile=None):
     :param profile: profile name in AWS type config file
     :type profile: str
     """
-    Config = configparser.ConfigParser()
-    if Config.read(config_file_name):  # pragma: no cover
-        sections = Config.sections()
+    config = configparser.ConfigParser()
+    if config.read(config_file_name):  # pragma: no cover
+        sections = config.sections()
     else:
         raise AirflowException("Couldn't read {0}".format(config_file_name))
     # Setting option names depending on file format
@@ -64,12 +64,12 @@ def _parse_s3_config(config_file_name, config_format='boto', profile=None):
         raise AirflowException("This config file format is not recognized")
     else:
         try:
-            access_key = Config.get(cred_section, key_id_option)
-            secret_key = Config.get(cred_section, secret_key_option)
+            access_key = config.get(cred_section, key_id_option)
+            secret_key = config.get(cred_section, secret_key_option)
         except:
             logging.warning("Option Error in parsing s3 config file")
             raise
-        return (access_key, secret_key)
+        return access_key, secret_key
 
 
 class AwsHook(BaseHook):
@@ -84,7 +84,7 @@ class AwsHook(BaseHook):
     def _get_credentials(self, region_name):
         aws_access_key_id = None
         aws_secret_access_key = None
-        s3_endpoint_url = None
+        endpoint_url = None
 
         if self.aws_conn_id:
             try:
@@ -105,14 +105,14 @@ class AwsHook(BaseHook):
                 if region_name is None:
                     region_name = connection_object.extra_dejson.get('region_name')
 
-                s3_endpoint_url = connection_object.extra_dejson.get('host')
+                endpoint_url = connection_object.extra_dejson.get('host')
 
             except AirflowException:
                 # No connection found: fallback on boto3 credential strategy
                 # http://boto3.readthedocs.io/en/latest/guide/configuration.html
                 pass
 
-        return aws_access_key_id, aws_secret_access_key, region_name, s3_endpoint_url
+        return aws_access_key_id, aws_secret_access_key, region_name, endpoint_url
 
     def get_client_type(self, client_type, region_name=None):
         aws_access_key_id, aws_secret_access_key, region_name, endpoint_url = \


Mime
View raw message