Merge branch 'master' into fix-crypto-key-path

Author: busunkim96

.github/blunderbuss.yml

@@ -4,9 +4,11 @@ assign_issues:
   - leahecole
   - gguuss
   - crwilcox
+  - tmatsuo
 assign_prs:
   - busunkim96
   - kurtisvg
   - leahecole
   - gguuss
   - crwilcox
+  - tmatsuo

CONTRIBUTING.md

@@ -36,3 +36,7 @@ be able to accept your pull requests.
 ## Authoring, testing, and contributing samples
 
 See [AUTHORING_GUIDE.md](AUTHORING_GUIDE.md).
+
+## Code Reviews
+
+After meeting the above criteria, your code will need to be approved by two reviewers before it can be merged into master. One will be a [CODEOWNER](.github/CODEOWNERS) for the product you are contributing to, and the other will be a repo owner, there to double check for anything that might be detrimental to the overall repo health (things that could cause future tech debt, test flakiness, etc.). Both will automatically be assigned. Some product areas have mulitple folks who can act as the CODEOWNER, and you may be working more closely with a teammate who isn't the automatically assigned reviewer. In that case, it is perfectly fine to manually assign the teammate more familiar with this work as your CODEOWNER reviewer. If you do not hear from your repo owner reviewer within a day (and you know they are not OOO), send them a friendly ping so that you can better understand the review cadence for your PR. All the repo owners are juggling reviews alongside other work, and their velocities can vary, but they are happy to hear from you. If you see that your repo owner reviewer is OOO, you can use the "blunderbuss: assign" label to assign a new reviewer. 

blog/introduction_to_data_models_in_cloud_datastore/blog_test.py

@@ -13,7 +13,7 @@
 
 import os
 
-from gcp_devrel.testing.flaky import flaky
+from flaky import flaky
 
 from blog import main
 

blog/introduction_to_data_models_in_cloud_datastore/requirements-test.txt

@@ -1,3 +1,2 @@
 pytest==5.3.2
-gcp-devrel-py-tools==0.0.15
 flaky==3.6.1

blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py

@@ -13,7 +13,7 @@
 
 import os
 
-from gcp_devrel.testing.flaky import flaky
+from flaky import flaky
 
 from wiki import main
 

compute/api/create_instance_test.py

@@ -12,14 +12,15 @@
 # limitations under the License.
 
 import os
-import re
+import uuid
 
-from gcp_devrel.testing.flaky import flaky
+from flaky import flaky
 
 from create_instance import main
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 BUCKET = os.environ['CLOUD_STORAGE_BUCKET']
+INSTANCE_NAME = 'test-instance-' + str(uuid.uuid4())
 
 
 @flaky
@@ -28,14 +29,12 @@ def test_main(capsys):
         PROJECT,
         BUCKET,
         'us-central1-f',
-        'test-instance',
+        INSTANCE_NAME,
         wait=False)
 
     out, _ = capsys.readouterr()
 
-    expected_output = re.compile(
-        (r'Instances in project .* and zone us-central1-.* - test-instance'
-         r'.*Deleting instance.*done..$'),
-        re.DOTALL)
-
-    assert re.search(expected_output, out)
+    assert "Instances in project" in out
+    assert "zone us-central1-f" in out
+    assert INSTANCE_NAME in out
+    assert "Deleting instance" in out

compute/api/requirements-test.txt

@@ -1,3 +1,2 @@
 pytest==5.3.2
-gcp-devrel-py-tools==0.0.15
 flaky==3.6.1

jobs/v3/api_client/quickstart_test.py

@@ -11,7 +11,7 @@
 # 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.
-from gcp_devrel.testing.flaky import flaky
+from flaky import flaky
 
 
 @flaky

jobs/v3/api_client/requirements-test.txt

@@ -1,4 +1,4 @@
 pytest==5.3.2
-gcp-devrel-py-tools==0.0.15
 google-cloud-core
+gcp-devrel-py-tools==0.0.16
 flaky==3.6.1