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

Merge branch 2.0.0-dev into master #64

Merged
merged 2 commits into from
Jun 23, 2020
Merged

Merge branch 2.0.0-dev into master #64

merged 2 commits into from
Jun 23, 2020

Conversation

di
Copy link
Member

@di di commented Jun 23, 2020

Fixes #63.

* Ignore IDE files.

* Use the test file directory as a basis instead of cwd. Allows tests to be run from anywhere and enables IDE debugger

* Add support for Cloud Events. Rough draft.

I will squash a bunch of these interim commits before submitting the PR.

DO NOT SUBMIT

* Return the functions return value. Test Cloud Events SDK 0.3. Add some error handling.

Please see all the TODO questions before I finish off this PR.

DO NOT SUBMIT

* Minor cleanup. Split test code.

* Clean up unused paths, split large test files into two, ensure functions DO NOT return a custom value. General tidy-up. Support binary functions.

* Fix lint errors with black.

* Fix lint errors with black.

* Update setup.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update tests/test_cloudevent_functions.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update tests/test_cloudevent_functions.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update src/functions_framework/__init__.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update tests/test_functions/cloudevents/main.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Clearer imports.

* don't factor out routes.

* Add a TODO for testing the different combinations of events and signature types.

* Add cloudevent as a signature type in the argument list.

* Clarify import.

* Clarify import.

* A sample that shows how to use a CloudEvent.

* In the case of a sig type / event type mismatch throw a 400

* Update the docs to use CloudEvent sig type instead of Event sig type. Note that I wrote the "Event" type is deprecated. Not sure if this is accurate.

* Lint fixes.

* Tests for checking correct event type corresponds to correct function sig. Fixed abort import error.

* Sort imports.

* Remove old example.

* Readme to explain how to run the sample locally.

* Rename cloud_event to cloudevent

* For legacy docs, add a notice to the new docs.

* There is no 1.1 event type.

* use the term cloudevent rather than event everywhere where we are talking about a CloudEvent to disambiguate these signature types.

* Update examples/cloudevents/README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloudevents/README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloudevents/README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloudevents/main.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update tests/test_view_functions.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Add legacy event back to docs.

* Add legacy event back to docs.

* Use abort from flask for consistency and fix return in event test.

* update docs and error messages to better mirror the other runtimes.

* Minor fixes to docs w.r.t. naming.

* Update src/functions_framework/__init__.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Fix enum per reviewer suggestion.

* Rename text event => strucuture event.

Co-authored-by: Joel Gerard <joelgerard@google.com>
Co-authored-by: Dustin Ingram <di@users.noreply.github.com>
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to determine that you authored the commits in this PR. Maybe you used a different email address in the git commits than was used to sign the CLA? If someone else authored these commits, then please add them to this pull request and have them confirm that they're okay with them being contributed to Google. If there are co-authors, make sure they're formatted properly.

In order to pass this check, please resolve this problem and then comment@googlebot I fixed it... If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@di di added cla: yes and removed cla: no labels Jun 23, 2020
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to determine that you authored the commits in this PR. Maybe you used a different email address in the git commits than was used to sign the CLA? If someone else authored these commits, then please add them to this pull request and have them confirm that they're okay with them being contributed to Google. If there are co-authors, make sure they're formatted properly.

In order to pass this check, please resolve this problem and then comment@googlebot I fixed it... If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@di di added cla: yes and removed cla: no labels Jun 23, 2020
@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@di di merged commit 8f3fe35 into master Jun 23, 2020
@di di deleted the 2.0.0-dev branch June 23, 2020 17:38
di added a commit that referenced this pull request Jul 6, 2020
di added a commit that referenced this pull request Jul 6, 2020
* Revert "Version 2.0.0 (#67)"

This reverts commit f2471b4.

* Revert "Add Cloud Events support for #55 (#56) (#64)"

This reverts commit 8f3fe35.

* Version 1.5.0
di added a commit that referenced this pull request Aug 19, 2020
* Revert "Version 2.0.0 (#67)"

This reverts commit f2471b4.

* Revert "Add Cloud Events support for #55 (#56) (#64)"

This reverts commit 8f3fe35.

* Version 1.5.0
di added a commit that referenced this pull request Aug 19, 2020
* Version 1.5.0 (#69)

* Revert "Version 2.0.0 (#67)"

This reverts commit f2471b4.

* Revert "Add Cloud Events support for #55 (#56) (#64)"

This reverts commit 8f3fe35.

* Version 1.5.0

* Add legacy GCF Python 3.7 behavior (#77)

* Add legacy GCF Python 3.7 behavior

* Add test

* Modify tests

* Version 1.6.0 (#81)

Co-authored-by: Arjun Srinivasan <69502+asriniva@users.noreply.github.com>
di added a commit that referenced this pull request Oct 22, 2020
* Version 1.5.0 (#69)

* Revert "Version 2.0.0 (#67)"

This reverts commit f2471b4.

* Revert "Add Cloud Events support for #55 (#56) (#64)"

This reverts commit 8f3fe35.

* Version 1.5.0

* Improve documentation around Dockerfiles (#70)

* Add a link to an example Dockerfile in the top README.md

* Update the inline Dockerfile to match file

* Remove explicit gunicorn installation

* make readme links absolute, useful

Useful for when this readme appears on both github and pypi

* added cloudevents 1.0.0

Signed-off-by: Curtis Mason <cumason@google.com>

* reverted auto format

Signed-off-by: Curtis Mason <cumason@google.com>

* lint fixes

Signed-off-by: Curtis Mason <cumason@google.com>

* changed cloudevents to <=1.0 in setup

Signed-off-by: Curtis Mason <cumason@google.com>

* made cloudevents==1.0

Signed-off-by: Curtis Mason <cumason@google.com>

* added cloudevent_view tests

Signed-off-by: Curtis Mason <cumason@google.com>

* test lint fixes

Signed-off-by: Curtis Mason <cumason@google.com>

* implemented try_catch in cloudevent view wrapper

Signed-off-by: Curtis Mason <cumason@google.com>

* import fix

Signed-off-by: Curtis Mason <cumason@google.com>

* adjusted cloud_run_cloudevents readme

Signed-off-by: Curtis Mason <cumason@google.com>

* added elif for cloudevent

Signed-off-by: Curtis Mason <cumason@google.com>

* adjusted README

Signed-off-by: Curtis Mason <cumason@google.com>

* upgraded to cloudevents 1.0.1

Signed-off-by: Curtis Mason <cumason@google.com>

* import ordering lint fix

Signed-off-by: Curtis Mason <cumason@google.com>

* removed event from readme cloudevents section

Signed-off-by: Curtis Mason <cumason@google.com>

* resolved various nits and reverted event code

Signed-off-by: Curtis Mason <cumason@google.com>

* dockerfile env variables

Signed-off-by: Curtis Mason <cumason@google.com>

* Update examples/cloud_run_cloudevents/main.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>
Signed-off-by: Curtis Mason <cumason@google.com>

* cleaned up test_cloudevent_functions

Signed-off-by: Curtis Mason <cumason@google.com>

* Update examples/cloud_run_cloudevents/Dockerfile

Co-authored-by: Adam Ross <grayside@gmail.com>
Signed-off-by: Curtis Mason <cumason@google.com>

* tunneled cloud_exceptions in flask abort

Signed-off-by: Curtis Mason <cumason@google.com>

* Added additional documentation in sample code

Signed-off-by: Curtis Mason <cumason@google.com>

* added time to tests

Signed-off-by: Curtis Mason <cumason@google.com>

* Update README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloud_run_cloudevents/send_cloudevent.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloud_run_cloudevents/README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update examples/cloud_run_cloudevents/README.md

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update src/functions_framework/__init__.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* Update src/functions_framework/__init__.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* cloudevents 1.1.0 update

Signed-off-by: Curtis Mason <cumason@google.com>

* simplified exceptions debug

Signed-off-by: Curtis Mason <cumason@google.com>

* simplified cloudevent view test

Signed-off-by: Curtis Mason <cumason@google.com>

* Update src/functions_framework/__init__.py

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>

* shebang cloudevent executable

Signed-off-by: Curtis Mason <cumason@google.com>

* cloudevents version bump

Signed-off-by: Curtis Mason <cumason@google.com>

* Removed InvalidStructuredJSON exception

Signed-off-by: Curtis Mason <cumason@google.com>

* Don't bump version in a feature branch

* Add back missing CHANGELOG lines

* Reformat with latest black

Co-authored-by: Dustin Ingram <di@users.noreply.github.com>
Co-authored-by: Katie McLaughlin <glasnt@google.com>
Co-authored-by: Adam Ross <grayside@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge branch 2.0.0-dev into master
3 participants