fixes tests and linter, removes travis and adds Kokoro

.gitignore

@@ -21,6 +21,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+sponge_log.xml
 
 *.log
 

.kokoro/common.cfg

@@ -3,6 +3,9 @@
 # Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/getting-started-python"
+
 # All builds use the trampoline script to run in docker.
 build_file: "getting-started-python/.kokoro/trampoline.sh"
 
@@ -12,7 +15,8 @@ env_vars: {
     value: "gcr.io/cloud-devrel-kokoro-resources/python@sha256:4b6ba8c199e96248980db4538065cddeea594138b9b9fb2d0388603922087747"
 }
 
+# Tell the trampoline which build file to use.
 env_vars: {
-    key: "FIRESTORE_PROJECT_ID"
-    value: "getting-started-python-tests"
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/getting-started-python/.kokoro/system_tests.sh"
 }

.kokoro/system_tests.cfg

@@ -1,10 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Download secrets from Cloud Storage.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/getting-started-python"
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/getting-started-python/.kokoro/system_tests.sh"
-}

.kokoro/system_tests.sh

@@ -28,4 +28,5 @@ SECRETS_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secrets-password.txt")
 export GOOGLE_APPLICATION_CREDENTIALS="$(pwd)/service-account.json"
 
 # Run tests
+nox -s lint
 nox -s run_tests

README.md

@@ -1,7 +1,5 @@
 # Getting started with Python on Google Cloud Platform
 
-[![Build Status](https://travis-ci.org/GoogleCloudPlatform/getting-started-python.svg)](https://travis-ci.org/GoogleCloudPlatform/getting-started-python)
-
 This repository is the complete sample code for the [Python Getting Started on Google Cloud Platform](http://cloud.google.com/python) tutorials. Please refer to the tutorials for instructions on configuring, running, and deploying these samples.
 
 The code for the samples is contained in individual folders in this repository.

authenticating-users/main.py

@@ -53,7 +53,7 @@ def get_metadata(item_name):
     path += item_name
     response = requests.get(
         '{}{}'.format(endpoint, path),
-        headers = {'Metadata-Flavor': 'Google'}
+        headers={'Metadata-Flavor': 'Google'}
     )
     metadata = response.text
     return metadata

background/app/main.py

@@ -20,10 +20,11 @@
 import json
 import os
 
+from flask import Flask, redirect, render_template, request
 from google.cloud import firestore
 from google.cloud import pubsub
 
-from flask import Flask, render_template, redirect, request
+
 app = Flask(__name__)
 
 # Get client objects to reuse over multiple invocations

background/app/main_test.py

@@ -13,27 +13,23 @@
 # limitations under the License.
 
 import os
-import pytest
 import uuid
 
+import google.auth
 from google.cloud import firestore
 from google.cloud import pubsub
+import main
+import pytest
 
-os.environ['GOOGLE_CLOUD_PROJECT'] = os.environ['FIRESTORE_PROJECT_ID']
-os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = os.path.realpath(
-    os.path.join(
-        os.path.dirname(__file__),
-        '..',
-        '..',
-        'firestore-service-account.json'
-    )
-)
 
+credentials, project_id = google.auth.default()
+os.environ['GOOGLE_CLOUD_PROJECT'] = project_id
 SUBSCRIPTION_NAME = 'projects/{}/subscriptions/{}'.format(
-    os.getenv('FIRESTORE_PROJECT_ID'), 'test-' + str(uuid.uuid4())
+    project_id, 'test-' + str(uuid.uuid4())
+)
+TOPIC_NAME = 'projects/{}/topics/{}'.format(
+    project_id, 'translate'
 )
-
-import main
 
 
 @pytest.yield_fixture
@@ -68,15 +64,12 @@ def publisher():
 @pytest.yield_fixture
 def subscriber():
     subscriber = pubsub.SubscriberClient()
-    topic_name = 'projects/{}/topics/{}'.format(
-        os.getenv('FIRESTORE_PROJECT_ID'), 'translate'
-    )
-    subscription = subscriber.create_subscription(
-        SUBSCRIPTION_NAME, topic_name
+    subscriber.create_subscription(
+        SUBSCRIPTION_NAME, TOPIC_NAME
     )
     yield subscriber
     subscriber.delete_subscription(SUBSCRIPTION_NAME)
-    
+
 
 def test_index(db, publisher):
     main.app.testing = True
@@ -104,7 +97,7 @@ def test_translate(db, publisher, subscriber):
 
     assert r.status_code < 400
 
-    response = subscriber.pull(SUBSCRIPTION_NAME, 1, timeout=2.0)
+    response = subscriber.pull(SUBSCRIPTION_NAME, 1, timeout=10.0)
     assert len(response.received_messages) == 1
     assert b'This is a test' in response.received_messages[0].message.data
     assert b'fr' in response.received_messages[0].message.data

background/function/main.py

@@ -26,7 +26,6 @@
 import base64
 import hashlib
 import json
-import os
 
 from google.cloud import firestore
 from google.cloud import translate
@@ -72,6 +71,7 @@ def document_name(message):
 
     # Note that document IDs should not contain the '/' character
     name = base64.b64encode(hashed, altchars=b'+-').decode('utf-8')
+    return name
 
 
 @firestore.transactional
@@ -81,7 +81,7 @@ def update_database(transaction, message):
 
     try:
         doc_ref.get(transaction=transaction)
-    except NotFound:
+    except firestore.NotFound:
         return  # Don't replace an existing translation
 
     transaction.set(doc_ref, message)

background/function/main_test.py

@@ -14,21 +14,8 @@
 
 import base64
 import json
-import os
-import pytest
 
 from google.cloud import firestore
-
-os.environ['GOOGLE_CLOUD_PROJECT'] = os.environ['FIRESTORE_PROJECT_ID']
-os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = os.path.realpath(
-    os.path.join(
-        os.path.dirname(__file__),
-        '..',
-        '..',
-        'firestore-service-account.json'
-    )
-)
-
 import main
 
 
@@ -41,7 +28,7 @@ def clear_collection(collection):
 
 
 def test_invocations():
-    db = firestore.Client(project=os.environ['FIRESTORE_PROJECT_ID'])
+    db = firestore.Client()
     main.db = db
 
     translations = db.collection('translations')

encrypt-secrets.sh

@@ -17,8 +17,6 @@
 read -s -p "Enter password for encryption: " password
 echo
 
-tar cvf secrets.tar {service-account.json,firestore-service-account.json,config.py}
+tar cvf secrets.tar service-account.json
 openssl aes-256-cbc -k "$password" -in secrets.tar -out secrets.tar.enc
 rm secrets.tar
-
-travis encrypt "secrets_password=$password" --add

noxfile.py

@@ -9,6 +9,7 @@
 DIRS = [
     # Hello world doesn't have system tests, just a lint test which will be
     # covered by the global lint here.
+    'authenticating-users',
     'background/app',
     'background/function',
     'sessions',
@@ -49,7 +50,7 @@ def run_test(session, dir):
         'pytest',
         *(PYTEST_COMMON_ARGS + session.posargs),
         # Pytest will return 5 when no tests are collected. This can happen
-        # on travis where slow and flaky tests are excluded.
+        # when slow and flaky tests are excluded.
         # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html
         success_codes=[0, 5])
 
@@ -59,12 +60,3 @@ def run_test(session, dir):
 def run_tests(session, dir=None):
     """Run all tests for all directories (slow!)"""
     run_test(session, dir)
-
-
-@nox.session
-@nox.parametrize('dir', DIRS)
-def travis(session, dir=None):
-    """On travis, only run the py3.4 and cloudsql tests."""
-    run_tests(
-        session,
-        dir=dir)

sessions/main.py

@@ -15,8 +15,8 @@
 import random
 from uuid import uuid4
 
-from google.cloud import firestore
 from flask import Flask, make_response, request
+from google.cloud import firestore
 
 
 app = Flask(__name__)
@@ -66,7 +66,7 @@ def home():
     session = get_session_data(transaction, request.cookies.get('session_id'))
 
     resp = make_response(template.format(
-        session['views'], 
+        session['views'],
         session['greeting']
         )
     )

sessions/main_test.py

@@ -12,21 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import pytest
 import re
 import uuid
 
-os.environ['GOOGLE_CLOUD_PROJECT'] = os.environ['FIRESTORE_PROJECT_ID']
-os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = os.path.realpath(
-    os.path.join(
-        os.path.dirname(__file__),
-        '..',
-        'firestore-service-account.json'
-    )
-)
-
 import main
+import pytest
 
 
 @pytest.fixture