Skip to content

Fetch port from connection #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tatiana merged 3 commits into from
Sep 6, 2023
Merged

Fetch port from connection #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b994268
Fetch port from connection
jlaneve Sep 5, 2023
0387ad6
Update user_pass.py
jlaneve Sep 5, 2023
7337dda
Add test to cover fix
tatiana Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cosmos/profiles/postgres/user_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class PostgresUserPasswordProfileMapping(BaseProfileMapping):
def profile(self) -> dict[str, Any | None]:
"Gets profile. The password is stored in an environment variable."
profile = {
**self.mapped_params,
"port": 5432,
**self.mapped_params,
**self.profile_args,
# password should always get set as env var
"password": self.get_env_var_format("password"),
Expand All @@ -55,6 +55,6 @@ def mock_profile(self) -> dict[str, Any | None]:
parent_mock = super().mock_profile

return {
**parent_mock,
"port": 5432,
**parent_mock,
}
4 changes: 2 additions & 2 deletions cosmos/profiles/redshift/user_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class RedshiftUserPasswordProfileMapping(BaseProfileMapping):
def profile(self) -> dict[str, Any | None]:
"Gets profile."
profile = {
**self.mapped_params,
"port": 5439,
**self.mapped_params,
**self.profile_args,
# password should always get set as env var
"password": self.get_env_var_format("password"),
Expand All @@ -56,6 +56,6 @@ def mock_profile(self) -> dict[str, Any | None]:
parent_mock = super().mock_profile

return {
**parent_mock,
"port": 5439,
**parent_mock,
}
24 changes: 24 additions & 0 deletions tests/profiles/postgres/test_pg_user_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@ def mock_postgres_conn(): # type: ignore
yield conn


@pytest.fixture()
def mock_postgres_conn_custom_port(): # type: ignore
"""
Sets the connection as an environment variable.
"""
conn = Connection(
conn_id="my_postgres_connection",
conn_type="postgres",
host="my_host",
login="my_user",
password="my_password",
port=7472,
schema="my_database",
)

with patch("airflow.hooks.base.BaseHook.get_connection", return_value=conn):
yield conn


def test_connection_claiming() -> None:
"""
Tests that the postgres profile mapping claims the correct connection type.
Expand Down Expand Up @@ -89,6 +108,11 @@ def test_profile_mapping_selected(
assert isinstance(profile_mapping, PostgresUserPasswordProfileMapping)


def test_profile_mapping_keeps_custom_port(mock_postgres_conn_custom_port: Connection) -> None:
profile = PostgresUserPasswordProfileMapping(mock_postgres_conn_custom_port.conn_id, {"schema": "my_schema"})
assert profile.profile["port"] == 7472


def test_profile_args(
mock_postgres_conn: Connection,
) -> None:
Expand Down