Skip to content

Commit 549adf5

Browse files
eapl-gemugamieapl-gemugami
authored
chore(gae): fix region tags in appengine folder (GoogleCloudPlatform#13241)
* chore(gae): rename region tag 'get_serving_url' * chore(gae): delete region tag 'vendor' * chore(gae): migration step 1: add fixed region tag and fix spacing
1 parent 9e52ed6 commit 549adf5

File tree

8 files changed

+10
-16
lines changed

8 files changed

+10
-16
lines changed

‎appengine/standard/endpoints-frameworks-v2/echo/app.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ libraries:
3939
- name: ssl
4040
version: 2.7.11
4141

42+
# [START gae_endpoints_frameworks_v2_env_vars]
4243
# [START env_vars]
4344
env_variables:
4445
# The following values are to be replaced by information from the output of
4546
# 'gcloud endpoints services deploy swagger.json' command.
4647
ENDPOINTS_SERVICE_NAME: YOUR-PROJECT-ID.appspot.com
4748
ENDPOINTS_SERVICE_VERSION: 2016-08-01r0
48-
# [END env_vars]
49+
# [END env_vars]
50+
# [END gae_endpoints_frameworks_v2_env_vars]

‎appengine/standard/endpoints-frameworks-v2/echo/main.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from endpoints import message_types
2121
from endpoints import messages
2222
from endpoints import remote
23-
2423
# [END endpoints_echo_api_imports]
2524

2625

@@ -57,7 +56,6 @@ class EchoApi(remote.Service):
5756
def echo(self, request):
5857
output_message = " ".join([request.message] * request.n)
5958
return EchoResponse(message=output_message)
60-
6159
# [END endpoints_echo_api_method]
6260

6361
@endpoints.method(
@@ -107,8 +105,6 @@ def get_user_email(self, request):
107105
if not user:
108106
raise endpoints.UnauthorizedException
109107
return EchoResponse(message=user.email())
110-
111-
112108
# [END endpoints_echo_api_class]
113109

114110

‎appengine/standard/images/api/blobstore.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ def get(self):
4545
# Either "blob_key" wasn't provided, or there was no value with that ID
4646
# in the Blobstore.
4747
self.error(404)
48-
49-
5048
# [END gae_images_api_blobstore_thumbnailer]
5149

5250

@@ -58,11 +56,11 @@ def get(self):
5856
blob_info = blobstore.get(blob_key)
5957

6058
if blob_info:
61-
# [START get_serving_url]
59+
# [START gae_get_serving_url]
6260
url = images.get_serving_url(
6361
blob_key, size=150, crop=True, secure_url=True
6462
)
65-
# [END get_serving_url]
63+
# [END gae_get_serving_url]
6664
return webapp2.redirect(url)
6765

6866
# Either "blob_key" wasn't provided, or there was no value with that ID

‎appengine/standard/images/api/requirements-test.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pytest==8.3.5
2+
six==1.17.0

‎appengine/standard/images/api/requirements.txt

Whitespace-only changes.

‎appengine/standard/migration/incoming/appengine_config.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# [START vendor]
1615
from google.appengine.ext import vendor
1716

1817
# Add any libraries installed in the "lib" folder.
1918
vendor.add("lib")
20-
# [END vendor]

‎appengine/standard/migration/incoming/requirements-test.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
# pin pytest to 4.6.11 for Python2.
2-
pytest==4.6.11; python_version < '3.0'
3-
WebTest==2.0.35; python_version < '3.0'
1+
pytest==8.3.5
2+
WebTest==3.0.4

‎appengine/standard/migration/incoming/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
google-auth==2.17.3; python_version < '3.0'
2-
google-auth==2.17.3; python_version > '3.0'
1+
google-auth==2.17.3
32
requests==2.27.1

0 commit comments

Comments
 (0)