@@ -34,7 +34,7 @@ def hello_get(request):
34
34
Response object using `make_response`
35
35
<http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>.
36
36
"""
37
- return 'Hello, World!'
37
+ return 'Hello World!'
38
38
# [END functions_helloworld_get]
39
39
40
40
@@ -50,7 +50,7 @@ def hello_background(data, context):
50
50
name = data ['name' ]
51
51
else :
52
52
name = 'World'
53
- return 'Hello, {}!' .format (name )
53
+ return 'Hello {}!' .format (name )
54
54
# [END functions_helloworld_background]
55
55
# [END functions_tips_terminate]
56
56
@@ -66,12 +66,16 @@ def hello_http(request):
66
66
Response object using `make_response`
67
67
<http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>.
68
68
"""
69
- request_json = request .get_json ()
69
+ request_json = request .get_json (silent = True )
70
+ request_args = request .args
71
+
70
72
if request_json and 'name' in request_json :
71
- name = escape (request_json ['name' ])
73
+ name = request_json ['name' ]
74
+ elif request_args and 'name' in request_args :
75
+ name = request_args ['name' ]
72
76
else :
73
77
name = 'World'
74
- return 'Hello, {}!' .format (name )
78
+ return 'Hello {}!' .format (escape ( name ) )
75
79
# [END functions_helloworld_http]
76
80
77
81
@@ -89,7 +93,7 @@ def hello_pubsub(data, context):
89
93
name = base64 .b64decode (data ['data' ]).decode ('utf-8' )
90
94
else :
91
95
name = 'World'
92
- print ('Hello, {}!' .format (name ))
96
+ print ('Hello {}!' .format (name ))
93
97
# [END functions_helloworld_pubsub]
94
98
95
99
@@ -119,7 +123,11 @@ def hello_content(request):
119
123
"""
120
124
content_type = request .headers ['content-type' ]
121
125
if content_type == 'application/json' :
122
- name = request .json .get ('name' )
126
+ request_json = request .get_json (silent = True )
127
+ if request_json and 'name' in request_json :
128
+ name = request_json ['name' ]
129
+ else :
130
+ raise ValueError ("JSON is invalid, or missing a 'name' property" )
123
131
elif content_type == 'application/octet-stream' :
124
132
name = request .data
125
133
elif content_type == 'text/plain' :
@@ -128,7 +136,7 @@ def hello_content(request):
128
136
name = request .form .get ('name' )
129
137
else :
130
138
raise ValueError ("Unknown content type: {}" .format (content_type ))
131
- return 'Hello, {}!' .format (escape (name ))
139
+ return 'Hello {}!' .format (escape (name ))
132
140
# [END functions_http_content]
133
141
134
142
@@ -146,7 +154,7 @@ def hello_method(request):
146
154
from flask import abort
147
155
148
156
if request .method == 'GET' :
149
- return 'Hello, World!'
157
+ return 'Hello World!'
150
158
elif request .method == 'PUT' :
151
159
return abort (403 )
152
160
else :
0 commit comments