feat: add new LongRunning client, rename LongRunning namespace (and a…

…dd alias for BC) (#6675)
googleapis · Apr 10, 2024 · 2fe9eaf · 2fe9eaf
1 parent b053b15
commit 2fe9eaf
Show file tree

Hide file tree

Showing 20 changed files with 1,417 additions and 547 deletions.
diff --git a/Core/src/Testing/TestHelpers.php b/Core/src/Testing/TestHelpers.php
@@ -113,7 +113,8 @@ public static function snippetBootstrap()
             '/vendor/',
             '/dev/',
             new RegexFileFilter('/\w{0,}\/vendor\//'),
-            new RegexFileFilter('/\w{0,}\/V\d{1,}\w{0,}\//')
+            new RegexFileFilter('/\w{0,}\/V\d{1,}\w{0,}\//'),
+            'LongRunning/', // LongRunning doesn't match the GAPIC regex, but should still be excluded
         ]);
         $coverage = new Coverage($scanner);
         $coverage->buildListToCover();

diff --git a/LongRunning/.OwlBot.yaml b/LongRunning/.OwlBot.yaml
@@ -1,6 +1,6 @@
 deep-copy-regex:
     - source: /google/longrunning/.*-php/src/(.*)
-      dest: /owl-bot-staging/LongRunning/src/ApiCore/LongRunning/$1
+      dest: /owl-bot-staging/LongRunning/src/LongRunning/$1
     - source: /google/longrunning/.*-php/tests/(.*)
       dest: /owl-bot-staging/LongRunning/tests/$1
     - source: /google/longrunning/.*-php/proto/src/(.*)

diff --git a/LongRunning/metadata/Longrunning/Operations.php b/LongRunning/metadata/Longrunning/Operations.php
diff --git a/LongRunning/owlbot.py b/LongRunning/owlbot.py
@@ -41,31 +41,11 @@
     version_string="longrunning",
 )
 
-# Fix namespace for LongRunning GAPIC (ApiCore)
-# This is defined in longrunning_gapic.yaml, but not being used by
-# gapic-generator-php
+# Add an alias for the previous namespace
 s.replace(
-    "src/ApiCore/**/*.php",
-    r"^namespace Google\\LongRunning(.*);$",
-    r"namespace Google\\ApiCore\\LongRunning\1;")
-s.replace(
-    "src/ApiCore/LongRunning/OperationsClient.php",
-    r"^use Google\\LongRunning\\Gapic\\OperationsGapicClient;$",
-    r"use Google\\ApiCore\\LongRunning\\Gapic\\OperationsGapicClient;")
-s.replace(
-    "tests/**/*.php",
-    r"\\Google\\LongRunning\\OperationsClient",
-    r"\\Google\\ApiCore\\LongRunning\\OperationsClient")
-
-# remove class_alias code
-s.replace(
-    "src/**/*.php",
-    r"^// Adding a class alias for backwards compatibility with the previous class name.$"
-    + "\n"
-    + r"^class_alias\(.*\);$"
-    + "\n",
-    '')
-
+    "src/LongRunning/OperationsClient.php",
+    r"^}$\n",
+    r"}\n\nclass_alias('Google\\LongRunning\\OperationsClient', 'Google\\ApiCore\\LongRunning\\OperationsClient');\n")
 
 ### [START] protoc backwards compatibility fixes