internal: small CONTRIBUTING.md and kokoro fixes
- Instructions for authorization of go-storage-notification-test
- Make sure the region in the KMS key is 'global' in order for storage tests to work
Change-Id: I86adb2fd4cfd0c96a38f5055b5d0475f9b20b1e9
Reviewed-on: https://code-review.googlesource.com/c/34413
Reviewed-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Eno Compton <enocom@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b8c4d2..4e70c5d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -87,6 +87,8 @@
# Create a PubSub topic for integration tests of storage notifications.
$ gcloud beta pubsub topics create go-storage-notification-test
+# Next, go to the Pub/Sub dashboard in GCP console. Authorize the user
+# "service-<numberic project id>@gs-project-accounts.iam.gserviceaccount.com" as a publisher to that topic.
# Create a Spanner instance for the spanner integration tests.
$ gcloud beta spanner instances create go-integration-test --config regional-us-central1 --nodes 1 --description 'Instance for go client test'
@@ -96,7 +98,7 @@
# For Storage integration tests:
# Enable KMS for your project in the Cloud Console.
$ export MY_KEYRING=some-keyring-name
-$ export MY_LOCATION=us-east1
+$ export MY_LOCATION=global
# Create a KMS keyring, in the same location as the default location for your project's buckets.
$ gcloud kms keyrings create $MY_KEYRING --location $MY_LOCATION
# Create two keys in the keyring, named key1 and key2.
diff --git a/internal/kokoro/continuous.sh b/internal/kokoro/continuous.sh
index 6c0fdb6..ec5deea 100755
--- a/internal/kokoro/continuous.sh
+++ b/internal/kokoro/continuous.sh
@@ -6,7 +6,7 @@
export GCLOUD_TESTS_GOLANG_FIRESTORE_PROJECT_ID=deklerk-kokoro-firestore
export GCLOUD_TESTS_GOLANG_FIRESTORE_KEY=$KOKORO_KEYSTORE_DIR/72523_go_firestore_integration_service_account
export GCLOUD_TESTS_API_KEY=`cat $KOKORO_KEYSTORE_DIR/72523_go_gcloud_tests_api_key`
-export GCLOUD_TESTS_GOLANG_KEYRING=projects/deklerk-kokoro-sandbox/locations/us-east1/keyRings/deklerk-kokoro-keyring
+export GCLOUD_TESTS_GOLANG_KEYRING=projects/deklerk-kokoro-sandbox/locations/global/keyRings/deklerk-kokoro-keyring-3
# Fail on any error
set -eo pipefail
