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: Skip functions/layers pointing to S3 location in providers #2756

Merged
merged 12 commits into from
Mar 30, 2021
Merged

fix: Skip functions/layers pointing to S3 location in providers #2756

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b088af7
refactor: Extract logics into _locate_layer_from_ref()
aahung Mar 24, 2021
4a5b6da
providers no longer extract functions/layers with s3 uri
aahung Mar 24, 2021
67c61f9
Fix grammar issues
aahung Mar 24, 2021
f13ad32
Unit tests and integ tests
aahung Mar 24, 2021
21183f0
Replace unsupported with more concrete words
aahung Mar 25, 2021
5313334
Refine types
aahung Mar 25, 2021
10182dc
Merge branch 'develop' into skip-s3-in-providers
aahung Mar 25, 2021
980d895
Merge branch 'develop' into skip-s3-in-providers
aahung Mar 26, 2021
880f057
Merge branch 'develop' into skip-s3-in-providers
aahung Mar 30, 2021
4a0cd6c
Update integ tests
aahung Mar 30, 2021
1ce6126
Add doc about skipping invoking
aahung Mar 30, 2021
8632564
_is_code_uri_s3 -> _is_s3_location
aahung Mar 30, 2021
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
Prev Previous commit
Next Next commit
Fix grammar issues
  • Loading branch information
@aahung
aahung committed Mar 24, 2021
commit 67c61f9458f6f639faaa3b25df080447c4194e2c
6 changes: 3 additions & 3 deletions samcli/lib/providers/sam_function_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def _build_function_configuration(
metadata = resource_properties.get("Metadata", None)
if metadata and "DockerContext" in metadata and not use_raw_codeuri:
LOG.debug(
"--base-dir is presented not, adjusting uri %s relative to %s",
"--base-dir is not presented, adjusting uri %s relative to %s",
metadata["DockerContext"],
stack.location,
)
Expand All @@ -307,7 +307,7 @@ def _build_function_configuration(
)

if codeuri and not use_raw_codeuri:
LOG.debug("--base-dir is presented not, adjusting uri %s relative to %s", codeuri, stack.location)
LOG.debug("--base-dir is not presented, adjusting uri %s relative to %s", codeuri, stack.location)
codeuri = SamLocalStackProvider.normalize_resource_path(stack.location, codeuri)

return Function(
Expand Down Expand Up @@ -429,7 +429,7 @@ def _locate_layer_from_ref(
codeuri = SamBaseProvider._extract_codeuri(layer_properties, code_property_key)

if codeuri and not use_raw_codeuri:
LOG.debug("--base-dir is presented not, adjusting uri %s relative to %s", codeuri, stack.location)
LOG.debug("--base-dir is not presented, adjusting uri %s relative to %s", codeuri, stack.location)
codeuri = SamLocalStackProvider.normalize_resource_path(stack.location, codeuri)

return LayerVersion(
Expand Down