diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fbce9af9ae..6216a22070 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 325c11cac2..2d12bbf62a 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 64e7091c67..248342b95d 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 19e8ba4c5c..e69286ef3f 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/CONTRIBUTING.md b/CONTRIBUTING.md index 183ed668cd..5be905b319 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 14f5e2d2dd..4e117c00da 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 ede542aaf0..de654af183 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 c5afa706fd..f2c65053a3 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 63ee9d563b..caba774bb4 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 a7f451509a..3f3536204a 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/hello-world/flexible/README.md b/appengine/hello-world/flexible/README.md index 1b7e929822..62116429ef 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 27c3cfa2e4..e1597c1dfa 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/typescript/README.md b/appengine/typescript/README.md index ee4afddbac..bc311598c9 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 3e76440010..15f7c7d8df 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/containerengine/hello-world/README.md b/containerengine/hello-world/README.md index fad5bcf870..5395bc87d7 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 333817fbc4..1aa2c7087e 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/eventarc/audit-storage/README.md b/eventarc/audit-storage/README.md index bc3a7a8613..1c5444ae30 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 6703d311e9..aac6ff22c4 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/hello-broken/README.md b/run/hello-broken/README.md index 459b7073a0..331c5b973f 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 7e5d3e9477..e08f381e3d 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 ff56eab104..b5e5785534 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 f2a27d7e7b..f75dd45229 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 b4e7a72add..13cce9a4ba 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 61d6232f6a..779ac79638 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 5f714ffe3a..ef01de7939 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/pubsub/README.md b/run/pubsub/README.md index bd546bf022..9d002113a6 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 15db4f6639..9e894162ab 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 2f516f0652..786113058c 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