Skip to content

fix: add region tag, move code around for docs #9952

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
engelke merged 8 commits into from
May 16, 2023
Merged

fix: add region tag, move code around for docs #9952

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95fe2e0
fix: add region tag, move code around for docs
iennae May 15, 2023
3ef40cb
Fix: linting Update main.py
iennae May 15, 2023
bfbe4e9
fix: change debug to False
iennae May 15, 2023
93b2c5d
fix: remove old region tag that is no longer used
iennae May 15, 2023
c413313
Merge branch 'main' into fixit-sigje-281697285-1
iennae May 15, 2023
92b351f
fix: standardize on server
iennae May 15, 2023
1712acc
fix: bring back region tag
iennae May 15, 2023
97a2f73
fix: remove os as no longer using it
iennae May 15, 2023
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
14 changes: 3 additions & 11 deletions run/pubsub/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
# limitations under the License.

# [START cloudrun_pubsub_server_setup]
Copy link
Copy Markdown
Collaborator

@dandhlee dandhlee May 15, 2023

Choose a reason for hiding this comment

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

Is there a difference between cloudrun_pubsub_server_setup and cloudrun_pubsub_server?

Copy link
Copy Markdown
Contributor Author

@iennae iennae May 15, 2023

Choose a reason for hiding this comment

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

not in python, but if I don't have both region tags then audits will say cloudrun_pubsub_server is missing.

Copy link
Copy Markdown
Contributor

@averikitsch averikitsch May 15, 2023

Choose a reason for hiding this comment

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

We only need to use one region tag. We don't always have complete 1:1 matches across languages

# [START run_pubsub_server_setup]
# [START cloudrun_pubsub_server]
import base64
import os

from flask import Flask, request


app = Flask(__name__)
# [END run_pubsub_server_setup]

# [END cloudrun_pubsub_server_setup]
# [END cloudrun_pubsub_server]


# [START cloudrun_pubsub_handler]
Expand Down Expand Up @@ -53,11 +53,3 @@ def index():

# [END run_pubsub_handler]
# [END cloudrun_pubsub_handler]


if __name__ == "__main__":
PORT = int(os.getenv("PORT")) if os.getenv("PORT") else 8080

# This is used when running locally. Gunicorn is used to run the
# application on Cloud Run. See entrypoint in Dockerfile.
app.run(host="127.0.0.1", port=PORT, debug=True)