Merge branch 'main' into logging-metadata

googleapis · Dec 27, 2024 · 1501da1 · 1501da1
2 parents 89e60a4 + 1d7c39e
commit 1501da1
Show file tree

Hide file tree

Showing 137 changed files with 3,860 additions and 694 deletions.
diff --git a/.github/workflows/system-tests-spanner-emulator.yaml b/.github/workflows/system-tests-spanner-emulator.yaml
@@ -18,7 +18,7 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:1.5.27
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.28
         ports:
           - 9010:9010
           - 9020:9020

diff --git a/ContactCenterInsights/metadata/V1/ContactCenterInsights.php b/ContactCenterInsights/metadata/V1/ContactCenterInsights.php
diff --git a/ContactCenterInsights/metadata/V1/Resources.php b/ContactCenterInsights/metadata/V1/Resources.php
diff --git a/ContactCenterInsights/src/V1/Client/ContactCenterInsightsClient.php b/ContactCenterInsights/src/V1/Client/ContactCenterInsightsClient.php
@@ -558,6 +558,172 @@ public static function projectConversationParticipantName(
         ]);
     }
 
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_authorized_view_set_authorized_view_conversation resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $authorizedViewSet
+     * @param string $authorizedView
+     * @param string $conversation
+     *
+     * @return string The formatted project_location_authorized_view_set_authorized_view_conversation resource.
+     */
+    public static function projectLocationAuthorizedViewSetAuthorizedViewConversationName(
+        string $project,
+        string $location,
+        string $authorizedViewSet,
+        string $authorizedView,
+        string $conversation
+    ): string {
+        return self::getPathTemplate('projectLocationAuthorizedViewSetAuthorizedViewConversation')->render([
+            'project' => $project,
+            'location' => $location,
+            'authorized_view_set' => $authorizedViewSet,
+            'authorized_view' => $authorizedView,
+            'conversation' => $conversation,
+        ]);
+    }
+
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_authorized_view_set_authorized_view_conversation_analysis
+     * resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $authorizedViewSet
+     * @param string $authorizedView
+     * @param string $conversation
+     * @param string $analysis
+     *
+     * @return string The formatted project_location_authorized_view_set_authorized_view_conversation_analysis resource.
+     */
+    public static function projectLocationAuthorizedViewSetAuthorizedViewConversationAnalysisName(
+        string $project,
+        string $location,
+        string $authorizedViewSet,
+        string $authorizedView,
+        string $conversation,
+        string $analysis
+    ): string {
+        return self::getPathTemplate('projectLocationAuthorizedViewSetAuthorizedViewConversationAnalysis')->render([
+            'project' => $project,
+            'location' => $location,
+            'authorized_view_set' => $authorizedViewSet,
+            'authorized_view' => $authorizedView,
+            'conversation' => $conversation,
+            'analysis' => $analysis,
+        ]);
+    }
+
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_authorized_view_set_authorized_view_conversation_feedback_label
+     * resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $authorizedViewSet
+     * @param string $authorizedView
+     * @param string $conversation
+     * @param string $feedbackLabel
+     *
+     * @return string The formatted project_location_authorized_view_set_authorized_view_conversation_feedback_label resource.
+     */
+    public static function projectLocationAuthorizedViewSetAuthorizedViewConversationFeedbackLabelName(
+        string $project,
+        string $location,
+        string $authorizedViewSet,
+        string $authorizedView,
+        string $conversation,
+        string $feedbackLabel
+    ): string {
+        return self::getPathTemplate('projectLocationAuthorizedViewSetAuthorizedViewConversationFeedbackLabel')->render(
+            [
+                'project' => $project,
+                'location' => $location,
+                'authorized_view_set' => $authorizedViewSet,
+                'authorized_view' => $authorizedView,
+                'conversation' => $conversation,
+                'feedback_label' => $feedbackLabel,
+            ]
+        );
+    }
+
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_conversation resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $conversation
+     *
+     * @return string The formatted project_location_conversation resource.
+     */
+    public static function projectLocationConversationName(
+        string $project,
+        string $location,
+        string $conversation
+    ): string {
+        return self::getPathTemplate('projectLocationConversation')->render([
+            'project' => $project,
+            'location' => $location,
+            'conversation' => $conversation,
+        ]);
+    }
+
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_conversation_analysis resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $conversation
+     * @param string $analysis
+     *
+     * @return string The formatted project_location_conversation_analysis resource.
+     */
+    public static function projectLocationConversationAnalysisName(
+        string $project,
+        string $location,
+        string $conversation,
+        string $analysis
+    ): string {
+        return self::getPathTemplate('projectLocationConversationAnalysis')->render([
+            'project' => $project,
+            'location' => $location,
+            'conversation' => $conversation,
+            'analysis' => $analysis,
+        ]);
+    }
+
+    /**
+     * Formats a string containing the fully-qualified path to represent a
+     * project_location_conversation_feedback_label resource.
+     *
+     * @param string $project
+     * @param string $location
+     * @param string $conversation
+     * @param string $feedbackLabel
+     *
+     * @return string The formatted project_location_conversation_feedback_label resource.
+     */
+    public static function projectLocationConversationFeedbackLabelName(
+        string $project,
+        string $location,
+        string $conversation,
+        string $feedbackLabel
+    ): string {
+        return self::getPathTemplate('projectLocationConversationFeedbackLabel')->render([
+            'project' => $project,
+            'location' => $location,
+            'conversation' => $conversation,
+            'feedback_label' => $feedbackLabel,
+        ]);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a
      * project_location_conversation_participant resource.
@@ -745,6 +911,12 @@ public static function viewName(string $project, string $location, string $view)
      * - participant: projects/{project}/conversations/{conversation}/participants/{participant}
      * - phraseMatcher: projects/{project}/locations/{location}/phraseMatchers/{phrase_matcher}
      * - projectConversationParticipant: projects/{project}/conversations/{conversation}/participants/{participant}
+     * - projectLocationAuthorizedViewSetAuthorizedViewConversation: projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}
+     * - projectLocationAuthorizedViewSetAuthorizedViewConversationAnalysis: projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}/analyses/{analysis}
+     * - projectLocationAuthorizedViewSetAuthorizedViewConversationFeedbackLabel: projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}/feedbackLabels/{feedback_label}
+     * - projectLocationConversation: projects/{project}/locations/{location}/conversations/{conversation}
+     * - projectLocationConversationAnalysis: projects/{project}/locations/{location}/conversations/{conversation}/analyses/{analysis}
+     * - projectLocationConversationFeedbackLabel: projects/{project}/locations/{location}/conversations/{conversation}/feedbackLabels/{feedback_label}
      * - projectLocationConversationParticipant: projects/{project}/locations/{location}/conversations/{conversation}/participants/{participant}
      * - qaQuestion: projects/{project}/locations/{location}/qaScorecards/{qa_scorecard}/revisions/{revision}/qaQuestions/{qa_question}
      * - qaScorecard: projects/{project}/locations/{location}/qaScorecards/{qa_scorecard}

diff --git a/ContactCenterInsights/src/V1/Conversation/QualityMetadata/AgentInfo.php b/ContactCenterInsights/src/V1/Conversation/QualityMetadata/AgentInfo.php
diff --git a/ContactCenterInsights/src/V1/resources/contact_center_insights_descriptor_config.php b/ContactCenterInsights/src/V1/resources/contact_center_insights_descriptor_config.php
@@ -1134,6 +1134,12 @@
                 'participant' => 'projects/{project}/conversations/{conversation}/participants/{participant}',
                 'phraseMatcher' => 'projects/{project}/locations/{location}/phraseMatchers/{phrase_matcher}',
                 'projectConversationParticipant' => 'projects/{project}/conversations/{conversation}/participants/{participant}',
+                'projectLocationAuthorizedViewSetAuthorizedViewConversation' => 'projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}',
+                'projectLocationAuthorizedViewSetAuthorizedViewConversationAnalysis' => 'projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}/analyses/{analysis}',
+                'projectLocationAuthorizedViewSetAuthorizedViewConversationFeedbackLabel' => 'projects/{project}/locations/{location}/authorizedViewSets/{authorized_view_set}/authorizedViews/{authorized_view}/conversations/{conversation}/feedbackLabels/{feedback_label}',
+                'projectLocationConversation' => 'projects/{project}/locations/{location}/conversations/{conversation}',
+                'projectLocationConversationAnalysis' => 'projects/{project}/locations/{location}/conversations/{conversation}/analyses/{analysis}',
+                'projectLocationConversationFeedbackLabel' => 'projects/{project}/locations/{location}/conversations/{conversation}/feedbackLabels/{feedback_label}',
                 'projectLocationConversationParticipant' => 'projects/{project}/locations/{location}/conversations/{conversation}/participants/{participant}',
                 'qaQuestion' => 'projects/{project}/locations/{location}/qaScorecards/{qa_scorecard}/revisions/{revision}/qaQuestions/{qa_question}',
                 'qaScorecard' => 'projects/{project}/locations/{location}/qaScorecards/{qa_scorecard}',

diff --git a/ContactCenterInsights/src/V1/resources/contact_center_insights_rest_client_config.php b/ContactCenterInsights/src/V1/resources/contact_center_insights_rest_client_config.php
@@ -85,6 +85,12 @@
             'CalculateStats' => [
                 'method' => 'get',
                 'uriTemplate' => '/v1/{location=projects/*/locations/*}/conversations:calculateStats',
+                'additionalBindings' => [
+                    [
+                        'method' => 'get',
+                        'uriTemplate' => '/v1/{location=projects/*/locations/*/authorizedViewSet/*/authorizedView/*}:calculateStats',
+                    ],
+                ],
                 'placeholders' => [
                     'location' => [
                         'getters' => [
@@ -698,6 +704,13 @@
                 'method' => 'post',
                 'uriTemplate' => '/v1/{location=projects/*/locations/*}:queryMetrics',
                 'body' => '*',
+                'additionalBindings' => [
+                    [
+                        'method' => 'post',
+                        'uriTemplate' => '/v1/{location=projects/*/locations/*/authorizedViewSet/*/authorizedView/*}:queryMetrics',
+                        'body' => '*',
+                    ],
+                ],
                 'placeholders' => [
                     'location' => [
                         'getters' => [

diff --git a/DataCatalog/src/V1/TagTemplate.php b/DataCatalog/src/V1/TagTemplate.php
diff --git a/Dataplex/metadata/V1/Datascans.php b/Dataplex/metadata/V1/Datascans.php
diff --git a/Dataplex/samples/V1/CatalogServiceClient/search_entries.php b/Dataplex/samples/V1/CatalogServiceClient/search_entries.php
@@ -36,6 +36,8 @@
  *                              following form: `projects/{project}/locations/{location}`. Please see
  *                              {@see CatalogServiceClient::locationName()} for help formatting this field.
  * @param string $query         The query against which entries in scope should be matched.
+ *                              The query syntax is defined in [Search syntax for Dataplex
+ *                              Catalog](https://cloud.google.com/dataplex/docs/search-syntax).
  */
 function search_entries_sample(string $formattedName, string $query): void
 {

diff --git a/Dataplex/samples/V1/DataScanServiceClient/update_data_scan.php b/Dataplex/samples/V1/DataScanServiceClient/update_data_scan.php
@@ -29,7 +29,6 @@
 use Google\Cloud\Dataplex\V1\DataScan;
 use Google\Cloud\Dataplex\V1\DataSource;
 use Google\Cloud\Dataplex\V1\UpdateDataScanRequest;
-use Google\Protobuf\FieldMask;
 use Google\Rpc\Status;
 
 /**
@@ -50,10 +49,8 @@ function update_data_scan_sample(): void
     $dataScanData = new DataSource();
     $dataScan = (new DataScan())
         ->setData($dataScanData);
-    $updateMask = new FieldMask();
     $request = (new UpdateDataScanRequest())
-        ->setDataScan($dataScan)
-        ->setUpdateMask($updateMask);
+        ->setDataScan($dataScan);
 
     // Call the API and handle any network failures.
     try {