Skip to content

Commit b7ab8e4

Browse files
committed
[aws] Fix merge error
1 parent 8e1f93a commit b7ab8e4

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

sebs/aws/aws.py

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,18 @@ def _map_architecture(self, architecture: str) -> str:
190190
return "x86_64"
191191
return architecture
192192

193-
def _map_language_runtime(self, language: str, runtime: str):
193+
def cloud_runtime(self, language: Language, language_version: str):
194194

195195
# AWS uses different naming scheme for Node.js versions
196196
# For example, it's 12.x instead of 12.
197-
if language == "nodejs":
198-
return f"{runtime}.x"
199-
return runtime
197+
if language == Language.NODEJS:
198+
return f"{language_version}.x"
199+
elif language == Language.CPP:
200+
return "provided.al2"
201+
elif language in [Language.PYTHON]:
202+
return ("{}{}".format(language, language_version),)
203+
else:
204+
raise NotImplementedError()
200205

201206
def create_function(
202207
self,
@@ -248,14 +253,6 @@ def create_function(
248253
"Architectures": [self._map_architecture(architecture)],
249254
"Code": {},
250255
}
251-
ret = self.client.create_function(
252-
FunctionName=func_name,
253-
Runtime=self.cloud_runtime(language, language_runtime),
254-
Handler="handler.handler",
255-
Role=self.config.resources.lambda_role(self.session),
256-
MemorySize=memory,
257-
Timeout=timeout,
258-
)
259256

260257
if container_deployment:
261258
create_function_params["PackageType"] = "Image"
@@ -282,7 +279,7 @@ def create_function(
282279
}
283280

284281
create_function_params["Runtime"] = "{}{}".format(
285-
language, self._map_language_runtime(language, language_runtime)
282+
language, self.cloud_runtime(language, language_runtime)
286283
)
287284
create_function_params["Handler"] = "handler.handler"
288285

@@ -672,11 +669,3 @@ def wait_function_updated(self, func: LambdaFunction):
672669

673670
def disable_rich_output(self):
674671
self.ecr_client.disable_rich_output = True
675-
676-
def cloud_runtime(self, language: Language, language_version: str):
677-
if language in [Language.NODEJS, Language.PYTHON]:
678-
return ("{}{}".format(language, language_version),)
679-
elif language == Language.CPP:
680-
return "provided.al2"
681-
else:
682-
raise NotImplementedError()

0 commit comments

Comments
 (0)