Commit ⋅ apache/airflow

Showing 2 of 3 files from the diff.

94.26% 100.00% -0.05%

airflow/cli/commands/connection_command.py changed.

91.91% 66.66% ø

airflow/models/connection.py changed.

Other files ignored by Codecov

tests/cli/commands/test_connection_command.py has changed.

@@ -28,7 +28,7 @@

Loading

from airflow.exceptions import AirflowNotFoundException
from airflow.hooks.base import BaseHook
from airflow.models import Connection
from airflow.secrets.local_filesystem import _create_connection, load_connections_dict
from airflow.secrets.local_filesystem import load_connections_dict
from airflow.utils import cli as cli_utils, yaml
from airflow.utils.cli import suppress_logs_and_warning
from airflow.utils.session import create_session

@@ -238,7 +238,7 @@

Loading


@cli_utils.action_logging
def connections_import(args):
    """Imports connections from a given file"""
    """Imports connections from a file"""
    if os.path.exists(args.file):
        _import_helper(args.file)
    else:

@@ -246,31 +246,14 @@

Loading



def _import_helper(file_path):
    """Helps import connections from a file"""
    """Load connections from a file and save them to the DB. On collision, skip."""
    connections_dict = load_connections_dict(file_path)
    with create_session() as session:
        for conn_id, conn_values in connections_dict.items():
        for conn_id, conn in connections_dict.items():
            if session.query(Connection).filter(Connection.conn_id == conn_id).first():
                print(f'Could not import connection {conn_id}: connection already exists.')
                continue

            allowed_fields = [
                'extra',
                'description',
                'conn_id',
                'login',
                'conn_type',
                'host',
                'password',
                'schema',
                'port',
                'uri',
                'extra_dejson',
            ]
            filtered_connection_values = {
                key: value for key, value in conn_values.items() if key in allowed_fields
            }
            connection = _create_connection(conn_id, filtered_connection_values)
            session.add(connection)
            session.add(conn)
            session.commit()
            print(f'Imported connection {conn_id}')

@@ -19,7 +19,7 @@

Loading

import json
import warnings
from json import JSONDecodeError
from typing import Dict, Optional
from typing import Dict, Optional, Union
from urllib.parse import parse_qsl, quote, unquote, urlencode, urlparse

from sqlalchemy import Boolean, Column, Integer, String, Text

@@ -117,12 +117,14 @@

Loading

        password: Optional[str] = None,
        schema: Optional[str] = None,
        port: Optional[int] = None,
        extra: Optional[str] = None,
        extra: Optional[Union[str, dict]] = None,
        uri: Optional[str] = None,
    ):
        super().__init__()
        self.conn_id = conn_id
        self.description = description
        if extra and not isinstance(extra, str):
            extra = json.dumps(extra)
        if uri and (  # pylint: disable=too-many-boolean-expressions
            conn_type or host or login or password or schema or port or extra
        ):

Files		•	•	•	Coverage
airflow	62,816	55,559	0	7,257	88.44%
Project Totals (1243 files)	62,816	55,559	0	7,257	88.44%

View CI Build Download

No yaml found.

Create your codecov.yml to customize your Codecov experience

Read the docs

Interact now

The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.

SVG

Learn more about the coverage sunburst graph

246	246
247	247
248	248		def _import_helper(file_path):
249		-	"""Helps import connections from a file"""
	249	+	"""Load connections from a file and save them to the DB. On collision, skip."""
250	250		connections_dict = load_connections_dict(file_path)
251	251		with create_session() as session:
252		-	for conn_id, conn_values in connections_dict.items():
	252	+	for conn_id, conn in connections_dict.items():
253	253		if session.query(Connection).filter(Connection.conn_id == conn_id).first():
254	254		print(f'Could not import connection {conn_id}: connection already exists.')
255	255		continue
256	256
257		-	allowed_fields = [
258		-	'extra',
259		-	'description',
260		-	'conn_id',
261		-	'login',
262		-	'conn_type',
263		-	'host',
264		-	'password',
265		-	'schema',
266		-	'port',
267		-	'uri',
268		-	'extra_dejson',
269		-	]
270		-	filtered_connection_values = {
271		-	key: value for key, value in conn_values.items() if key in allowed_fields
272		-	}
273		-	connection = _create_connection(conn_id, filtered_connection_values)
274		-	session.add(connection)
	257	+	session.add(conn)
275	258		session.commit()
276	259		print(f'Imported connection {conn_id}')

117	117		password: Optional[str] = None,
118	118		schema: Optional[str] = None,
119	119		port: Optional[int] = None,
120		-	extra: Optional[str] = None,
	120	+	extra: Optional[Union[str, dict]] = None,
121	121		uri: Optional[str] = None,
122	122		):
123	123		super().__init__()
124	124		self.conn_id = conn_id
125	125		self.description = description
	126	+	if extra and not isinstance(extra, str):
	127	+	extra = json.dumps(extra)
126	128		if uri and ( # pylint: disable=too-many-boolean-expressions
127	129		conn_type or host or login or password or schema or port or extra
128	130		):

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

28	28		from airflow.exceptions import AirflowNotFoundException
29	29		from airflow.hooks.base import BaseHook
30	30		from airflow.models import Connection
31		-	from airflow.secrets.local_filesystem import _create_connection, load_connections_dict
	31	+	from airflow.secrets.local_filesystem import load_connections_dict
32	32		from airflow.utils import cli as cli_utils, yaml
33	33		from airflow.utils.cli import suppress_logs_and_warning
34	34		from airflow.utils.session import create_session

238	238
239	239		@cli_utils.action_logging
240	240		def connections_import(args):
241		-	"""Imports connections from a given file"""
	241	+	"""Imports connections from a file"""
242	242		if os.path.exists(args.file):
243	243		_import_helper(args.file)
244	244		else:

19	19		import json
20	20		import warnings
21	21		from json import JSONDecodeError
22		-	from typing import Dict, Optional
	22	+	from typing import Dict, Optional, Union
23	23		from urllib.parse import parse_qsl, quote, unquote, urlencode, urlparse
24	24
25	25		from sqlalchemy import Boolean, Column, Integer, String, Text

Updating our web app

No yaml found.