Merge branch 'master' into use-multiphp-container

Author: bshaffer

.github/.blunderbuss.yml renamed to .github/blunderbuss.yml

@@ -9,6 +9,10 @@ assign_issues_by:
   - 'api: cloudsql'
   to:
   - GoogleCloudPlatform/infra-db-dpes
+- labels:
+  - 'api: cloudiot'
+  to:
+  - laszlokorossy
 
 assign_prs_by:
 - labels:
@@ -21,3 +25,7 @@ assign_prs_by:
   - 'api: cloudsql'
   to:
   - GoogleCloudPlatform/infra-db-dpes
+- labels:
+  - 'api: cloudiot'
+  to:
+  - laszlokorossy

asset/src/batch_get_assets_history.php

@@ -37,5 +37,6 @@ function batch_get_assets_history(string $projectId, array $assetNames)
 }
 # [END asset_quickstart_batch_get_assets_history]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

asset/src/export_assets.php

@@ -50,5 +50,6 @@ function export_assets(string $projectId, string $dumpFilePath)
 }
 # [END asset_quickstart_export_assets]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

asset/src/search_all_iam_policies.php

@@ -49,5 +49,6 @@ function search_all_iam_policies(
 }
 // [END asset_quickstart_search_all_iam_policies]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

asset/src/search_all_resources.php

@@ -55,5 +55,6 @@ function search_all_resources(
 }
 // [END asset_quickstart_search_all_resources]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_api_explicit.php

@@ -49,5 +49,6 @@ function auth_api_explicit($projectId, $serviceAccountPath)
 }
 # [END auth_api_explicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_api_implicit.php

@@ -48,5 +48,6 @@ function auth_api_implicit($projectId)
 }
 # [END auth_api_implicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_cloud_explicit.php

@@ -49,5 +49,6 @@ function auth_cloud_explicit($projectId, $serviceAccountPath)
 }
 # [END auth_cloud_explicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_cloud_implicit.php

@@ -48,5 +48,6 @@ function auth_cloud_implicit($projectId)
 }
 # [END auth_cloud_implicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_http_explicit.php

@@ -66,5 +66,6 @@ function auth_http_explicit($projectId, $serviceAccountPath)
 }
 # [END auth_http_explicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

auth/src/auth_http_implicit.php

@@ -62,5 +62,6 @@ function auth_http_implicit($projectId)
 }
 # [END auth_http_implicit]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

compute/cloud-client/instances/src/set_usage_export_bucket.php

@@ -36,17 +36,17 @@
 
 # [START compute_usage_report_set]
 /**
- * Set Compute Engine usage export bucket for the Cloud Project.
+ * Set Compute Engine usage export bucket for the Cloud project.
  * This sample presents how to interpret the default value for the report name prefix parameter.
  * Example:
  * ```
- * set_usage_export_bucket($projectId, $bucketName, $reportPrefixName);
+ * set_usage_export_bucket($projectId, $bucketName, $reportNamePrefix);
  * ```
  *
  * @param string $projectId Your Google Cloud project ID.
- * @param string $bucketName Google Cloud Storage Bucket used to store Compute Engine usage reports.
+ * @param string $bucketName Google Cloud Storage bucket used to store Compute Engine usage reports.
  * An existing Google Cloud Storage bucket is required.
- * @param string $reportPrefixName Prefix of the usage report name which defaults to an empty string
+ * @param string $reportNamePrefix Prefix of the usage report name which defaults to an empty string
  * to showcase default values behavior.
  *
  * @return \Google\Cloud\Compute\V1\Operation
@@ -56,15 +56,15 @@
 function set_usage_export_bucket(
     string $projectId,
     string $bucketName,
-    string $reportPrefixName = ''
+    string $reportNamePrefix = ''
 ) {
     // Initialize UsageExportLocation object with provided bucket name and no report name prefix.
     $usageExportLocation = new UsageExportLocation(array(
         "bucket_name" => $bucketName,
-        "report_name_prefix" => $reportPrefixName
+        "report_name_prefix" => $reportNamePrefix
     ));
 
-    if (strlen($reportPrefixName) == 0) {
+    if (strlen($reportNamePrefix) == 0) {
         // Sending empty value for report_name_prefix results in the next usage report
         // being generated with the default prefix value "usage_gce".
         // See https://cloud.google.com/compute/docs/reference/rest/v1/projects/setUsageExportBucket
@@ -80,7 +80,7 @@ function set_usage_export_bucket(
 
 # [START compute_usage_report_get]
 /**
- * Retrieve Compute Engine usage export bucket for the Cloud Project.
+ * Retrieve Compute Engine usage export bucket for the Cloud project.
  * Replaces the empty value returned by the API with the default value used
  * to generate report file names.
  * Example:
@@ -96,11 +96,11 @@ function set_usage_export_bucket(
  */
 function get_usage_export_bucket(string $projectId)
 {
-    // Get the usage setting for the project from the server.
+    // Get the usage export location for the project from the server.
     $projectsClient = new ProjectsClient();
     $projectResponse = $projectsClient->get($projectId);
 
-    // Construct proper values to be displayed, taking into account default values behavior.
+    // Replace the empty value returned by the API with the default value used to generate report file names.
     if ($projectResponse->hasUsageExportLocation()) {
         $responseUsageExportLocation = $projectResponse->getUsageExportLocation();
 

dialogflow/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-dialogflow": "^0.21",
+        "google/cloud-dialogflow": "^0.22",
         "symfony/console": "^5.0"
     },
     "autoload": {

firestore/src/data_batch_writes.php

@@ -63,5 +63,6 @@ function data_batch_writes(string $projectId): void
     printf('Batch write successfully completed.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_delete_collection.php

@@ -53,5 +53,6 @@ function data_delete_collection(string $projectId, string $collectionName, int $
 # [END firestore_data_delete_collection]
 # [END fs_delete_collection]
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_delete_doc.php

@@ -44,5 +44,6 @@ function data_delete_doc(string $projectId): void
     printf('Deleted the DC document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_delete_field.php

@@ -48,5 +48,6 @@ function data_delete_field(string $projectId): void
     printf('Deleted the capital field from the BJ document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_get_all_documents.php

@@ -53,5 +53,6 @@ function data_get_all_documents(string $projectId): void
     # [END fs_get_all_docs]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_get_as_map.php

@@ -51,5 +51,6 @@ function data_get_as_map(string $projectId): void
     # [END fs_get_document]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_get_dataset.php

@@ -79,5 +79,6 @@ function data_get_dataset(string $projectId): void
     # [END fs_retrieve_create_examples]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_get_sub_collections.php

@@ -47,5 +47,6 @@ function data_get_sub_collections(string $projectId): void
     # [END fs_get_collections]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_query.php

@@ -54,5 +54,6 @@ function data_query(string $projectId): void
     # [END fs_get_multiple_docs]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_reference_collection.php

@@ -44,5 +44,6 @@ function data_reference_collection(string $projectId): void
     printf('Retrieved collection: %s' . PHP_EOL, $collection->name());
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_reference_document.php

@@ -44,5 +44,6 @@ function data_reference_document(string $projectId): void
     printf('Retrieved document: %s' . PHP_EOL, $document->name());
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_reference_document_path.php

@@ -44,5 +44,6 @@ function data_reference_document_path(string $projectId): void
     printf('Retrieved document from path: %s' . PHP_EOL, $document->name());
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_reference_subcollection.php

@@ -48,5 +48,6 @@ function data_reference_subcollection(string $projectId): void
     printf('Retrieved document from subcollection: %s' . PHP_EOL, $document->name());
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_array_operations.php

@@ -55,5 +55,6 @@ function data_set_array_operations(string $projectId): void
     printf('Updated the regions field of the DC document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_doc_upsert.php

@@ -47,5 +47,6 @@ function data_set_doc_upsert(string $projectId): void
     printf('Set document data by merging it into the existing BJ document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_field.php

@@ -47,5 +47,6 @@ function data_set_field(string $projectId): void
     printf('Updated the capital field of the DC document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_from_map.php

@@ -49,5 +49,6 @@ function data_set_from_map(string $projectId): void
     printf('Set data for the LA document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_from_map_nested.php

@@ -58,5 +58,6 @@ function data_set_from_map_nested(string $projectId): void
     # [END fs_add_doc_data_types]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_id_random_collection.php

@@ -48,5 +48,6 @@ function data_set_id_random_collection(string $projectId): void
     # [END fs_add_doc_data_with_auto_id]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_id_random_document_ref.php

@@ -49,5 +49,6 @@ function data_set_id_random_document_ref(string $projectId): void
     # [END fs_add_doc_data_after_auto_id]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_id_specified.php

@@ -48,5 +48,6 @@ function data_set_id_specified(string $projectId): void
     printf('Added document with ID: new-city-id' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_nested_fields.php

@@ -57,5 +57,6 @@ function data_set_nested_fields(string $projectId): void
     printf('Updated the age and favorite color fields of the frank document in the users collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_numeric_increment.php

@@ -50,5 +50,6 @@ function data_set_numeric_increment(string $projectId): void
     printf('Updated the population of the DC document in the cities collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/data_set_server_timestamp.php

@@ -52,5 +52,6 @@ function data_set_server_timestamp(string $projectId): void
     printf('Updated the timestamp field of the some-id document in the objects collection.' . PHP_EOL);
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_collection_group_dataset.php

@@ -85,5 +85,6 @@ function query_collection_group_dataset(string $projectId): void
     # [END fs_collection_group_query_data_setup]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_collection_group_filter_eq.php

@@ -47,5 +47,6 @@ function query_collection_group_filter_eq(string $projectId): void
     # [END fs_collection_group_query]
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_cursor_end_at_field_value_single.php

@@ -50,5 +50,6 @@ function query_cursor_end_at_field_value_single(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_cursor_pagination.php

@@ -59,5 +59,6 @@ function query_cursor_pagination(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_cursor_start_at_document.php

@@ -53,5 +53,6 @@ function query_cursor_start_at_document(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_cursor_start_at_field_value_multi.php

@@ -63,5 +63,6 @@ function query_cursor_start_at_field_value_multi(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_cursor_start_at_field_value_single.php

@@ -50,5 +50,6 @@ function query_cursor_start_at_field_value_single(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_filter_array_contains.php

@@ -47,5 +47,6 @@ function query_filter_array_contains(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_filter_array_contains_any.php

@@ -47,5 +47,6 @@ function query_filter_array_contains_any(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);

firestore/src/query_filter_compound_multi_eq.php

@@ -49,5 +49,6 @@ function query_filter_compound_multi_eq(string $projectId): void
     }
 }
 
+// The following 2 lines are only needed to run the samples
 require_once __DIR__ . '/../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);