/bookshelf
-Alternativel,y you can use make:
+Alternatively, you can use make:
make push
@@ -92,6 +92,6 @@ Update `bookshelf-worker.yaml` with your Project ID or use `make template`. This
Alternatively, you can use make:
- make deploy-backend
+ make deploy-worker
Once again, use `kubectl get pods` to check the status of the worker pods. Once the worker pods are up and running, you should be able to create books on the frontend and the workers will handle updating book information in the background.
diff --git a/optional-container-engine/bookshelf-frontend.yaml b/optional-kubernetes-engine/bookshelf-frontend.yaml
similarity index 92%
rename from optional-container-engine/bookshelf-frontend.yaml
rename to optional-kubernetes-engine/bookshelf-frontend.yaml
index 1a6f56f0..5db2d638 100644
--- a/optional-container-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
@@ -24,9 +24,13 @@ metadata:
# The bookshelf frontend replica set ensures that at least 3
# instances of the bookshelf app are running on the cluster.
# For more info about Pods see:
-# https://cloud.google.com/container-engine/docs/pods/
+# https://cloud.google.com/kubernetes-engine/docs/pods/
spec:
replicas: 3
+ selector:
+ matchLabels:
+ app: bookshelf
+ tier: frontend
template:
metadata:
labels:
diff --git a/optional-container-engine/bookshelf-service.yaml b/optional-kubernetes-engine/bookshelf-service.yaml
similarity index 83%
rename from optional-container-engine/bookshelf-service.yaml
rename to optional-kubernetes-engine/bookshelf-service.yaml
index d6df8138..db8f1fe7 100644
--- a/optional-container-engine/bookshelf-service.yaml
+++ b/optional-kubernetes-engine/bookshelf-service.yaml
@@ -13,12 +13,12 @@
# limitations under the License
# The bookshelf service provides a load-balancing proxy over the bookshelf
-# frontend pods. By specifying the type as a 'LoadBalancer', Container Engine
+# frontend pods. By specifying the type as a 'LoadBalancer', Kubernetes Engine
# will create an external HTTP load balancer.
# For more information about Services see:
-# https://cloud.google.com/container-engine/docs/services/
+# https://cloud.google.com/kubernetes-engine/docs/services/
# For more information about external HTTP load balancing see:
-# https://cloud.google.com/container-engine/docs/load-balancer
+# https://cloud.google.com/kubernetes-engine/docs/load-balancer
apiVersion: v1
kind: Service
metadata:
diff --git a/optional-container-engine/bookshelf-worker.yaml b/optional-kubernetes-engine/bookshelf-worker.yaml
similarity index 92%
rename from optional-container-engine/bookshelf-worker.yaml
rename to optional-kubernetes-engine/bookshelf-worker.yaml
index 1c30d650..979437b6 100644
--- a/optional-container-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
@@ -24,9 +24,13 @@ metadata:
# The bookshelf worker replica set ensures that at least 2 instances of the
# bookshelf worker pod are running on the cluster.
# For more info about Pods see:
-# https://cloud.google.com/container-engine/docs/pods/
+# https://cloud.google.com/kubernetes-engine/docs/pods/
spec:
replicas: 2
+ selector:
+ matchLabels:
+ app: bookshelf
+ tier: worker
template:
metadata:
labels:
diff --git a/optional-container-engine/bookshelf/__init__.py b/optional-kubernetes-engine/bookshelf/__init__.py
similarity index 94%
rename from optional-container-engine/bookshelf/__init__.py
rename to optional-kubernetes-engine/bookshelf/__init__.py
index 7f446f33..5fd93b9b 100644
--- a/optional-container-engine/bookshelf/__init__.py
+++ b/optional-kubernetes-engine/bookshelf/__init__.py
@@ -108,18 +108,18 @@ def get_model():
def _request_user_info(credentials):
"""
- Makes an HTTP request to the Google+ API to retrieve the user's basic
+ Makes an HTTP request to the Google OAuth2 API to retrieve the user's basic
profile information, including full name and photo, and stores it in the
Flask session.
"""
http = httplib2.Http()
credentials.authorize(http)
resp, content = http.request(
- 'https://www.googleapis.com/plus/v1/people/me')
+ 'https://www.googleapis.com/oauth2/v3/userinfo')
if resp.status != 200:
current_app.logger.error(
- "Error while obtaining user profile: %s" % resp)
+ "Error while obtaining user profile: \n%s: %s", resp, content)
return None
session['profile'] = json.loads(content.decode('utf-8'))
diff --git a/optional-container-engine/bookshelf/crud.py b/optional-kubernetes-engine/bookshelf/crud.py
similarity index 96%
rename from optional-container-engine/bookshelf/crud.py
rename to optional-kubernetes-engine/bookshelf/crud.py
index 1800aa4f..e07b4053 100644
--- a/optional-container-engine/bookshelf/crud.py
+++ b/optional-kubernetes-engine/bookshelf/crud.py
@@ -90,8 +90,8 @@ def add():
# If the user is logged in, associate their profile with the new book.
if 'profile' in session:
- data['createdBy'] = session['profile']['displayName']
- data['createdById'] = session['profile']['id']
+ data['createdBy'] = session['profile']['name']
+ data['createdById'] = session['profile']['email']
book = get_model().create(data)
diff --git a/5-logging/bookshelf/model_cloudsql.py b/optional-kubernetes-engine/bookshelf/model_cloudsql.py
similarity index 100%
rename from 5-logging/bookshelf/model_cloudsql.py
rename to optional-kubernetes-engine/bookshelf/model_cloudsql.py
diff --git a/5-logging/bookshelf/model_datastore.py b/optional-kubernetes-engine/bookshelf/model_datastore.py
similarity index 100%
rename from 5-logging/bookshelf/model_datastore.py
rename to optional-kubernetes-engine/bookshelf/model_datastore.py
diff --git a/4-auth/bookshelf/model_mongodb.py b/optional-kubernetes-engine/bookshelf/model_mongodb.py
similarity index 78%
rename from 4-auth/bookshelf/model_mongodb.py
rename to optional-kubernetes-engine/bookshelf/model_mongodb.py
index 95470b81..ea823cd0 100644
--- a/4-auth/bookshelf/model_mongodb.py
+++ b/optional-kubernetes-engine/bookshelf/model_mongodb.py
@@ -13,13 +13,13 @@
# limitations under the License.
from bson.objectid import ObjectId
-from flask.ext.pymongo import PyMongo
+from flask_pymongo import PyMongo
builtin_list = list
-mongo = PyMongo()
+mongo = None
def _id(id):
@@ -28,6 +28,7 @@ def _id(id):
return id
+# [START from_mongo]
def from_mongo(data):
"""
Translates the MongoDB dictionary format into the format that's expected
@@ -38,50 +39,61 @@ def from_mongo(data):
data['id'] = str(data['_id'])
return data
+# [END from_mongo]
def init_app(app):
- mongo.init_app(app)
+ global mongo
+ mongo = PyMongo(app)
-def list(limit=10, cursor=None):
+
+# [START list_by_user]
+def list_by_user(user_id, limit=10, cursor=None):
cursor = int(cursor) if cursor else 0
- results = mongo.db.books.find(skip=cursor, limit=10).sort('title')
+ results = mongo.db.books\
+ .find({'createdById': user_id}, skip=cursor, limit=10)\
+ .sort('title')
books = builtin_list(map(from_mongo, results))
next_page = cursor + limit if len(books) == limit else None
return (books, next_page)
+# [END list_by_user]
-# [START list_by_user]
-def list_by_user(user_id, limit=10, cursor=None):
+# [START list]
+def list(limit=10, cursor=None):
cursor = int(cursor) if cursor else 0
- results = mongo.db.books\
- .find({'createdById': user_id}, skip=cursor, limit=10)\
- .sort('title')
+ results = mongo.db.books.find(skip=cursor, limit=10).sort('title')
books = builtin_list(map(from_mongo, results))
next_page = cursor + limit if len(books) == limit else None
return (books, next_page)
-# [END list_by_user]
+# [END list]
+# [START read]
def read(id):
- result = mongo.db.books.find_one(_id(id))
+ result = mongo.db.books.find_one({'_id': _id(id)})
return from_mongo(result)
+# [END read]
+# [START create]
def create(data):
- new_id = mongo.db.books.insert(data)
- return read(new_id)
+ result = mongo.db.books.insert_one(data)
+ return read(result.inserted_id)
+# [END create]
+# [START update]
def update(data, id):
- mongo.db.books.update({'_id': _id(id)}, data)
+ mongo.db.books.replace_one({'_id': _id(id)}, data)
return read(id)
+# [END update]
def delete(id):
- mongo.db.books.remove(_id(id))
+ mongo.db.books.delete_one({'_id': _id(id)})
diff --git a/6-pubsub/bookshelf/storage.py b/optional-kubernetes-engine/bookshelf/storage.py
similarity index 96%
rename from 6-pubsub/bookshelf/storage.py
rename to optional-kubernetes-engine/bookshelf/storage.py
index e030b637..e8f523a4 100644
--- a/6-pubsub/bookshelf/storage.py
+++ b/optional-kubernetes-engine/bookshelf/storage.py
@@ -57,7 +57,7 @@ def upload_file(file_stream, filename, content_type):
filename = _safe_filename(filename)
client = _get_storage_client()
- bucket = client.get_bucket(current_app.config['CLOUD_STORAGE_BUCKET'])
+ bucket = client.bucket(current_app.config['CLOUD_STORAGE_BUCKET'])
blob = bucket.blob(filename)
blob.upload_from_string(
diff --git a/7-gce/bookshelf/tasks.py b/optional-kubernetes-engine/bookshelf/tasks.py
similarity index 93%
rename from 7-gce/bookshelf/tasks.py
rename to optional-kubernetes-engine/bookshelf/tasks.py
index e6ca652f..c2fc5a84 100644
--- a/7-gce/bookshelf/tasks.py
+++ b/optional-kubernetes-engine/bookshelf/tasks.py
@@ -21,16 +21,20 @@
import requests
+publisher_client = pubsub.PublisherClient()
+subscriber_client = pubsub.SubscriberClient()
+
+
def get_books_queue():
- client = pubsub.Client(
- project=current_app.config['PROJECT_ID'])
+ project = current_app.config['PROJECT_ID']
# Create a queue specifically for processing books and pass in the
# Flask application context. This ensures that tasks will have access
# to any extensions / configuration specified to the app, such as
# models.
return psq.Queue(
- client, 'books', extra_context=current_app.app_context)
+ publisher_client, subscriber_client, project,
+ 'books', extra_context=current_app.app_context)
def process_book(book_id):
diff --git a/2-structured-data/bookshelf/templates/base.html b/optional-kubernetes-engine/bookshelf/templates/base.html
similarity index 100%
rename from 2-structured-data/bookshelf/templates/base.html
rename to optional-kubernetes-engine/bookshelf/templates/base.html
diff --git a/4-auth/bookshelf/templates/form.html b/optional-kubernetes-engine/bookshelf/templates/form.html
similarity index 100%
rename from 4-auth/bookshelf/templates/form.html
rename to optional-kubernetes-engine/bookshelf/templates/form.html
diff --git a/4-auth/bookshelf/templates/list.html b/optional-kubernetes-engine/bookshelf/templates/list.html
similarity index 95%
rename from 4-auth/bookshelf/templates/list.html
rename to optional-kubernetes-engine/bookshelf/templates/list.html
index 3362f0e2..a80d5b56 100644
--- a/4-auth/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/6-pubsub/bookshelf/templates/view.html b/optional-kubernetes-engine/bookshelf/templates/view.html
similarity index 95%
rename from 6-pubsub/bookshelf/templates/view.html
rename to optional-kubernetes-engine/bookshelf/templates/view.html
index e654e8ab..2f337229 100644
--- a/6-pubsub/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-container-engine/config.py b/optional-kubernetes-engine/config.py
similarity index 95%
rename from optional-container-engine/config.py
rename to optional-kubernetes-engine/config.py
index f77c8c75..7da9b4cc 100644
--- a/optional-container-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-container-engine/main.py b/optional-kubernetes-engine/main.py
similarity index 100%
rename from optional-container-engine/main.py
rename to optional-kubernetes-engine/main.py
diff --git a/optional-container-engine/procfile b/optional-kubernetes-engine/procfile
similarity index 100%
rename from optional-container-engine/procfile
rename to optional-kubernetes-engine/procfile
diff --git a/optional-kubernetes-engine/requirements-dev.txt b/optional-kubernetes-engine/requirements-dev.txt
new file mode 100644
index 00000000..3118b924
--- /dev/null
+++ b/optional-kubernetes-engine/requirements-dev.txt
@@ -0,0 +1,8 @@
+tox==3.5.3
+flake8==3.6.0
+flaky==3.4.0
+pytest==4.0.1
+pytest-cov==2.6.0
+BeautifulSoup4==4.6.3
+requests==2.20.1
+retrying==1.3.3
diff --git a/optional-kubernetes-engine/requirements.txt b/optional-kubernetes-engine/requirements.txt
new file mode 100644
index 00000000..33ba8279
--- /dev/null
+++ b/optional-kubernetes-engine/requirements.txt
@@ -0,0 +1,16 @@
+Flask==1.0.4
+google-cloud-datastore==1.7.1
+google-cloud-storage==1.23.0
+google-cloud-logging==1.8.0
+google-cloud-error_reporting==0.30.0
+gunicorn==19.9.0
+oauth2client==4.1.3
+mock==2.0.0
+Flask-SQLAlchemy==2.3.2
+PyMySQL==0.9.2
+Flask-PyMongo==2.3.0
+PyMongo==3.7.2
+six==1.11.0
+requests[security]==2.21.0
+honcho==1.0.1
+psq==0.7.0
diff --git a/3-binary-data/tests/conftest.py b/optional-kubernetes-engine/tests/conftest.py
similarity index 96%
rename from 3-binary-data/tests/conftest.py
rename to optional-kubernetes-engine/tests/conftest.py
index 8123575b..57a50a1c 100644
--- a/3-binary-data/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/6-pubsub/tests/test_auth.py b/optional-kubernetes-engine/tests/test_auth.py
similarity index 94%
rename from 6-pubsub/tests/test_auth.py
rename to optional-kubernetes-engine/tests/test_auth.py
index 7fc7dabc..6367608c 100644
--- a/6-pubsub/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'] = {'id': 'abc', 'displayName': 'Test User'}
+ session['profile'] = {
+ 'email': 'abc@example.com',
+ 'name': 'Test User'
+ }
session['google_oauth2_credentials'] = credentials.to_json()
yield client
@@ -57,7 +60,6 @@ def inner():
# in conftest.py
@pytest.mark.usefixtures('app', 'model')
class TestAuth(object):
-
def test_not_logged_in(self, app):
with app.test_client() as c:
rv = c.get('/books/')
@@ -105,12 +107,12 @@ def test_mine(self, model, client_with_credentials):
# created by another user.
model.create({
'title': 'Book 1',
- 'createdById': 'abc'
+ 'createdById': 'abc@example.com'
})
model.create({
'title': 'Book 2',
- 'createdById': 'def'
+ 'createdById': 'def@example.com'
})
# Check the "My Books" page and make sure only one of the books
diff --git a/2-structured-data/tests/test_crud.py b/optional-kubernetes-engine/tests/test_crud.py
similarity index 100%
rename from 2-structured-data/tests/test_crud.py
rename to optional-kubernetes-engine/tests/test_crud.py
diff --git a/7-gce/tests/test_end_to_end.py b/optional-kubernetes-engine/tests/test_end_to_end.py
similarity index 97%
rename from 7-gce/tests/test_end_to_end.py
rename to optional-kubernetes-engine/tests/test_end_to_end.py
index 2a64ce8a..df80e8a0 100644
--- a/7-gce/tests/test_end_to_end.py
+++ b/optional-kubernetes-engine/tests/test_end_to_end.py
@@ -52,7 +52,7 @@ def test_end_to_end():
# Use retry because it will take some indeterminate time for the pub/sub
# message to be processed.
- @retry(wait_exponential_multiplier=1000, stop_max_attempt_number=15)
+ @retry(wait_exponential_multiplier=5000, stop_max_attempt_number=12)
def check_for_updated_data():
# Check that the book's information was updated.
response = requests.get(book_url)
diff --git a/3-binary-data/tests/test_storage.py b/optional-kubernetes-engine/tests/test_storage.py
similarity index 100%
rename from 3-binary-data/tests/test_storage.py
rename to optional-kubernetes-engine/tests/test_storage.py
diff --git a/6-pubsub/tox.ini b/optional-kubernetes-engine/tox.ini
similarity index 82%
rename from 6-pubsub/tox.ini
rename to optional-kubernetes-engine/tox.ini
index 430b03fa..8a04f077 100644
--- a/6-pubsub/tox.ini
+++ b/optional-kubernetes-engine/tox.ini
@@ -1,9 +1,8 @@
[tox]
skipsdist = True
-envlist = lint,py27,py34
+envlist = lint,py27,py36
[testenv]
-basepython = python2.7
deps =
-rrequirements.txt
-rrequirements-dev.txt
@@ -12,16 +11,14 @@ commands =
passenv = GOOGLE_APPLICATION_CREDENTIALS DATASTORE_HOST E2E_URL
setenv = PYTHONPATH={toxinidir}
-[testenv:py34]
-basepython = python3.4
[testenv:py27-e2e]
basepython = python2.7
commands =
py.test --no-success-flaky-report -m "e2e" {posargs: tests}
-[testenv:py34-e2e]
-basepython = python2.7
+[testenv:py36-e2e]
+basepython = python3.6
commands =
py.test --no-success-flaky-report -m "e2e" {posargs: tests}
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..eb509ac0
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,5 @@
+[pytest]
+addopts =
+ -v
+ --tb=native
+norecursedirs = .git env lib .tox .nox
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..0fd66f54
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,5 @@
+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
- {% endif %}
- {{session.profile.displayName}}
-