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.

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: --base-dir is disregarded in sam build #2718

Merged
merged 6 commits into from
Mar 16, 2021
Merged

Conversation

aahung
Copy link
Contributor

@aahung aahung commented Mar 16, 2021

Which issue(s) does this change fix?

#2717

Why is this change necessary?

How does it address the issue?

What side effects does this change have?

Checklist

  • Add input/output type hints to new functions/methods
  • Write design document (Do I need to write a design document?)
  • Write unit tests
  • Write/update functional tests
  • Write/update integration tests
  • make pr passes
  • make update-reproducible-reqs if dependencies were changed
  • Write documentation

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@aahung aahung marked this pull request as draft March 16, 2021 01:29
@@ -80,8 +84,8 @@ def __enter__(self) -> "BuildContext":
"\n".join([f"- {full_path}" for full_path in remote_stack_full_paths]),
)

self._function_provider = SamFunctionProvider(self.stacks)
self._layer_provider = SamLayerProvider(self.stacks)
self._function_provider = SamFunctionProvider(self.stacks, self._use_raw_codeuri)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a note here too and reference the issue number.

@aahung aahung force-pushed the fix-build-dir branch 2 times, most recently from a62c74d to 3ac6120 Compare March 16, 2021 02:11
@aahung aahung marked this pull request as ready for review March 16, 2021 02:13
ChildStackX:
Type: AWS::Serverless::Application
Properties:
Location: ../ChildStackX/template.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will combine with provided base dir right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no this will not

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However if a base dir is not provided, we just resolve with location of the template. (which is not this particular test, but asking to help grok through the test)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, whether base dir is provided or not, this Location is resolved according to its parent template path.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on offline conversation: applies only to codeuri and contenturi.

@aahung aahung changed the title fix: build_dir is disregarded in sam build fix: --build-dir is disregarded in sam build Mar 16, 2021
@aahung aahung changed the title fix: --build-dir is disregarded in sam build fix: --base-dir is disregarded in sam build Mar 16, 2021
@aahung aahung merged commit f459d50 into aws:develop Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants