Skip to content

Commit

Permalink
Chore: remove unused code (#1660)
Browse files Browse the repository at this point in the history
* Chore: remove unused code

* Remove code from tests
  • Loading branch information
ifoukarakis authored Nov 6, 2024
1 parent e161fc0 commit f746519
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 79 deletions.
12 changes: 0 additions & 12 deletions extract/s3_extract/push_proxy_job.py

This file was deleted.

27 changes: 0 additions & 27 deletions extract/s3_extract/stage_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,6 @@ def diagnostics_import(import_date):
)


def push_proxy_import(log_type, import_date):
"""
Function to load data from a previously set up Snowflake stage
for push proxy data from AWS ELB
@log_type: Str with valid values of US, TEST, or DE
@import_date: Date with format "%Y/%m/%d"
"""
loc = PUSH_PROXY_LOCATIONS[log_type]
aws_account_id = os.getenv('AWS_ACCOUNT_ID')
az = loc['az']

extract_from_stage(
loc['table'],
loc['stage'],
'push_proxy',
get_path(aws_account_id, az),
get_push_proxy_pattern(import_date),
os.environ.copy(),
)


def get_push_proxy_pattern(import_date):
date = import_date.replace('/', '\\/')
return f".*{date}\\/.*"


def get_diagnostics_pattern(loc, import_date):
return f".*{loc}.{import_date}.*"

Expand Down
40 changes: 0 additions & 40 deletions tests/extract/s3_extract/test_stage_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
extract_from_stage,
get_diagnostics_pattern,
get_path,
get_push_proxy_pattern,
licenses_import,
push_proxy_import,
releases_import,
)

Expand Down Expand Up @@ -86,44 +84,6 @@ def test_get_path(aws_account_id, az, expected):
assert get_path(aws_account_id, az) == expected


@pytest.mark.parametrize(
"import_date,expected",
[
("2022-10-01", ".*2022-10-01\\/.*"),
("2022/10/01", ".*2022\\/10\\/01\\/.*"),
],
)
def test_get_push_proxy_pattern(import_date, expected):
assert get_push_proxy_pattern(import_date) == expected


@pytest.mark.parametrize(
"location,table,stage,zone",
[
("US", "logs", "push_proxy_stage", "us-east-1"),
("DE", "de_logs", "push_proxy_de_stage", "eu-central-1"),
("TEST", "test_logs", "push_proxy_test_stage", "us-east-1"),
],
)
def test_push_proxy_import(mocker, mock_environment, location, table, stage, zone):
# GIVEN: environment configured for handling push proxy import
# GIVEN: calls to extract from stage are captured
mock_extract = mocker.patch("extract.s3_extract.stage_import.extract_from_stage")

# WHEN: push proxy job is triggered for a specific location and date
push_proxy_import(location, "2022/10/01")

# THEN: expect extract to have been called once
mock_extract.assert_called_once_with(
table,
stage,
"push_proxy",
f"AWSLogs/test-aws-account-id/elasticloadbalancing/{zone}",
".*2022\\/10\\/01\\/.*",
mock_environment,
)


def test_licenses_import(mocker, mock_environment):
# GIVEN: environment configured for handling two diagnostic imports -- see mock_environment
# GIVEN: calls to extract from stage are captured
Expand Down

0 comments on commit f746519

Please sign in to comment.