Merge branch 'master' into 8-add-client-factory-from-dict

tseaver · web-flow · commit 8fe58822ae62 · 2021-06-11T16:04:39.000-04:00
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  image: gcr.io/repo-automation-bots/owlbot-python:latest
+  digest: sha256:c66ba3c8d7bc8566f47df841f98cd0097b28fff0b1864c86f5817f4c8c3e8600
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
@@ -0,0 +1,19 @@
+# Copyright 2021 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.
+
+docker:
+  image: gcr.io/repo-automation-bots/owlbot-python:latest
+
+begin-after-commit-hash: 513beb9718c83468c65ed4b1b0f23bb435a7260a
+
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,6 +26,6 @@ repos:
     hooks:
     - id: black
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.0
+    rev: 3.9.2
     hooks:
     - id: flake8
diff --git a/.repo-metadata.json b/.repo-metadata.json
@@ -4,6 +4,7 @@
   "client_documentation": "https://googleapis.dev/python/google-cloud-core/latest",
   "release_level": "ga",
   "language": "python",
+  "library_type": "CORE",
   "repo": "googleapis/python-cloud-core",
   "distribution_name": "google-cloud-core"
 }
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -160,21 +160,7 @@ Running System Tests
   auth settings and change some configuration in your project to
   run all the tests.
 
-- System tests will be run against an actual project and
-  so you'll need to provide some environment variables to facilitate
-  authentication to your project:
-
-  - ``GOOGLE_APPLICATION_CREDENTIALS``: The path to a JSON key file;
-    Such a file can be downloaded directly from the developer's console by clicking
-    "Generate new JSON key". See private key
-    `docs <https://cloud.google.com/storage/docs/authentication#generating-a-private-key>`__
-    for more details.
-
-- Once you have downloaded your json keys, set the environment variable 
-  ``GOOGLE_APPLICATION_CREDENTIALS`` to the absolute path of the json file::
-
-   $ export GOOGLE_APPLICATION_CREDENTIALS="/Users/<your_username>/path/to/app_credentials.json"
-
+- System tests will be run against an actual project. You should use local credentials from gcloud when possible. See `Best practices for application authentication <https://cloud.google.com/docs/authentication/best-practices-applications#local_development_and_testing_with_the>`__. Some tests require a service account. For those tests see `Authenticating as a service account <https://cloud.google.com/docs/authentication/production>`__.
 
 *************
 Test Coverage
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.
diff --git a/docs/conf.py b/docs/conf.py
@@ -366,6 +366,7 @@
     ),
     "grpc": ("https://grpc.github.io/grpc/python/", None),
     "proto-plus": ("https://proto-plus-python.readthedocs.io/en/latest/", None),
+    "protobuf": ("https://googleapis.dev/python/protobuf/latest/", None),
     
 }
 
diff --git a/owlbot.py b/owlbot.py
diff --git a/synth.metadata b/synth.metadata

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+docker:`
	`2`	`+ image: gcr.io/repo-automation-bots/owlbot-python:latest`
	`3`	`+ digest: sha256:c66ba3c8d7bc8566f47df841f98cd0097b28fff0b1864c86f5817f4c8c3e8600`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"client_documentation": "https://googleapis.dev/python/google-cloud-core/latest",`
`5`	`5`	`"release_level": "ga",`
`6`	`6`	`"language": "python",`
	`7`	`+ "library_type": "CORE",`
`7`	`8`	`"repo": "googleapis/python-cloud-core",`
`8`	`9`	`"distribution_name": "google-cloud-core"`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,7 @@`
`366`	`366`	`),`
`367`	`367`	`"grpc": ("https://grpc.github.io/grpc/python/", None),`
`368`	`368`	`"proto-plus": ("https://proto-plus-python.readthedocs.io/en/latest/", None),`
	`369`	`+ "protobuf": ("https://googleapis.dev/python/protobuf/latest/", None),`
`369`	`370`
`370`	`371`	`}`
`371`	`372`