airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From criccom...@apache.org
Subject incubator-airflow git commit: Revert "[AIRFLOW-1635] Allow creating GCP connection without requiring a JSON file"
Date Wed, 27 Sep 2017 17:35:47 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/v1-8-test 648286fbd -> afdcacc4b


Revert "[AIRFLOW-1635] Allow creating GCP connection without requiring a JSON file"

This reverts commit 648286fbd26be49a2bdc069fd192efa082168507.


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

Branch: refs/heads/v1-8-test
Commit: afdcacc4b95c530e0a759f7fd14eda751020c90a
Parents: 648286f
Author: Chris Riccomini <criccomini@apache.org>
Authored: Wed Sep 27 10:35:41 2017 -0700
Committer: Chris Riccomini <criccomini@apache.org>
Committed: Wed Sep 27 10:35:41 2017 -0700

----------------------------------------------------------------------
 airflow/contrib/hooks/gcp_api_base_hook.py | 26 ++-----------------------
 airflow/www/views.py                       |  2 --
 2 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/afdcacc4/airflow/contrib/hooks/gcp_api_base_hook.py
----------------------------------------------------------------------
diff --git a/airflow/contrib/hooks/gcp_api_base_hook.py b/airflow/contrib/hooks/gcp_api_base_hook.py
index dbe076f..2260e7b 100644
--- a/airflow/contrib/hooks/gcp_api_base_hook.py
+++ b/airflow/contrib/hooks/gcp_api_base_hook.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 #
 
-import json
 import logging
 
 import httplib2
@@ -64,23 +63,20 @@ class GoogleCloudBaseHook(BaseHook):
         service hook connection.
         """
         key_path = self._get_field('key_path', False)
-        keyfile_dict = self._get_field('keyfile_dict', False)
         scope = self._get_field('scope', False)
 
         kwargs = {}
         if self.delegate_to:
             kwargs['sub'] = self.delegate_to
 
-        if not key_path and not keyfile_dict:
+        if not key_path:
             logging.info('Getting connection using `gcloud auth` user, since no key file
'
                          'is defined for hook.')
             credentials = GoogleCredentials.get_application_default()
-        elif key_path:
+        else:
             if not scope:
                 raise AirflowException('Scope should be defined when using a key file.')
             scopes = [s.strip() for s in scope.split(',')]
-
-            # Get credentials from a JSON file.
             if key_path.endswith('.json'):
                 logging.info('Getting connection using a JSON key file.')
                 credentials = ServiceAccountCredentials\
@@ -90,24 +86,6 @@ class GoogleCloudBaseHook(BaseHook):
                                        'use a JSON key file.')
             else:
                 raise AirflowException('Unrecognised extension for key file.')
-        else:
-            if not scope:
-                raise AirflowException('Scope should be defined when using key JSON.')
-            scopes = [s.strip() for s in scope.split(',')]
-
-            # Get credentials from JSON data provided in the UI.
-            try:
-                keyfile_dict = json.loads(keyfile_dict)
-
-                # Depending on how the JSON was formatted, it may contain
-                # escaped newlines. Convert those to actual newlines.
-                keyfile_dict['private_key'] = keyfile_dict['private_key'].replace(
-                    '\\n', '\n')
-
-                credentials = ServiceAccountCredentials\
-                    .from_json_keyfile_dict(keyfile_dict, scopes)
-            except json.decoder.JSONDecodeError:
-                raise AirflowException('Invalid key JSON.')
 
         http = httplib2.Http()
         return credentials.authorize(http)

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/afdcacc4/airflow/www/views.py
----------------------------------------------------------------------
diff --git a/airflow/www/views.py b/airflow/www/views.py
index f55e310..a873e63 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -2469,7 +2469,6 @@ class ConnectionModelView(wwwutils.SuperUserMixin, AirflowModelView):
         'extra__jdbc__drv_clsname',
         'extra__google_cloud_platform__project',
         'extra__google_cloud_platform__key_path',
-        'extra__google_cloud_platform__keyfile_dict',
         'extra__google_cloud_platform__scope',
     )
     verbose_name = "Connection"
@@ -2491,7 +2490,6 @@ class ConnectionModelView(wwwutils.SuperUserMixin, AirflowModelView):
         'extra__jdbc__drv_clsname': StringField('Driver Class'),
         'extra__google_cloud_platform__project': StringField('Project Id'),
         'extra__google_cloud_platform__key_path': StringField('Keyfile Path'),
-        'extra__google_cloud_platform__keyfile_dict': PasswordField('Keyfile JSON'),
         'extra__google_cloud_platform__scope': StringField('Scopes (comma seperated)'),
 
     }


Mime
View raw message