Skip to content

Cdk support package and deploy fix #2996

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

Merged
wchengru merged 2 commits into from
Jun 29, 2021
Merged

Cdk support package and deploy fix #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce7827a
Fix --resolve-s3 --s3-bucket validation under guided flow
hawflau Jun 29, 2021
bd9b3f5
Fix package resource assets
hawflau Jun 29, 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
5 changes: 3 additions & 2 deletions samcli/commands/package/validations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ def wrapped(*args, **kwargs):
# NOTE(sriram-mv): Both params and default_map need to be checked, as the option can be either be
# passed in directly or through configuration file.
# If passed in through configuration file, default_map is loaded with those values.
guided = ctx.params.get("guided", False) or ctx.params.get("g", False)
resolve_s3_provided = ctx.params.get("resolve_s3", False) or ctx.default_map.get("resolve_s3", False)
s3_bucket_provided = ctx.params.get("s3_bucket", False) or ctx.default_map.get("s3_bucket", False)
either_required = stack.has_assets_of_package_type(ZIP) if stack is not None else False
if s3_bucket_provided and resolve_s3_provided:
if not guided and s3_bucket_provided and resolve_s3_provided:
raise PackageResolveS3AndS3SetError()
if either_required and not s3_bucket_provided and not resolve_s3_provided:
if not guided and either_required and not s3_bucket_provided and not resolve_s3_provided:
raise PackageResolveS3AndS3NotSetError()

return func(*args, **kwargs)
Expand Down
6 changes: 6 additions & 0 deletions samcli/lib/iac/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,12 @@ def find_function_resources_of_package_type(self, package_type: str) -> List[Res
_function_resources.append(resource)
return _function_resources

def get_overrideable_parameters(self):
"""
Return a dict of parameters that are override-able, i.e. not added by iac
"""
return {key: val for key, val in self.get("Parameters", {}).items() if not val.added_by_iac}

def as_dict(self):
"""
return the stack as a dict for JSON serialization
Expand Down
4 changes: 3 additions & 1 deletion samcli/lib/package/packageable_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def export(self, resource, parent_dir):
if not resource.is_packageable():
return

# we can safely assume resource.assets contains at lease one asset
if not resource.assets:
return
# resource.assets contains at lease one asset
asset = resource.assets[0]

if not asset.source_path and not self.PACKAGE_NULL_PROPERTY:
Expand Down