feat(ServiceDirectory): upgrade to v2 (GoogleCloudPlatform#2113)

bshaffer · web-flow · commit ba24dd2d6038 · 2025-06-10T16:36:00.000-07:00
diff --git a/servicedirectory/composer.json b/servicedirectory/composer.json
@@ -1,5 +1,9 @@
 {
     "require": {
-        "google/cloud-service-directory": "^1.0.0"
+        "google/cloud-service-directory": "^2.0.0"
+    },
+    "require-dev": {
+        "google/cloud-tools": "^0.15.0",
+        "friendsofphp/php-cs-fixer": "^3.21"
     }
 }
diff --git a/servicedirectory/src/create_endpoint.php b/servicedirectory/src/create_endpoint.php
@@ -19,8 +19,9 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_create_endpoint]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
-use Google\Cloud\ServiceDirectory\V1beta1\Endpoint;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\CreateEndpointRequest;
+use Google\Cloud\ServiceDirectory\V1\Endpoint;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -50,7 +51,11 @@ function create_endpoint(
 
     // Run request.
     $serviceName = RegistrationServiceClient::serviceName($projectId, $locationId, $namespaceId, $serviceId);
-    $endpoint = $client->createEndpoint($serviceName, $endpointId, $endpointObject);
+    $createEndpointRequest = (new CreateEndpointRequest())
+        ->setParent($serviceName)
+        ->setEndpointId($endpointId)
+        ->setEndpoint($endpointObject);
+    $endpoint = $client->createEndpoint($createEndpointRequest);
 
     // Print results.
     printf('Created Endpoint: %s' . PHP_EOL, $endpoint->getName());
diff --git a/servicedirectory/src/create_namespace.php b/servicedirectory/src/create_namespace.php
@@ -19,8 +19,9 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_create_namespace]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
-use Google\Cloud\ServiceDirectory\V1beta1\PBNamespace;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\CreateNamespaceRequest;
+use Google\Cloud\ServiceDirectory\V1\PBNamespace;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -37,7 +38,11 @@ function create_namespace(
 
     // Run request.
     $locationName = RegistrationServiceClient::locationName($projectId, $locationId);
-    $namespace = $client->createNamespace($locationName, $namespaceId, new PBNamespace());
+    $createNamespaceRequest = (new CreateNamespaceRequest())
+        ->setParent($locationName)
+        ->setNamespaceId($namespaceId)
+        ->setNamespace(new PBNamespace());
+    $namespace = $client->createNamespace($createNamespaceRequest);
 
     // Print results.
     printf('Created Namespace: %s' . PHP_EOL, $namespace->getName());
diff --git a/servicedirectory/src/create_service.php b/servicedirectory/src/create_service.php
@@ -19,8 +19,9 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_create_service]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
-use Google\Cloud\ServiceDirectory\V1beta1\Service;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\CreateServiceRequest;
+use Google\Cloud\ServiceDirectory\V1\Service;
 
 /**
  * @param string $projectId Your Cloud project ID
@@ -39,7 +40,11 @@ function create_service(
 
     // Run request.
     $namespaceName = RegistrationServiceClient::namespaceName($projectId, $locationId, $namespaceId);
-    $service = $client->createService($namespaceName, $serviceId, new Service());
+    $createServiceRequest = (new CreateServiceRequest())
+        ->setParent($namespaceName)
+        ->setServiceId($serviceId)
+        ->setService(new Service());
+    $service = $client->createService($createServiceRequest);
 
     // Print results.
     printf('Created Service: %s' . PHP_EOL, $service->getName());
diff --git a/servicedirectory/src/delete_endpoint.php b/servicedirectory/src/delete_endpoint.php
@@ -19,7 +19,8 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_delete_endpoint]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\DeleteEndpointRequest;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -40,7 +41,9 @@ function delete_endpoint(
 
     // Run request.
     $endpointName = RegistrationServiceClient::endpointName($projectId, $locationId, $namespaceId, $serviceId, $endpointId);
-    $endpoint = $client->deleteEndpoint($endpointName);
+    $deleteEndpointRequest = (new DeleteEndpointRequest())
+        ->setName($endpointName);
+    $client->deleteEndpoint($deleteEndpointRequest);
 
     // Print results.
     printf('Deleted Endpoint: %s' . PHP_EOL, $endpointName);
diff --git a/servicedirectory/src/delete_namespace.php b/servicedirectory/src/delete_namespace.php
@@ -19,7 +19,8 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_delete_namespace]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\DeleteNamespaceRequest;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -36,7 +37,9 @@ function delete_namespace(
 
     // Run request.
     $namespaceName = RegistrationServiceClient::namespaceName($projectId, $locationId, $namespaceId);
-    $client->deleteNamespace($namespaceName);
+    $deleteNamespaceRequest = (new DeleteNamespaceRequest())
+        ->setName($namespaceName);
+    $client->deleteNamespace($deleteNamespaceRequest);
 
     // Print results.
     printf('Deleted Namespace: %s' . PHP_EOL, $namespaceName);
diff --git a/servicedirectory/src/delete_service.php b/servicedirectory/src/delete_service.php
@@ -19,7 +19,8 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_delete_service]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\DeleteServiceRequest;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -38,7 +39,9 @@ function delete_service(
 
     // Run request.
     $serviceName = RegistrationServiceClient::serviceName($projectId, $locationId, $namespaceId, $serviceId);
-    $client->deleteService($serviceName);
+    $deleteServiceRequest = (new DeleteServiceRequest())
+        ->setName($serviceName);
+    $client->deleteService($deleteServiceRequest);
 
     // Print results.
     printf('Deleted Service: %s' . PHP_EOL, $serviceName);
diff --git a/servicedirectory/src/quickstart.php b/servicedirectory/src/quickstart.php
@@ -24,7 +24,8 @@
 list($_, $projectId, $locationId) = $argv;
 
 // [START servicedirectory_quickstart]
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\ListNamespacesRequest;
 
 /** Uncomment and populate these variables in your code */
 // $projectId = '[YOUR_PROJECT_ID]';
@@ -35,7 +36,9 @@
 
 // Run request.
 $locationName = RegistrationServiceClient::locationName($projectId, $locationId);
-$pagedResponse = $client->listNamespaces($locationName);
+$listNamespacesRequest = (new ListNamespacesRequest())
+    ->setParent($locationName);
+$pagedResponse = $client->listNamespaces($listNamespacesRequest);
 
 // Iterate over each namespace and print its name.
 print('Namespaces: ' . PHP_EOL);
diff --git a/servicedirectory/src/resolve_service.php b/servicedirectory/src/resolve_service.php
@@ -19,8 +19,9 @@
 namespace Google\Cloud\Samples\ServiceDirectory;
 
 // [START servicedirectory_resolve_service]
-use Google\Cloud\ServiceDirectory\V1beta1\LookupServiceClient;
-use Google\Cloud\ServiceDirectory\V1beta1\Service;
+use Google\Cloud\ServiceDirectory\V1\Client\LookupServiceClient;
+use Google\Cloud\ServiceDirectory\V1\ResolveServiceRequest;
+use Google\Cloud\ServiceDirectory\V1\Service;
 
 /**
  * @param string $projectId     Your Cloud project ID
@@ -39,7 +40,9 @@ function resolve_service(
 
     // Run request.
     $serviceName = LookupServiceClient::serviceName($projectId, $locationId, $namespaceId, $serviceId);
-    $service = $client->resolveService($serviceName)->getService();
+    $resolveServiceRequest = (new ResolveServiceRequest())
+        ->setName($serviceName);
+    $service = $client->resolveService($resolveServiceRequest)->getService();
 
     // Print results.
     printf('Resolved Service: %s' . PHP_EOL, $service->getName());
diff --git a/servicedirectory/test/servicedirectoryTest.php b/servicedirectory/test/servicedirectoryTest.php
@@ -17,9 +17,11 @@
  */
 namespace Google\Cloud\Samples\ServiceDirectory;
 
-use Google\Cloud\ServiceDirectory\V1beta1\Endpoint;
-use Google\Cloud\ServiceDirectory\V1beta1\RegistrationServiceClient;
-use Google\Cloud\ServiceDirectory\V1beta1\Service;
+use Google\Cloud\ServiceDirectory\V1\Client\RegistrationServiceClient;
+use Google\Cloud\ServiceDirectory\V1\DeleteNamespaceRequest;
+use Google\Cloud\ServiceDirectory\V1\Endpoint;
+use Google\Cloud\ServiceDirectory\V1\ListNamespacesRequest;
+use Google\Cloud\ServiceDirectory\V1\Service;
 use Google\Cloud\TestUtils\TestTrait;
 use PHPUnit\Framework\TestCase;
 
@@ -36,9 +38,13 @@ public static function tearDownAfterClass(): void
     {
         // Delete any namespaces created during the tests.
         $client = new RegistrationServiceClient();
-        $pagedResponse = $client->listNamespaces(RegistrationServiceClient::locationName(self::$projectId, self::$locationId));
+        $listNamespacesRequest = (new ListNamespacesRequest())
+            ->setParent(RegistrationServiceClient::locationName(self::$projectId, self::$locationId));
+        $pagedResponse = $client->listNamespaces($listNamespacesRequest);
         foreach ($pagedResponse->iterateAllElements() as $namespace_pb) {
-            $client->deleteNamespace($namespace_pb->getName());
+            $deleteNamespaceRequest = (new DeleteNamespaceRequest())
+                ->setName($namespace_pb->getName());
+            $client->deleteNamespace($deleteNamespaceRequest);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "google/cloud-service-directory": "^1.0.0"`
	`3`	`+ "google/cloud-service-directory": "^2.0.0"`
	`4`	`+ },`
	`5`	`+ "require-dev": {`
	`6`	`+ "google/cloud-tools": "^0.15.0",`
	`7`	`+ "friendsofphp/php-cs-fixer": "^3.21"`
`4`	`8`	`}`
`5`	`9`	`}`