chore(php): support new surface LROs (#7355)

PiperOrigin-RevId: 638666995 Source-Link: googleapis/googleapis@94da39f Source-Link: googleapis/googleapis-gen@8a9dd85 Copy-Tag: eyJwIjoiU2VjdXJlU291cmNlTWFuYWdlci8uT3dsQm90LnlhbWwiLCJoIjoiOGE5ZGQ4NWJhNTZiYWUzN2Y0NzhiNGFkNjRjNGIxMmJlZjBlODc3ZiJ9 Copy-Tag: eyJwIjoiU2VjdXJpdHlDZW50ZXIvLk93bEJvdC55YW1sIiwiaCI6IjhhOWRkODViYTU2YmFlMzdmNDc4YjRhZDY0YzRiMTJiZWYwZTg3N2YifQ== Copy-Tag: eyJwIjoiU3RvcmFnZUNvbnRyb2wvLk93bEJvdC55YW1sIiwiaCI6IjhhOWRkODViYTU2YmFlMzdmNDc4YjRhZDY0YzRiMTJiZWYwZTg3N2YifQ== Copy-Tag: eyJwIjoiVGVsY29BdXRvbWF0aW9uLy5Pd2xCb3QueWFtbCIsImgiOiI4YTlkZDg1YmE1NmJhZTM3ZjQ3OGI0YWQ2NGM0YjEyYmVmMGU4NzdmIn0= Copy-Tag: eyJwIjoiVHB1Ly5Pd2xCb3QueWFtbCIsImgiOiI4YTlkZDg1YmE1NmJhZTM3ZjQ3OGI0YWQ2NGM0YjEyYmVmMGU4NzdmIn0= Copy-Tag: eyJwIjoiV29ya2Zsb3dzLy5Pd2xCb3QueWFtbCIsImgiOiI4YTlkZDg1YmE1NmJhZTM3ZjQ3OGI0YWQ2NGM0YjEyYmVmMGU4NzdmIn0= Co-authored-by: Brent Shaffer <[email protected]>
googleapis · May 30, 2024 · 2825041 · 2825041
1 parent 67fc636
commit 2825041
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 12 deletions.
diff --git a/SecureSourceManager/src/V1/Client/SecureSourceManagerClient.php b/SecureSourceManager/src/V1/Client/SecureSourceManagerClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -53,6 +52,7 @@
 use Google\Cloud\SecureSourceManager\V1\ListInstancesRequest;
 use Google\Cloud\SecureSourceManager\V1\ListRepositoriesRequest;
 use Google\Cloud\SecureSourceManager\V1\Repository;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -182,6 +182,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a crypto_key
      * resource.

diff --git a/SecureSourceManager/tests/Unit/V1/Client/SecureSourceManagerClientTest.php b/SecureSourceManager/tests/Unit/V1/Client/SecureSourceManagerClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Iam\V1\GetIamPolicyRequest;
@@ -49,6 +48,7 @@
 use Google\Cloud\SecureSourceManager\V1\ListRepositoriesRequest;
 use Google\Cloud\SecureSourceManager\V1\ListRepositoriesResponse;
 use Google\Cloud\SecureSourceManager\V1\Repository;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;

diff --git a/SecurityCenter/src/V2/Client/SecurityCenterClient.php b/SecurityCenter/src/V2/Client/SecurityCenterClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -88,6 +87,7 @@
 use Google\Cloud\SecurityCenter\V2\UpdateSecurityMarksRequest;
 use Google\Cloud\SecurityCenter\V2\UpdateSourceRequest;
 use Google\Cloud\SecurityCenter\V2\ValuedResource;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -222,6 +222,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a
      * big_query_export resource.

diff --git a/SecurityCenter/tests/Unit/V2/Client/SecurityCenterClientTest.php b/SecurityCenter/tests/Unit/V2/Client/SecurityCenterClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Iam\V1\GetIamPolicyRequest;
@@ -97,6 +96,7 @@
 use Google\Cloud\SecurityCenter\V2\UpdateSecurityMarksRequest;
 use Google\Cloud\SecurityCenter\V2\UpdateSourceRequest;
 use Google\Cloud\SecurityCenter\V2\ValuedResource;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;

diff --git a/StorageControl/src/V2/Client/StorageControlClient.php b/StorageControl/src/V2/Client/StorageControlClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -48,6 +47,7 @@
 use Google\Cloud\Storage\Control\V2\ManagedFolder;
 use Google\Cloud\Storage\Control\V2\RenameFolderRequest;
 use Google\Cloud\Storage\Control\V2\StorageLayout;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -159,6 +159,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a bucket
      * resource.

diff --git a/StorageControl/tests/Unit/V2/Client/StorageControlClientTest.php b/StorageControl/tests/Unit/V2/Client/StorageControlClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Storage\Control\V2\Client\StorageControlClient;
@@ -43,6 +42,7 @@
 use Google\Cloud\Storage\Control\V2\ManagedFolder;
 use Google\Cloud\Storage\Control\V2\RenameFolderRequest;
 use Google\Cloud\Storage\Control\V2\StorageLayout;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;

diff --git a/TelcoAutomation/src/V1/Client/TelcoAutomationClient.php b/TelcoAutomation/src/V1/Client/TelcoAutomationClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -83,6 +82,7 @@
 use Google\Cloud\TelcoAutomation\V1\UpdateBlueprintRequest;
 use Google\Cloud\TelcoAutomation\V1\UpdateDeploymentRequest;
 use Google\Cloud\TelcoAutomation\V1\UpdateHydratedDeploymentRequest;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -219,6 +219,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a blueprint
      * resource.

diff --git a/TelcoAutomation/tests/Unit/V1/Client/TelcoAutomationClientTest.php b/TelcoAutomation/tests/Unit/V1/Client/TelcoAutomationClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Location\GetLocationRequest;
@@ -87,6 +86,7 @@
 use Google\Cloud\TelcoAutomation\V1\UpdateBlueprintRequest;
 use Google\Cloud\TelcoAutomation\V1\UpdateDeploymentRequest;
 use Google\Cloud\TelcoAutomation\V1\UpdateHydratedDeploymentRequest;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;

diff --git a/Tpu/src/V2/Client/TpuClient.php b/Tpu/src/V2/Client/TpuClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -56,6 +55,7 @@
 use Google\Cloud\Tpu\V2\StartNodeRequest;
 use Google\Cloud\Tpu\V2\StopNodeRequest;
 use Google\Cloud\Tpu\V2\UpdateNodeRequest;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -167,6 +167,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a
      * accelerator_type resource.

diff --git a/Tpu/tests/Unit/V2/Client/TpuClientTest.php b/Tpu/tests/Unit/V2/Client/TpuClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Location\GetLocationRequest;
@@ -53,6 +52,7 @@
 use Google\Cloud\Tpu\V2\StartNodeRequest;
 use Google\Cloud\Tpu\V2\StopNodeRequest;
 use Google\Cloud\Tpu\V2\UpdateNodeRequest;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;

diff --git a/Workflows/src/V1/Client/WorkflowsClient.php b/Workflows/src/V1/Client/WorkflowsClient.php
@@ -27,7 +27,6 @@
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
 use Google\ApiCore\GapicClientTrait;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\PagedListResponse;
 use Google\ApiCore\ResourceHelperTrait;
@@ -44,6 +43,7 @@
 use Google\Cloud\Workflows\V1\ListWorkflowsRequest;
 use Google\Cloud\Workflows\V1\UpdateWorkflowRequest;
 use Google\Cloud\Workflows\V1\Workflow;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\Operation;
 use GuzzleHttp\Promise\PromiseInterface;
 
@@ -147,6 +147,25 @@ public function resumeOperation($operationName, $methodName = null)
         return $operation;
     }
 
+    /**
+     * Create the default operation client for the service.
+     *
+     * @param array $options ClientOptions for the client.
+     *
+     * @return OperationsClient
+     */
+    private function createOperationsClient(array $options)
+    {
+        // Unset client-specific configuration options
+        unset($options['serviceName'], $options['clientConfig'], $options['descriptorsConfigPath']);
+
+        if (isset($options['operationsClient'])) {
+            return $options['operationsClient'];
+        }
+
+        return new OperationsClient($options);
+    }
+
     /**
      * Formats a string containing the fully-qualified path to represent a crypto_key
      * resource.

diff --git a/Workflows/tests/Unit/V1/Client/WorkflowsClientTest.php b/Workflows/tests/Unit/V1/Client/WorkflowsClientTest.php
@@ -24,7 +24,6 @@
 
 use Google\ApiCore\ApiException;
 use Google\ApiCore\CredentialsWrapper;
-use Google\ApiCore\LongRunning\OperationsClient;
 use Google\ApiCore\Testing\GeneratedTest;
 use Google\ApiCore\Testing\MockTransport;
 use Google\Cloud\Location\GetLocationRequest;
@@ -39,6 +38,7 @@
 use Google\Cloud\Workflows\V1\ListWorkflowsResponse;
 use Google\Cloud\Workflows\V1\UpdateWorkflowRequest;
 use Google\Cloud\Workflows\V1\Workflow;
+use Google\LongRunning\Client\OperationsClient;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\Operation;
 use Google\Protobuf\Any;