From 5c0ca1f59ee6ebf13e1217ff1a3cc17f25835f8e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 12 Aug 2021 10:51:34 -0700 Subject: [PATCH 1/5] fix(build): migrate to using main branch --- .github/workflows/ci.yaml | 2 +- .kokoro/build-with-appengine.sh | 2 +- .kokoro/build-with-run.sh | 2 +- .kokoro/build.sh | 2 +- .kokoro/region-tags-tests.sh | 2 +- CONTRIBUTING.md | 2 +- appengine/README.md | 2 +- appengine/analytics/README.md | 2 +- appengine/building-an-app/build/README.md | 2 +- appengine/building-an-app/update/README.md | 2 +- appengine/datastore/README.md | 2 +- appengine/datastore/app.js | 2 +- appengine/endpoints/README.md | 2 +- appengine/hello-world/flexible/README.md | 2 +- appengine/hello-world/standard/README.md | 2 +- appengine/pubsub/app.js | 2 +- appengine/storage/flexible/app.js | 2 +- appengine/storage/standard/app.js | 2 +- appengine/typescript/README.md | 2 +- appengine/websockets/README.md | 2 +- auth/auth.js | 2 +- containerengine/hello-world/README.md | 2 +- datastore/functions/README.md | 2 +- endpoints/getting-started-grpc/api_config.jwt.yaml | 2 +- endpoints/getting-started-grpc/api_config.key.yaml | 2 +- endpoints/getting-started/README.md | 2 +- eventarc/audit-storage/README.md | 2 +- eventarc/pubsub/README.md | 2 +- run/README.md | 2 +- run/hello-broken/README.md | 2 +- run/helloworld/README.md | 2 +- run/idp-sql/README.md | 2 +- run/idp-sql/cloud-sql.js | 2 +- run/image-processing/README.md | 2 +- run/logging-manual/README.md | 2 +- run/markdown-preview/README.md | 2 +- run/markdown-preview/renderer/app.js | 2 +- run/pubsub/README.md | 2 +- run/system-package/README.md | 2 +- run/websockets/README.md | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fbce9af9aea..6216a22070e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: diff --git a/.kokoro/build-with-appengine.sh b/.kokoro/build-with-appengine.sh index 325c11cac21..2d12bbf62ab 100755 --- a/.kokoro/build-with-appengine.sh +++ b/.kokoro/build-with-appengine.sh @@ -61,7 +61,7 @@ trap cleanup EXIT HUP # Install dependencies and run tests npm install -# If tests are running against master, configure FlakyBot +# If tests are running against main, configure FlakyBot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then export MOCHA_REPORTER_SUITENAME=${PROJECT} diff --git a/.kokoro/build-with-run.sh b/.kokoro/build-with-run.sh index 64e7091c67b..248342b95dc 100755 --- a/.kokoro/build-with-run.sh +++ b/.kokoro/build-with-run.sh @@ -62,7 +62,7 @@ export SERVICE_NAME="${SAMPLE_NAME}-${SUFFIX}" export NODE_ENV=development npm install -# If tests are running against master, configure FlakyBot +# If tests are running against main, configure FlakyBot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then export MOCHA_REPORTER_SUITENAME=${PROJECT} diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 19e8ba4c5c1..e69286ef3fc 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -126,7 +126,7 @@ if [[ $SQL_CLIENT ]]; then fi fi -# If tests are running against master, configure FlakyBot +# If tests are running against main, configure FlakyBot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then export MOCHA_REPORTER_SUITENAME=${PROJECT} diff --git a/.kokoro/region-tags-tests.sh b/.kokoro/region-tags-tests.sh index 9911da289f4..fbf917e6455 100755 --- a/.kokoro/region-tags-tests.sh +++ b/.kokoro/region-tags-tests.sh @@ -26,7 +26,7 @@ echo '=================================================================' # Fetch XUnit CI enforcer script # curl-ing it ensures we get the latest version -curl "https://raw.githubusercontent.com/GoogleCloudPlatform/repo-automation-playground/master/xunit-ci-enforcer/region_tag_enforcer.sh" > enforcer.sh +curl "https://raw.githubusercontent.com/GoogleCloudPlatform/repo-automation-playground/main/xunit-ci-enforcer/region_tag_enforcer.sh" > enforcer.sh chmod +x enforcer.sh # Run enforcer on appropriate directories diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 183ed668cde..5be905b319b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ need to enable the appropriate APIs in the [Cloud Console](https://console.cloud All samples must have tests. We use `mocha` as testing framework. -Add a **build configuration file (`.cfg`)** for your samples in **[`.kokoro/`](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/.kokoro)**. Check existing config files for the right format. +Add a **build configuration file (`.cfg`)** for your samples in **[`.kokoro/`](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/.kokoro)**. Check existing config files for the right format. All tests need a corresponding job file outside of GitHub. If you are a Googler, please provide the CL alongside your PR. See the internal codelab for Kokoro for details. If you don't work at Google, the person reviewing your PR will create the job config for you. diff --git a/appengine/README.md b/appengine/README.md index 730e84cfeac..4cc00ef7f99 100644 --- a/appengine/README.md +++ b/appengine/README.md @@ -102,5 +102,5 @@ View the [Community-contributed App Engine Node.js samples][community_samples]. [sdk]: https://cloud.google.com/sdk/ [console]: https://console.cloud.google.com [billing]: https://support.google.com/cloud/answer/6293499#enable-billing -[official_samples]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/appengine +[official_samples]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/appengine [community_samples]: https://cloud.google.com/community/tutorials/?q=%22Node.js%22 diff --git a/appengine/analytics/README.md b/appengine/analytics/README.md index ede542aaf05..de654af183d 100644 --- a/appengine/analytics/README.md +++ b/appengine/analytics/README.md @@ -51,4 +51,4 @@ See [Contributing][contributing]. [std-tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/integrating-with-analytics [readme]: ../README.md [tracking]: https://support.google.com/analytics/answer/1042508 -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/building-an-app/build/README.md b/appengine/building-an-app/build/README.md index c5afa706fd3..f2c65053a3f 100644 --- a/appengine/building-an-app/build/README.md +++ b/appengine/building-an-app/build/README.md @@ -35,4 +35,4 @@ See [Contributing][contributing]. [appengine]: https://cloud.google.com/appengine/docs/standard/nodejs [tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/building-app/writing-web-service [readme]: ../../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/building-an-app/update/README.md b/appengine/building-an-app/update/README.md index 63ee9d563bb..caba774bb4e 100644 --- a/appengine/building-an-app/update/README.md +++ b/appengine/building-an-app/update/README.md @@ -35,4 +35,4 @@ See [Contributing][contributing]. [appengine]: https://cloud.google.com/appengine/docs/standard/nodejs [tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/building-app/updating-web-service [readme]: ../../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/datastore/README.md b/appengine/datastore/README.md index a7f451509a5..3f3536204a5 100644 --- a/appengine/datastore/README.md +++ b/appengine/datastore/README.md @@ -43,4 +43,4 @@ See [Contributing][contributing]. [tutorial-std]: https://cloud.google.com/appengine/docs/standard/nodejs/using-cloud-datastore [tutorial-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs/using-cloud-datastore [readme]: ../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/datastore/app.js b/appengine/datastore/app.js index a8ea6bb4ad8..af14aee204a 100644 --- a/appengine/datastore/app.js +++ b/appengine/datastore/app.js @@ -24,7 +24,7 @@ app.enable('trust proxy'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Datastore} = require('@google-cloud/datastore'); diff --git a/appengine/endpoints/README.md b/appengine/endpoints/README.md index 35ecb1ab37b..6fb60da818d 100644 --- a/appengine/endpoints/README.md +++ b/appengine/endpoints/README.md @@ -44,4 +44,4 @@ If you're running locally, you won't need an API key. No Node.js client is written yet, but you can try the Python client found [here][python-client]. It will send authenticated JWT requests using a Google Cloud service account, or using a three-legged OAuth flow. -[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/endpoints/getting-started/clients/google-jwt-client.py +[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/endpoints/getting-started/clients/google-jwt-client.py diff --git a/appengine/hello-world/flexible/README.md b/appengine/hello-world/flexible/README.md index 1b7e929822c..62116429ef1 100644 --- a/appengine/hello-world/flexible/README.md +++ b/appengine/hello-world/flexible/README.md @@ -35,4 +35,4 @@ See [Contributing][contributing]. [appengine]: https://cloud.google.com/appengine/docs/flexible/nodejs [tutorial]: https://cloud.google.com/appengine/docs/flexible/nodejs/quickstart [readme]: ../../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/hello-world/standard/README.md b/appengine/hello-world/standard/README.md index 27c3cfa2e49..e1597c1dfa6 100644 --- a/appengine/hello-world/standard/README.md +++ b/appengine/hello-world/standard/README.md @@ -35,4 +35,4 @@ See [Contributing][contributing]. [appengine]: https://cloud.google.com/appengine/docs/standard/nodejs [tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/quickstart [readme]: ../../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/pubsub/app.js b/appengine/pubsub/app.js index 6876b8cc974..ff4f42a1308 100644 --- a/appengine/pubsub/app.js +++ b/appengine/pubsub/app.js @@ -22,7 +22,7 @@ const process = require('process'); // Required for mocking environment variable // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md // These environment variables are set automatically on Google App Engine const {PubSub} = require('@google-cloud/pubsub'); diff --git a/appengine/storage/flexible/app.js b/appengine/storage/flexible/app.js index 624f61d4d47..7661d286fa1 100644 --- a/appengine/storage/flexible/app.js +++ b/appengine/storage/flexible/app.js @@ -24,7 +24,7 @@ const Multer = require('multer'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Storage} = require('@google-cloud/storage'); diff --git a/appengine/storage/standard/app.js b/appengine/storage/standard/app.js index 1f5f5e3dfdd..739ed8dcc47 100644 --- a/appengine/storage/standard/app.js +++ b/appengine/storage/standard/app.js @@ -24,7 +24,7 @@ const Multer = require('multer'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Storage} = require('@google-cloud/storage'); diff --git a/appengine/typescript/README.md b/appengine/typescript/README.md index ee4afddbacb..bc311598c97 100644 --- a/appengine/typescript/README.md +++ b/appengine/typescript/README.md @@ -35,4 +35,4 @@ Deploy to App Engine Flexible by [modifying `app.yaml`][app_yaml]. [appengine]: https://cloud.google.com/appengine/docs/standard/nodejs [app_yaml]: https://cloud.google.com/appengine/docs/flexible/nodejs/configuring-your-app-with-app-yaml [tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/quickstart -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/appengine/websockets/README.md b/appengine/websockets/README.md index 3e764400108..15f7c7d8dfd 100644 --- a/appengine/websockets/README.md +++ b/appengine/websockets/README.md @@ -38,5 +38,5 @@ See [Contributing][contributing]. [appengine]: https://cloud.google.com/appengine/docs/flexible/nodejs [readme]: ../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/auth/auth.js b/auth/auth.js index bf57432d9dd..0e31fdd35d5 100644 --- a/auth/auth.js +++ b/auth/auth.js @@ -54,7 +54,7 @@ const authCloudExplicit = async ({projectId, keyFilename}) => { // Instantiates a client. Explicitly use service account credentials by // specifying the private key file. All clients in google-cloud-node have this - // helper, see https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md + // helper, see https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md // const projectId = 'project-id' // const keyFilename = '/path/to/keyfile.json' const storage = new Storage({projectId, keyFilename}); diff --git a/containerengine/hello-world/README.md b/containerengine/hello-world/README.md index fad5bcf8708..5395bc87d72 100644 --- a/containerengine/hello-world/README.md +++ b/containerengine/hello-world/README.md @@ -26,4 +26,4 @@ View the [documentation][docs] or the [source code][code]. See [Contributing][contributing]. -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md diff --git a/datastore/functions/README.md b/datastore/functions/README.md index 333817fbc4d..1aa2c7087ef 100644 --- a/datastore/functions/README.md +++ b/datastore/functions/README.md @@ -21,7 +21,7 @@ Functions for your project. 1. Ensure the Cloud Datastore API is enabled: - [Click here to enable the Cloud Datastore API](https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com&redirect=https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/functions/datastore) + [Click here to enable the Cloud Datastore API](https://console.cloud.google.com/flows/enableapi?apiid=datastore.googleapis.com&redirect=https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/functions/datastore) 1. Deploy the "get" function with an HTTP trigger: diff --git a/endpoints/getting-started-grpc/api_config.jwt.yaml b/endpoints/getting-started-grpc/api_config.jwt.yaml index 425cd888e8c..8d9e63e286d 100644 --- a/endpoints/getting-started-grpc/api_config.jwt.yaml +++ b/endpoints/getting-started-grpc/api_config.jwt.yaml @@ -19,7 +19,7 @@ # # The configuration schema is defined by service.proto file -# https://github.com/googleapis/googleapis/blob/master/google/api/service.proto +# https://github.com/googleapis/googleapis/blob/main/google/api/service.proto type: google.api.Service config_version: 3 diff --git a/endpoints/getting-started-grpc/api_config.key.yaml b/endpoints/getting-started-grpc/api_config.key.yaml index 143c0d08404..82c074ecdcc 100644 --- a/endpoints/getting-started-grpc/api_config.key.yaml +++ b/endpoints/getting-started-grpc/api_config.key.yaml @@ -19,7 +19,7 @@ # # The configuration schema is defined by service.proto file -# https://github.com/googleapis/googleapis/blob/master/google/api/service.proto +# https://github.com/googleapis/googleapis/blob/main/google/api/service.proto type: google.api.Service config_version: 3 diff --git a/endpoints/getting-started/README.md b/endpoints/getting-started/README.md index 67898f80070..5c8ff0fb65e 100644 --- a/endpoints/getting-started/README.md +++ b/endpoints/getting-started/README.md @@ -36,4 +36,4 @@ If you're running locally, you won't need an API key. No Node.js client is written yet, but you can try the Python client found [here][python-client]. It will send authenticated JWT requests using a Google Cloud service account, or using a three-legged OAuth flow. -[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/endpoints/getting-started +[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/endpoints/getting-started diff --git a/eventarc/audit-storage/README.md b/eventarc/audit-storage/README.md index bc3a7a86139..1c5444ae306 100644 --- a/eventarc/audit-storage/README.md +++ b/eventarc/audit-storage/README.md @@ -2,7 +2,7 @@ This sample shows how to create a service that processes GCS events. -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Dependencies diff --git a/eventarc/pubsub/README.md b/eventarc/pubsub/README.md index 6703d311e98..aac6ff22c40 100644 --- a/eventarc/pubsub/README.md +++ b/eventarc/pubsub/README.md @@ -2,7 +2,7 @@ This sample shows how to create a service that processes Pub/Sub messages. -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Dependencies diff --git a/run/README.md b/run/README.md index fd007e60897..697a2d7ed10 100644 --- a/run/README.md +++ b/run/README.md @@ -144,7 +144,7 @@ for more information. [mysql]: ../cloud-sql/mysql/mysql [postgres]: ../cloud-sql/postgres/knex [hello_broken]: hello-broken/ -[idtoken]: https://github.com/googleapis/google-auth-library-nodejs/blob/master/samples/idtokens-serverless.js +[idtoken]: https://github.com/googleapis/google-auth-library-nodejs/blob/main/samples/idtokens-serverless.js [preview]: markdown-preview/ [idp-sql]: idp-sql/ diff --git a/run/hello-broken/README.md b/run/hello-broken/README.md index 459b7073a0d..331c5b973f1 100644 --- a/run/hello-broken/README.md +++ b/run/hello-broken/README.md @@ -6,7 +6,7 @@ errors and default values. Use it with the [Local Container Troubleshooting tutorial](http://cloud.google.com/run/docs/tutorials/local-troubleshooting). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Local Development diff --git a/run/helloworld/README.md b/run/helloworld/README.md index 7e5d3e94771..e08f381e3d3 100644 --- a/run/helloworld/README.md +++ b/run/helloworld/README.md @@ -2,7 +2,7 @@ This sample shows how to deploy a Hello World application to Cloud Run. -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Local Development diff --git a/run/idp-sql/README.md b/run/idp-sql/README.md index ff56eab104a..b5e57855342 100644 --- a/run/idp-sql/README.md +++ b/run/idp-sql/README.md @@ -5,7 +5,7 @@ application and connects to a Cloud SQL postgreSQL database for data storage. Use it with the [End user Authentication for Cloud Run](http://cloud.google.com/run/docs/tutorials/identity-platform). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). [![Run on Google Cloud](https://deploy.cloud.run/button.svg)](https://deploy.cloud.run/?git_repo=https://github.com/GoogleCloudPlatform/nodejs-docs-samples&dir=run/idp-sql) diff --git a/run/idp-sql/cloud-sql.js b/run/idp-sql/cloud-sql.js index f2a27d7e7b1..f75dd452293 100644 --- a/run/idp-sql/cloud-sql.js +++ b/run/idp-sql/cloud-sql.js @@ -20,7 +20,7 @@ const TABLE = process.env.TABLE || 'pet_votes'; let knex, credConfig; // Connection pooling config -// See Cloud SQL sample https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/cloud-sql/postgres/knex +// See Cloud SQL sample https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/cloud-sql/postgres/knex // to learn more about this configuration const config = { pool: { diff --git a/run/image-processing/README.md b/run/image-processing/README.md index b4e7a72add4..13cce9a4ba8 100644 --- a/run/image-processing/README.md +++ b/run/image-processing/README.md @@ -4,7 +4,7 @@ This sample service applies [Cloud Storage](https://cloud.google.com/storage/doc Use it with the [Image Processing with Cloud Run tutorial](http://cloud.google.com/run/docs/tutorials/image-processing). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Dependencies diff --git a/run/logging-manual/README.md b/run/logging-manual/README.md index 61d6232f6ac..779ac796380 100644 --- a/run/logging-manual/README.md +++ b/run/logging-manual/README.md @@ -4,7 +4,7 @@ This sample shows how to send structured logs to Stackdriver Logging. Read more about Cloud Run logging in the [Logging How-to Guide](http://cloud.google.com/run/docs/logging). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Local Development diff --git a/run/markdown-preview/README.md b/run/markdown-preview/README.md index 5f714ffe3ae..ef01de79398 100644 --- a/run/markdown-preview/README.md +++ b/run/markdown-preview/README.md @@ -2,7 +2,7 @@ [Securing Cloud Run services tutorial](https://cloud.google.com/run/docs/tutorials/secure-services) walks through how to create a secure two-service application running on Cloud Run. This application is a Markdown editor which includes a public "frontend" service which anyone can use to compose Markdown text and a private "backend" service which renders Markdown text to HTML. -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Environment Variables diff --git a/run/markdown-preview/renderer/app.js b/run/markdown-preview/renderer/app.js index a984b370453..ceddd056b2d 100644 --- a/run/markdown-preview/renderer/app.js +++ b/run/markdown-preview/renderer/app.js @@ -29,7 +29,7 @@ app.post('/', (req, res) => { try { // Get the Markdown text and convert it into HTML using markdown-it. // For details about XSS prevention in markdown-it, - // see https://github.com/markdown-it/markdown-it/blob/master/docs/security.md + // see https://github.com/markdown-it/markdown-it/blob/main/docs/security.md const md = new MarkdownIt(); const html = md.render(markdown); res.status(200).send(html); diff --git a/run/pubsub/README.md b/run/pubsub/README.md index bd546bf0225..9d002113a6e 100644 --- a/run/pubsub/README.md +++ b/run/pubsub/README.md @@ -4,7 +4,7 @@ This sample shows how to create a service that processes Pub/Sub messages. Use it with the [Cloud Pub/Sub with Cloud Run tutorial](http://cloud.google.com/run/docs/tutorials/pubsub). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Dependencies diff --git a/run/system-package/README.md b/run/system-package/README.md index 15db4f6639b..9e894162ab9 100644 --- a/run/system-package/README.md +++ b/run/system-package/README.md @@ -4,7 +4,7 @@ This sample shows how to use a CLI tool installed as a system package as part of Use it with the [Using system packages tutorial](https://cloud.google.com/run/docs/tutorials/system-packages). -For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/master/run). +For more details on how to work with this sample read the [Google Cloud Run Node.js Samples README](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/tree/main/run). ## Dependencies diff --git a/run/websockets/README.md b/run/websockets/README.md index 2f516f0652c..786113058cd 100644 --- a/run/websockets/README.md +++ b/run/websockets/README.md @@ -52,5 +52,5 @@ See [Contributing][contributing]. [run]: https://cloud.google.com/run/docs [readme]: ../README.md -[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md From 68f4863e0307231a5645d1ed5633b2616c2bc6e2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 13 Aug 2021 12:10:04 -0700 Subject: [PATCH 2/5] update link --- appengine/endpoints/README.md | 2 +- endpoints/getting-started/README.md | 2 +- run/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appengine/endpoints/README.md b/appengine/endpoints/README.md index 6fb60da818d..35ecb1ab37b 100644 --- a/appengine/endpoints/README.md +++ b/appengine/endpoints/README.md @@ -44,4 +44,4 @@ If you're running locally, you won't need an API key. No Node.js client is written yet, but you can try the Python client found [here][python-client]. It will send authenticated JWT requests using a Google Cloud service account, or using a three-legged OAuth flow. -[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/endpoints/getting-started/clients/google-jwt-client.py +[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/endpoints/getting-started/clients/google-jwt-client.py diff --git a/endpoints/getting-started/README.md b/endpoints/getting-started/README.md index 5c8ff0fb65e..67898f80070 100644 --- a/endpoints/getting-started/README.md +++ b/endpoints/getting-started/README.md @@ -36,4 +36,4 @@ If you're running locally, you won't need an API key. No Node.js client is written yet, but you can try the Python client found [here][python-client]. It will send authenticated JWT requests using a Google Cloud service account, or using a three-legged OAuth flow. -[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/endpoints/getting-started +[python-client]: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/endpoints/getting-started diff --git a/run/README.md b/run/README.md index 697a2d7ed10..fd007e60897 100644 --- a/run/README.md +++ b/run/README.md @@ -144,7 +144,7 @@ for more information. [mysql]: ../cloud-sql/mysql/mysql [postgres]: ../cloud-sql/postgres/knex [hello_broken]: hello-broken/ -[idtoken]: https://github.com/googleapis/google-auth-library-nodejs/blob/main/samples/idtokens-serverless.js +[idtoken]: https://github.com/googleapis/google-auth-library-nodejs/blob/master/samples/idtokens-serverless.js [preview]: markdown-preview/ [idp-sql]: idp-sql/ From a72712131fbbd3d315f85caca5e3f47631579489 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 13 Aug 2021 12:19:58 -0700 Subject: [PATCH 3/5] fix: revert links that referenced main that have not been migrated --- appengine/datastore/app.js | 2 +- appengine/pubsub/app.js | 2 +- appengine/storage/flexible/app.js | 2 +- appengine/storage/standard/app.js | 2 +- auth/auth.js | 2 +- endpoints/getting-started-grpc/api_config.jwt.yaml | 2 +- endpoints/getting-started-grpc/api_config.key.yaml | 2 +- run/markdown-preview/renderer/app.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appengine/datastore/app.js b/appengine/datastore/app.js index af14aee204a..a8ea6bb4ad8 100644 --- a/appengine/datastore/app.js +++ b/appengine/datastore/app.js @@ -24,7 +24,7 @@ app.enable('trust proxy'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Datastore} = require('@google-cloud/datastore'); diff --git a/appengine/pubsub/app.js b/appengine/pubsub/app.js index ff4f42a1308..6876b8cc974 100644 --- a/appengine/pubsub/app.js +++ b/appengine/pubsub/app.js @@ -22,7 +22,7 @@ const process = require('process'); // Required for mocking environment variable // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md // These environment variables are set automatically on Google App Engine const {PubSub} = require('@google-cloud/pubsub'); diff --git a/appengine/storage/flexible/app.js b/appengine/storage/flexible/app.js index 7661d286fa1..624f61d4d47 100644 --- a/appengine/storage/flexible/app.js +++ b/appengine/storage/flexible/app.js @@ -24,7 +24,7 @@ const Multer = require('multer'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Storage} = require('@google-cloud/storage'); diff --git a/appengine/storage/standard/app.js b/appengine/storage/standard/app.js index 739ed8dcc47..1f5f5e3dfdd 100644 --- a/appengine/storage/standard/app.js +++ b/appengine/storage/standard/app.js @@ -24,7 +24,7 @@ const Multer = require('multer'); // By default, the client will authenticate using the service account file // specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use // the project specified by the GOOGLE_CLOUD_PROJECT environment variable. See -// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md +// https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md // These environment variables are set automatically on Google App Engine const {Storage} = require('@google-cloud/storage'); diff --git a/auth/auth.js b/auth/auth.js index 0e31fdd35d5..bf57432d9dd 100644 --- a/auth/auth.js +++ b/auth/auth.js @@ -54,7 +54,7 @@ const authCloudExplicit = async ({projectId, keyFilename}) => { // Instantiates a client. Explicitly use service account credentials by // specifying the private key file. All clients in google-cloud-node have this - // helper, see https://github.com/GoogleCloudPlatform/google-cloud-node/blob/main/docs/authentication.md + // helper, see https://github.com/GoogleCloudPlatform/google-cloud-node/blob/master/docs/authentication.md // const projectId = 'project-id' // const keyFilename = '/path/to/keyfile.json' const storage = new Storage({projectId, keyFilename}); diff --git a/endpoints/getting-started-grpc/api_config.jwt.yaml b/endpoints/getting-started-grpc/api_config.jwt.yaml index 8d9e63e286d..425cd888e8c 100644 --- a/endpoints/getting-started-grpc/api_config.jwt.yaml +++ b/endpoints/getting-started-grpc/api_config.jwt.yaml @@ -19,7 +19,7 @@ # # The configuration schema is defined by service.proto file -# https://github.com/googleapis/googleapis/blob/main/google/api/service.proto +# https://github.com/googleapis/googleapis/blob/master/google/api/service.proto type: google.api.Service config_version: 3 diff --git a/endpoints/getting-started-grpc/api_config.key.yaml b/endpoints/getting-started-grpc/api_config.key.yaml index 82c074ecdcc..143c0d08404 100644 --- a/endpoints/getting-started-grpc/api_config.key.yaml +++ b/endpoints/getting-started-grpc/api_config.key.yaml @@ -19,7 +19,7 @@ # # The configuration schema is defined by service.proto file -# https://github.com/googleapis/googleapis/blob/main/google/api/service.proto +# https://github.com/googleapis/googleapis/blob/master/google/api/service.proto type: google.api.Service config_version: 3 diff --git a/run/markdown-preview/renderer/app.js b/run/markdown-preview/renderer/app.js index ceddd056b2d..a984b370453 100644 --- a/run/markdown-preview/renderer/app.js +++ b/run/markdown-preview/renderer/app.js @@ -29,7 +29,7 @@ app.post('/', (req, res) => { try { // Get the Markdown text and convert it into HTML using markdown-it. // For details about XSS prevention in markdown-it, - // see https://github.com/markdown-it/markdown-it/blob/main/docs/security.md + // see https://github.com/markdown-it/markdown-it/blob/master/docs/security.md const md = new MarkdownIt(); const html = md.render(markdown); res.status(200).send(html); From 923b9b9f9129b057a82bfcc26117e1b302747e63 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 13 Aug 2021 12:20:54 -0700 Subject: [PATCH 4/5] fix last link --- .kokoro/region-tags-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/region-tags-tests.sh b/.kokoro/region-tags-tests.sh index fbf917e6455..9911da289f4 100755 --- a/.kokoro/region-tags-tests.sh +++ b/.kokoro/region-tags-tests.sh @@ -26,7 +26,7 @@ echo '=================================================================' # Fetch XUnit CI enforcer script # curl-ing it ensures we get the latest version -curl "https://raw.githubusercontent.com/GoogleCloudPlatform/repo-automation-playground/main/xunit-ci-enforcer/region_tag_enforcer.sh" > enforcer.sh +curl "https://raw.githubusercontent.com/GoogleCloudPlatform/repo-automation-playground/master/xunit-ci-enforcer/region_tag_enforcer.sh" > enforcer.sh chmod +x enforcer.sh # Run enforcer on appropriate directories From d967080fb9e25ae16140e3c8d5480af4d1ca52ca Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 13 Aug 2021 15:27:50 -0700 Subject: [PATCH 5/5] kick off tests