Skip to content
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

fix: aws pricing api #160

Merged
merged 11 commits into from
Oct 28, 2023
Merged

fix: aws pricing api #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b01249
docs: updated documents
arshiamoghimi Oct 24, 2023
0efb3b8
docs: updated documents
arshiamoghimi Oct 24, 2023
7bc547a
bump: version 0.2.0 → 0.3.0
arshiamoghimi Oct 24, 2023
f342def
Merge branch 'master' of github.com:ubc-cirrus-lab/ubc-SPOT
arshiamoghimi Oct 26, 2023
16c24e4
fix: aws pricing api fix
arshiamoghimi Oct 27, 2023
6d26f01
fix: aws pricing api region fix
arshiamoghimi Oct 27, 2023
c1c3550
fix: aws pricing api region fix
arshiamoghimi Oct 27, 2023
90e393c
fix: aws cost calculator test fix
arshiamoghimi Oct 28, 2023
bcafdf2
fix: aws cost calculator test fix
arshiamoghimi Oct 28, 2023
2cc0a39
fix: aws cost calculator test fix
arshiamoghimi Oct 28, 2023
3df8fcb
fix: aws cost calculator test fix
arshiamoghimi Oct 28, 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
2 changes: 1 addition & 1 deletion src/exploration/aws/aws_cost_calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def _get_pricing_units(self) -> dict:
pricing information and parse it accordingly to determine the pricing units.
"""
try:
response = self.aws_session.client("pricing").get_products(
response = boto3.client("pricing", region_name="us-east-1").get_products(
ServiceCode="AWSLambda",
Filters=[
{
Expand Down
83 changes: 42 additions & 41 deletions tests/exploration/aws/test_aws_cost_calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from unittest import mock
from unittest.mock import patch

import pytest

Expand All @@ -20,49 +21,49 @@ def calculator_with_mock_aws_session() -> AWSCostCalculator:

class TestGetPricingUnits:
def test_get_pricing_units(self, calculator_with_mock_aws_session):
# Mock the response for get_products() from pricing client
calculator_with_mock_aws_session.aws_session.client(
"pricing"
).get_products.return_value = {
"PriceList": [
'{"product": {"attributes": {"group": "AWS-Lambda-Duration-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000150000"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Duration"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000166667"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Requests-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000002000"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Requests"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000002000"}}}}}}}',
]
}

# Mock the response for get_function_configuration() from lambda client
calculator_with_mock_aws_session.aws_session.client(
"lambda"
).get_function_configuration.return_value = {"Architectures": ["x86"]}

# Call the _get_pricing_units() method
pricing_units = calculator_with_mock_aws_session._get_pricing_units()

# Perform the assertion
assert pricing_units == {"compute": 0.0000166667, "request": 0.0000002}
boto3_client_mock = mock.Mock()
with patch('boto3.client', return_value=boto3_client_mock):
# Mock the response for get_products() from pricing client
boto3_client_mock.get_products.return_value = {
"PriceList": [
'{"product": {"attributes": {"group": "AWS-Lambda-Duration-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000150000"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Duration"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000166667"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Requests-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000002000"}}}}}}}',
'{"product": {"attributes": {"group": "AWS-Lambda-Requests"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": "0.0000002000"}}}}}}}',
]
}

# Mock the response for get_function_configuration() from lambda client
calculator_with_mock_aws_session.aws_session.client(
"lambda"
).get_function_configuration.return_value = {"Architectures": ["x86"]}

# Call the _get_pricing_units() method
pricing_units = calculator_with_mock_aws_session._get_pricing_units()

# Perform the assertion
assert pricing_units == {"compute": 0.0000166667, "request": 0.0000002}

def test_get_pricing_units_index_error(self, calculator_with_mock_aws_session):
# Mock the response for get_products() from pricing client
calculator_with_mock_aws_session.aws_session.client(
"pricing"
).get_products.return_value = {
"PriceList": [
'{"product": {"attributes": {"group": "AWS-Lambda-Duration-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": }}}}}}',
]
}

# Mock the response for get_function_configuration() from lambda client
calculator_with_mock_aws_session.aws_session.client(
"lambda"
).get_function_configuration.return_value = {"Architectures": ["x86"]}

with pytest.raises(CostCalculationError) as e:
# Response parsing fails.
calculator_with_mock_aws_session._get_pricing_units()

assert e.type == CostCalculationError
boto3_client_mock = mock.Mock()
with patch('boto3.client', return_value=boto3_client_mock):
# Mock the response for get_products() from pricing client
boto3_client_mock.get_products.return_value = {
"PriceList": [
'{"product": {"attributes": {"group": "AWS-Lambda-Duration-ARM"}, "terms": {"OnDemand": {"offerTermCode": "JRTCKXETXF", "priceDimensions": {"JRTCKXETXF.6YS6EN2CT7": {"pricePerUnit": {"USD": }}}}}}',
]
}

# Mock the response for get_function_configuration() from lambda client
calculator_with_mock_aws_session.aws_session.client(
"lambda"
).get_function_configuration.return_value = {"Architectures": ["x86"]}

with pytest.raises(CostCalculationError) as e:
# Response parsing fails.
calculator_with_mock_aws_session._get_pricing_units()

assert e.type == CostCalculationError


class TestCalculator:
Expand Down