Skip to content

Commit

Permalink
Merge pull request #244 from GispoCoding/Fix_lambda_libraries
Browse files Browse the repository at this point in the history
Fix lambdas.
  • Loading branch information
posikifi committed Jul 13, 2023
2 parents 7863f1e + 948852e commit 34f533f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
7 changes: 3 additions & 4 deletions backend/lambda_functions/lipas_loader/lipas_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def __init__(
**kwargs,
) -> None:
super().__init__(connection_string, **kwargs)
self.feature_counter: int = 0 # Sorry but this had to be done :-)

self.type_codes_all_year = (
type_codes_all_year
Expand Down Expand Up @@ -87,6 +86,7 @@ def get_features(self, only_page: Optional[int] = None) -> List[int]: # type: i
r = requests.get(url, params=params, headers=self.HEADERS)
r.raise_for_status()
data = r.json()

if data:
ids += [item[ID_FIELD] for item in data if "location" in item]
current_page += 1
Expand Down Expand Up @@ -160,8 +160,7 @@ def get_feature(self, sports_place_id: int): # type: ignore[override]
"deleted": False,
"tarmo_category": tarmo_category,
}
# LOGGER.info(f"Features loaded: {len(flattened)}")
self.feature_counter = self.feature_counter + 1
# LOGGER.info(f"Features loaded: {len(flattened)}")
return flattened

def save_feature(self, sport_place: Dict[str, Any], session: Session) -> bool:
Expand Down Expand Up @@ -219,7 +218,7 @@ def _sport_places_url_and_params(self, page: int) -> Tuple[str, Dict[str, Any]]:
return main_url, params

def _sport_place_url(self, sports_place_id: int):
# print(self.api_url)
print(self.api_url)
return "/".join((self.api_url, LipasLoader.SPORT_PLACES, str(sports_place_id)))


Expand Down
12 changes: 6 additions & 6 deletions infra/lambda.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "aws_lambda_function" "db_manager" {
function_name = "${var.prefix}-db_manager"
filename = "../backend/lambda_functions/db_manager.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "db_manager.handler"
memory_size = 128
timeout = 120
Expand Down Expand Up @@ -31,7 +31,7 @@ resource "aws_lambda_function" "db_manager" {
resource "aws_lambda_function" "lipas_loader" {
function_name = "${var.prefix}-lipas_loader"
filename = "../backend/lambda_functions/lipas_loader.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "app.lipas_loader.handler"
memory_size = 128
timeout = 900
Expand Down Expand Up @@ -64,7 +64,7 @@ resource "aws_lambda_permission" "cloudwatch_call_lipas_loader" {
resource "aws_lambda_function" "osm_loader" {
function_name = "${var.prefix}-osm_loader"
filename = "../backend/lambda_functions/osm_loader.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "app.osm_loader.handler"
memory_size = 256
timeout = 900
Expand Down Expand Up @@ -97,7 +97,7 @@ resource "aws_lambda_permission" "cloudwatch_call_osm_loader" {
resource "aws_lambda_function" "wfs_loader" {
function_name = "${var.prefix}-wfs_loader"
filename = "../backend/lambda_functions/wfs_loader.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "app.wfs_loader.handler"
memory_size = 128
timeout = 900
Expand Down Expand Up @@ -130,7 +130,7 @@ resource "aws_lambda_permission" "cloudwatch_call_wfs_loader" {
resource "aws_lambda_function" "arcgis_loader" {
function_name = "${var.prefix}-arcgis_loader"
filename = "../backend/lambda_functions/arcgis_loader.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "app.arcgis_loader.handler"
memory_size = 256
timeout = 900
Expand Down Expand Up @@ -164,7 +164,7 @@ resource "aws_lambda_function" "notifier" {
count = var.SLACK_HOOK_URL == "" ? 0 : 1
function_name = "${var.prefix}-notifier"
filename = "../backend/lambda_functions/notifier.zip"
runtime = "python3.8"
runtime = "python3.10"
handler = "app.notifier.handler"
memory_size = 128
timeout = 900
Expand Down

0 comments on commit 34f533f

Please sign in to comment.