chore(fixit): remove redundant region tags (#3676)

* chore(fixit): remove redundant region tags

Manually searched docs and confirmed no references remain.

Removed these tags:
run_user_auth_secrets
run_broken_service_upgrade
run_broken_service_problem
run_broken_service
run_pubsub_server
run_pubsub_server_setup
run_pubsub_handler
run_manual_logging
run_imageproc_handler_setup
run_imageproc_handler_blur
run_imageproc_handler_analyze
run_imageproc_controller
run_imageproc_server

* expand license headers to current format

Author: briandorsey

run/hello-broken/index.js

@@ -13,34 +13,29 @@
 // limitations under the License.
 
 // [START cloudrun_broken_service]
-// [START run_broken_service]
 const express = require('express');
 const app = express();
 
 app.get('/', (req, res) => {
   console.log('hello: received request.');
 
   // [START cloudrun_broken_service_problem]
-  // [START run_broken_service_problem]
   const {NAME} = process.env;
   if (!NAME) {
     // Plain error logs do not appear in Stackdriver Error Reporting.
     console.error('Environment validation failed.');
     console.error(new Error('Missing required server parameter'));
     return res.status(500).send('Internal Server Error');
   }
-  // [END run_broken_service_problem]
   // [END cloudrun_broken_service_problem]
   res.send(`Hello ${NAME}!`);
 });
-// [END run_broken_service]
 // [END cloudrun_broken_service]
 
 app.get('/improved', (req, res) => {
   console.log('hello: received request.');
 
   // [START cloudrun_broken_service_upgrade]
-  // [START run_broken_service_upgrade]
   const NAME = process.env.NAME || 'World';
   if (!process.env.NAME) {
     console.log(
@@ -50,16 +45,13 @@ app.get('/improved', (req, res) => {
       })
     );
   }
-  // [END run_broken_service_upgrade]
   // [END cloudrun_broken_service_upgrade]
   res.send(`Hello ${NAME}!`);
 });
 
 // [START cloudrun_broken_service]
-// [START run_broken_service]
 const port = parseInt(process.env.PORT) || 8080;
 app.listen(port, () => {
   console.log(`hello: listening on port ${port}`);
 });
-// [END run_broken_service]
 // [END cloudrun_broken_service]

run/idp-sql/secrets.js

@@ -17,7 +17,6 @@ const {logger} = require('./logging');
 // Load the Cloud SQL config from Secret Manager
 function getCredConfig() {
   // [START cloudrun_user_auth_secrets]
-  // [START run_user_auth_secrets]
   // CLOUD_SQL_CREDENTIALS_SECRET is the resource ID of the secret, passed in by environment variable.
   // Format: projects/PROJECT_ID/secrets/SECRET_ID/versions/VERSION
   const {CLOUD_SQL_CREDENTIALS_SECRET} = process.env;
@@ -32,7 +31,6 @@ function getCredConfig() {
       );
     }
   }
-  // [END run_user_auth_secrets]
   // [END cloudrun_user_auth_secrets]
   logger.info(
     'CLOUD_SQL_CREDENTIALS_SECRET env var not set. Defaulting to environment variables.'

run/image-processing/app.js

@@ -1,9 +1,20 @@
-// Copyright 2020 Google LLC. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+/**
+ * Copyright 2020 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.
+ */
 
 // [START cloudrun_imageproc_controller]
-// [START run_imageproc_controller]
 
 const express = require('express');
 const app = express();
@@ -58,7 +69,6 @@ app.post('/', async (req, res) => {
     res.status(500).send();
   }
 });
-// [END run_imageproc_controller]
 // [END cloudrun_imageproc_controller]
 
 module.exports = app;

run/image-processing/image.js

@@ -15,7 +15,6 @@
 'use strict';
 
 // [START cloudrun_imageproc_handler_setup]
-// [START run_imageproc_handler_setup]
 const gm = require('gm').subClass({imageMagick: true});
 const fs = require('fs');
 const {promisify} = require('util');
@@ -27,11 +26,9 @@ const storage = new Storage();
 const client = new vision.ImageAnnotatorClient();
 
 const {BLURRED_BUCKET_NAME} = process.env;
-// [END run_imageproc_handler_setup]
 // [END cloudrun_imageproc_handler_setup]
 
 // [START cloudrun_imageproc_handler_analyze]
-// [START run_imageproc_handler_analyze]
 // Blurs uploaded images that are flagged as Adult or Violence.
 exports.blurOffensiveImages = async event => {
   // This event represents the triggering Cloud Storage object.
@@ -61,11 +58,9 @@ exports.blurOffensiveImages = async event => {
     throw err;
   }
 };
-// [END run_imageproc_handler_analyze]
 // [END cloudrun_imageproc_handler_analyze]
 
 // [START cloudrun_imageproc_handler_blur]
-// [START run_imageproc_handler_blur]
 // Blurs the given file using ImageMagick, and uploads it to another bucket.
 const blurImage = async (file, blurredBucketName) => {
   const tempLocalPath = `/tmp/${path.parse(file.name).base}`;
@@ -109,5 +104,4 @@ const blurImage = async (file, blurredBucketName) => {
   const unlink = promisify(fs.unlink);
   return unlink(tempLocalPath);
 };
-// [END run_imageproc_handler_blur]
 // [END cloudrun_imageproc_handler_blur]

run/image-processing/index.js

@@ -1,14 +1,24 @@
-// Copyright 2020 Google LLC. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+/**
+ * Copyright 2020 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.
+ */
 
 // [START cloudrun_imageproc_server]
-// [START run_imageproc_server]
 const app = require('./app.js');
 const PORT = parseInt(parseInt(process.env.PORT)) || 8080;
 
 app.listen(PORT, () =>
   console.log(`nodejs-image-processing listening on port ${PORT}`)
 );
-// [END run_imageproc_server]
 // [END cloudrun_imageproc_server]

run/logging-manual/app.js

@@ -19,7 +19,6 @@ app.get('/', (req, res) => {
   const project = process.env.GOOGLE_CLOUD_PROJECT;
 
   // [START cloudrun_manual_logging]
-  // [START run_manual_logging]
 
   // Uncomment and populate this variable in your code:
   // const project = 'The project ID of your function or Cloud Run service';
@@ -52,7 +51,6 @@ app.get('/', (req, res) => {
   // Serialize to a JSON string and output.
   console.log(JSON.stringify(entry));
 
-  // [END run_manual_logging]
   // [END cloudrun_manual_logging]
 
   res.send('Hello Logger!');

run/pubsub/app.js

@@ -1,19 +1,28 @@
-// Copyright 2020 Google LLC. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+/**
+ * Copyright 2020 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.
+ */
 
 // [START cloudrun_pubsub_server_setup]
-// [START run_pubsub_server_setup]
 const express = require('express');
 const app = express();
 
 // This middleware is available in Express v4.16.0 onwards
 app.use(express.json());
-// [END run_pubsub_server_setup]
 // [END cloudrun_pubsub_server_setup]
 
 // [START cloudrun_pubsub_handler]
-// [START run_pubsub_handler]
 app.post('/', (req, res) => {
   if (!req.body) {
     const msg = 'no Pub/Sub message received';
@@ -36,7 +45,6 @@ app.post('/', (req, res) => {
   console.log(`Hello ${name}!`);
   res.status(204).send();
 });
-// [END run_pubsub_handler]
 // [END cloudrun_pubsub_handler]
 
 module.exports = app;

run/pubsub/index.js

@@ -1,14 +1,24 @@
-// Copyright 2020 Google LLC. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
+/**
+ * Copyright 2020 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.
+ */
 
 // [START cloudrun_pubsub_server]
-// [START run_pubsub_server]
 const app = require('./app.js');
 const PORT = parseInt(parseInt(process.env.PORT)) || 8080;
 
 app.listen(PORT, () =>
   console.log(`nodejs-pubsub-tutorial listening on port ${PORT}`)
 );
-// [END run_pubsub_server]
 // [END cloudrun_pubsub_server]