Merge branch 'master' into master

Author: engelke

.kokoro/presubmit_tests_trace.cfg

@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "trace and py36 and not appengine"
+}

.kokoro/system_tests_trace.cfg

@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "trace and py36 and not appengine"
+}

appengine/flexible/multiple_services/README.md

@@ -63,5 +63,5 @@ and enter `Y` when prompted.  Or to skip the check add `-q`.
 To deploy multiple services simultaneously just add the path to each `app.yaml`
 file as an argument to `gcloud app deploy `:
 ```Bash
-$ gcloud app deploy gateway/app.yaml static/app.yaml
+$ gcloud app deploy gateway-service/app.yaml static-service/app.yaml
 ```

appengine/standard/endpoints-frameworks-v2/echo/requirements.txt

@@ -1,2 +1,2 @@
-google-endpoints==4.7.0
+google-endpoints==4.8.0
 google-endpoints-api-management==1.11.0

appengine/standard_python37/warmup/app.yaml

@@ -0,0 +1,4 @@
+runtime: python37
+
+inbound_services:
+- warmup

appengine/standard_python37/warmup/main.py

@@ -0,0 +1,38 @@
+# Copyright 2018 Google LLC.
+#
+# 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 gae_python37_warmup_app]
+from flask import Flask
+
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def main():
+    return 'Hello World!'
+
+
+@app.route('/_ah/warmup')
+def warmup():
+    # Handle your warmup logic here, e.g. set up a database connection pool
+    return '', 200, {}
+
+
+if __name__ == '__main__':
+    # This is used when running locally only. When deploying to Google App
+    # Engine, a webserver process such as Gunicorn will serve the app. This
+    # can be configured by adding an `entrypoint` to app.yaml.
+    app.run(host='127.0.0.1', port=8080, debug=True)
+# [END gae_python37_warmup_app]

appengine/standard_python37/warmup/main_test.py

@@ -0,0 +1,32 @@
+# Copyright 2018 Google Inc. 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 main
+
+
+def test_index():
+    main.app.testing = True
+    client = main.app.test_client()
+
+    r = client.get('/')
+    assert r.status_code == 200
+    assert 'Hello World' in r.data.decode('utf-8')
+
+
+def test_warmup():
+    main.app.testing = True
+    client = main.app.test_client()
+
+    r = client.get('/')
+    assert r.status_code == 200

appengine/standard_python37/warmup/requirements.txt

@@ -0,0 +1 @@
+flask==1.0.2

bigquery/cloud-client/user_credentials.py

@@ -23,20 +23,18 @@
 import argparse
 
 
-def run_query(credentials, project, query):
-    from google.cloud import bigquery
-
-    client = bigquery.Client(project=project, credentials=credentials)
-    query_job = client.query(query)
-
-    # Print the results.
-    for row in query_job.result():  # Wait for the job to complete.
-        print(row)
-
-
-def authenticate_and_query(project, query, launch_browser=True):
+def main(project, launch_browser=True):
+    # [START bigquery_auth_user_flow]
     from google_auth_oauthlib import flow
 
+    # TODO: Uncomment the line below to set the `launch_browser` variable.
+    # launch_browser = True
+    #
+    # The `launch_browser` boolean variable indicates if a local server is used
+    # as the callback URL in the auth flow. A value of `True` is recommended,
+    # but a local server does not work if accessing the application remotely,
+    # such as over SSH or from a remote Jupyter notebook.
+
     appflow = flow.InstalledAppFlow.from_client_secrets_file(
         'client_secrets.json',
         scopes=['https://www.googleapis.com/auth/bigquery'])
@@ -46,7 +44,33 @@ def authenticate_and_query(project, query, launch_browser=True):
     else:
         appflow.run_console()
 
-    run_query(appflow.credentials, project, query)
+    credentials = appflow.credentials
+    # [END bigquery_auth_user_flow]
+
+    # [START bigquery_auth_user_query]
+    from google.cloud import bigquery
+
+    # TODO: Uncomment the line below to set the `project` variable.
+    # project = 'user-project-id'
+    #
+    # The `project` variable defines the project to be billed for query
+    # processing. The user must have the bigquery.jobs.create permission on
+    # this project to run a query. See:
+    # https://cloud.google.com/bigquery/docs/access-control#permissions
+
+    client = bigquery.Client(project=project, credentials=credentials)
+
+    query_string = """SELECT name, SUM(number) as total
+    FROM `bigquery-public-data.usa_names.usa_1910_current`
+    WHERE name = 'William'
+    GROUP BY name;
+    """
+    query_job = client.query(query_string)
+
+    # Print the results.
+    for row in query_job.result():  # Wait for the job to complete.
+        print("{}: {}".format(row['name'], row['total']))
+    # [END bigquery_auth_user_query]
 
 
 if __name__ == '__main__':
@@ -58,9 +82,8 @@ def authenticate_and_query(project, query, launch_browser=True):
         help='Use a local server flow to authenticate. ',
         action='store_true')
     parser.add_argument('project', help='Project to use for BigQuery billing.')
-    parser.add_argument('query', help='BigQuery SQL Query.')
 
     args = parser.parse_args()
 
-    authenticate_and_query(
-        args.project, args.query, launch_browser=args.launch_browser)
+    main(
+        args.project, launch_browser=args.launch_browser)

bigquery/cloud-client/user_credentials_test.py

@@ -18,7 +18,7 @@
 import mock
 import pytest
 
-from user_credentials import authenticate_and_query
+from user_credentials import main
 
 
 PROJECT = os.environ['GCLOUD_PROJECT']
@@ -36,6 +36,7 @@ def mock_flow():
 
 
 def test_auth_query_console(mock_flow, capsys):
-    authenticate_and_query(PROJECT, 'SELECT 1+1;', launch_browser=False)
+    main(PROJECT, launch_browser=False)
     out, _ = capsys.readouterr()
-    assert '2' in out
+    # Fun fact: William P. Wood was the 1st director of the US Secret Service.
+    assert 'William' in out