--predefined-default-object-acl=public-read
Alternatively, you can use make:
diff --git a/optional-kubernetes-engine/bookshelf-frontend.yaml b/optional-kubernetes-engine/bookshelf-frontend.yaml
index 265c8e35..5db2d638 100644
--- a/optional-kubernetes-engine/bookshelf-frontend.yaml
+++ b/optional-kubernetes-engine/bookshelf-frontend.yaml
@@ -15,7 +15,7 @@
# This file configures the bookshelf application frontend. The frontend serves
# public web traffic.
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: bookshelf-frontend
@@ -27,6 +27,10 @@ metadata:
# https://cloud.google.com/kubernetes-engine/docs/pods/
spec:
replicas: 3
+ selector:
+ matchLabels:
+ app: bookshelf
+ tier: frontend
template:
metadata:
labels:
diff --git a/optional-kubernetes-engine/bookshelf-worker.yaml b/optional-kubernetes-engine/bookshelf-worker.yaml
index c30df89b..979437b6 100644
--- a/optional-kubernetes-engine/bookshelf-worker.yaml
+++ b/optional-kubernetes-engine/bookshelf-worker.yaml
@@ -15,7 +15,7 @@
# This file configures the bookshelf task worker. The worker is responsible
# for processing book requests and updating book information.
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: bookshelf-worker
@@ -27,6 +27,10 @@ metadata:
# https://cloud.google.com/kubernetes-engine/docs/pods/
spec:
replicas: 2
+ selector:
+ matchLabels:
+ app: bookshelf
+ tier: worker
template:
metadata:
labels:
diff --git a/optional-kubernetes-engine/bookshelf/templates/list.html b/optional-kubernetes-engine/bookshelf/templates/list.html
index 3362f0e2..a80d5b56 100644
--- a/optional-kubernetes-engine/bookshelf/templates/list.html
+++ b/optional-kubernetes-engine/bookshelf/templates/list.html
@@ -31,7 +31,7 @@ Books
{% if book.imageUrl %}
{% else %}
- 
+ 
{% endif %}
diff --git a/optional-kubernetes-engine/bookshelf/templates/view.html b/optional-kubernetes-engine/bookshelf/templates/view.html
index e654e8ab..2f337229 100644
--- a/optional-kubernetes-engine/bookshelf/templates/view.html
+++ b/optional-kubernetes-engine/bookshelf/templates/view.html
@@ -36,7 +36,7 @@
Book
{% if book.imageUrl %}
{% else %}
-
+
{% endif %}
diff --git a/optional-kubernetes-engine/config.py b/optional-kubernetes-engine/config.py
index f77c8c75..7da9b4cc 100644
--- a/optional-kubernetes-engine/config.py
+++ b/optional-kubernetes-engine/config.py
@@ -78,16 +78,16 @@
# Typically, you'll name your bucket the same as your project. To create a
# bucket:
#
-# $ gsutil mb gs://
+# $ gcloud storage buckets create gs://
#
# You also need to make sure that the default ACL is set to public-read,
# otherwise users will not be able to see their upload images:
#
-# $ gsutil defacl set public-read gs://
+# $ gcloud storage buckets update --predefined-default-object-acl=public-read gs://
#
# You can adjust the max content length and allow extensions settings to allow
# larger or more varied file types if desired.
-CLOUD_STORAGE_BUCKET = 'your-project-id'
+CLOUD_STORAGE_BUCKET = 'your-bucket-name'
MAX_CONTENT_LENGTH = 8 * 1024 * 1024
ALLOWED_EXTENSIONS = set(['png', 'jpg', 'jpeg', 'gif'])
diff --git a/optional-kubernetes-engine/requirements.txt b/optional-kubernetes-engine/requirements.txt
index 5d998499..33ba8279 100644
--- a/optional-kubernetes-engine/requirements.txt
+++ b/optional-kubernetes-engine/requirements.txt
@@ -1,6 +1,6 @@
-Flask>=1.0.0
+Flask==1.0.4
google-cloud-datastore==1.7.1
-google-cloud-storage==1.13.0
+google-cloud-storage==1.23.0
google-cloud-logging==1.8.0
google-cloud-error_reporting==0.30.0
gunicorn==19.9.0
@@ -8,9 +8,9 @@ oauth2client==4.1.3
mock==2.0.0
Flask-SQLAlchemy==2.3.2
PyMySQL==0.9.2
-Flask-PyMongo>=2.0.0
+Flask-PyMongo==2.3.0
PyMongo==3.7.2
six==1.11.0
-requests[security]==2.20.1
+requests[security]==2.21.0
honcho==1.0.1
psq==0.7.0
diff --git a/optional-kubernetes-engine/tests/conftest.py b/optional-kubernetes-engine/tests/conftest.py
index 8123575b..57a50a1c 100644
--- a/optional-kubernetes-engine/tests/conftest.py
+++ b/optional-kubernetes-engine/tests/conftest.py
@@ -22,7 +22,7 @@
from retrying import retry
-@pytest.yield_fixture(params=['datastore', 'cloudsql', 'mongodb'])
+@pytest.fixture(params=['datastore', 'mongodb'])
def app(request):
"""This fixtures provides a Flask app instance configured for testing.
@@ -43,7 +43,7 @@ def app(request):
yield app
-@pytest.yield_fixture
+@pytest.fixture
def model(monkeypatch, app):
"""This fixture provides a modified version of the app's model that tracks
all created items and deletes them at the end of the test.
diff --git a/optional-kubernetes-engine/tests/test_auth.py b/optional-kubernetes-engine/tests/test_auth.py
index 491de9e0..6367608c 100644
--- a/optional-kubernetes-engine/tests/test_auth.py
+++ b/optional-kubernetes-engine/tests/test_auth.py
@@ -41,7 +41,10 @@ def client_with_credentials(app):
def inner():
with app.test_client() as client:
with client.session_transaction() as session:
- session['profile'] = {'email': 'abc@example.com', 'name': 'Test User'}
+ session['profile'] = {
+ 'email': 'abc@example.com',
+ 'name': 'Test User'
+ }
session['google_oauth2_credentials'] = credentials.to_json()
yield client
diff --git a/pytest.ini b/pytest.ini
index 2008cdfa..eb509ac0 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,5 @@
[pytest]
addopts =
-v
- --no-success-flaky-report
--tb=native
norecursedirs = .git env lib .tox .nox
diff --git a/requirements.txt b/requirements.txt
index 4b0a8521..0fd66f54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,5 @@
-BeautifulSoup4==4.6.0
-flake8==3.5.0
-flaky==3.4.0
-mock==2.0.0
-nox>=2018.10.9
-pytest==3.8.2
-pytest-cov==2.5.1
-retrying==1.3.3
-requests>=2.20.0
+flake8===5.0.4; python_version < '3.8'
+flake8==6.0.0; python_version >= '3.8'
+pytest==7.3.1
+nox==2023.4.22
+requests==2.31.0
diff --git a/secrets.tar.enc b/secrets.tar.enc
index 2942865e..25ccbe61 100644
Binary files a/secrets.tar.enc and b/secrets.tar.enc differ
diff --git a/sessions/app.yaml b/sessions/app.yaml
new file mode 100644
index 00000000..0b2d0e28
--- /dev/null
+++ b/sessions/app.yaml
@@ -0,0 +1,17 @@
+# Copyright 2019 Google LLC All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START getting_started_sessions_runtime]
+runtime: python37
+# [END getting_started_sessions_runtime]
diff --git a/sessions/main.py b/sessions/main.py
new file mode 100644
index 00000000..62871ba1
--- /dev/null
+++ b/sessions/main.py
@@ -0,0 +1,80 @@
+# Copyright 2019 Google LLC All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START getting_started_sessions_all]
+import random
+from uuid import uuid4
+
+from flask import Flask, make_response, request
+from google.cloud import firestore
+
+
+app = Flask(__name__)
+db = firestore.Client()
+sessions = db.collection('sessions')
+greetings = [
+ 'Hello World',
+ 'Hallo Welt',
+ 'Ciao Mondo',
+ 'Salut le Monde',
+ 'Hola Mundo',
+]
+
+
+@firestore.transactional
+def get_session_data(transaction, session_id):
+ """ Looks up (or creates) the session with the given session_id.
+ Creates a random session_id if none is provided. Increments
+ the number of views in this session. Updates are done in a
+ transaction to make sure no saved increments are overwritten.
+ """
+ if session_id is None:
+ session_id = str(uuid4()) # Random, unique identifier
+
+ doc_ref = sessions.document(document_id=session_id)
+ doc = doc_ref.get(transaction=transaction)
+ if doc.exists:
+ session = doc.to_dict()
+ else:
+ session = {
+ 'greeting': random.choice(greetings),
+ 'views': 0
+ }
+
+ session['views'] += 1 # This counts as a view
+ transaction.set(doc_ref, session)
+
+ session['session_id'] = session_id
+ return session
+
+
+@app.route('/', methods=['GET'])
+def home():
+ template = '{} views for "{}"'
+
+ transaction = db.transaction()
+ session = get_session_data(transaction, request.cookies.get('session_id'))
+
+ resp = make_response(template.format(
+ session['views'],
+ session['greeting']
+ )
+ )
+ resp.set_cookie('session_id', session['session_id'], httponly=True)
+ return resp
+
+
+if __name__ == '__main__':
+ app.run(host='127.0.0.1', port=8080)
+# [END getting_started_sessions_all]
diff --git a/sessions/main_test.py b/sessions/main_test.py
new file mode 100644
index 00000000..06965c08
--- /dev/null
+++ b/sessions/main_test.py
@@ -0,0 +1,54 @@
+# Copyright 2019 Google LLC All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+import uuid
+
+import main
+import pytest
+
+
+@pytest.fixture
+def client():
+ """ Yields a test client, AND creates and later cleans up a
+ dummy collection for sessions.
+ """
+ main.app.testing = True
+
+ # Override the Firestore collection used for sessions in main
+ main.sessions = main.db.collection(str(uuid.uuid4()))
+
+ client = main.app.test_client()
+ yield client
+
+ # Clean up session objects created in test collection
+ for doc_ref in main.sessions.list_documents():
+ doc_ref.delete()
+
+
+def test_session(client):
+ r = client.get('/')
+ assert r.status_code == 200
+ data = r.data.decode('utf-8')
+ assert '1 views' in data
+
+ match = re.search('views for "([A-Za-z ]+)"', data)
+ assert match is not None
+ greeting = match.group(1)
+
+ r = client.get('/')
+ assert r.status_code == 200
+ data = r.data.decode('utf-8')
+ assert '2 views' in data
+ assert greeting in data
diff --git a/sessions/requirements-dev.txt b/sessions/requirements-dev.txt
new file mode 100644
index 00000000..fe969938
--- /dev/null
+++ b/sessions/requirements-dev.txt
@@ -0,0 +1 @@
+pytest>=5.0.0
diff --git a/sessions/requirements.txt b/sessions/requirements.txt
new file mode 100644
index 00000000..e0e267b5
--- /dev/null
+++ b/sessions/requirements.txt
@@ -0,0 +1,2 @@
+google-cloud-firestore==2.11.1
+flask==2.2.5