chore: Use latest artman version and remove final keyword (#2274)

* chore: Use latest artman version and remove final keyword * address review
googleapis · Aug 28, 2019 · f98eaca · f98eaca
1 parent 92a5dd0
commit f98eaca
Show file tree

Hide file tree

Showing 32 changed files with 192 additions and 64 deletions.
diff --git a/Asset/synth.py b/Asset/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -62,6 +60,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     'src/V1beta1/**/*.php',

diff --git a/AutoMl/synth.py b/AutoMl/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/BigQueryDataTransfer/synth.py b/BigQueryDataTransfer/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Bigtable/synth.py b/Bigtable/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -79,6 +77,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    ["src/Admin/**/*.php", "src/V*/**/*.php"],
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Container/synth.py b/Container/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Dataproc/synth.py b/Dataproc/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -68,6 +66,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 for client in ['ClusterController', 'JobController']:
     s.replace(

diff --git a/Datastore/synth.py b/Datastore/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Debugger/synth.py b/Debugger/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Dialogflow/synth.py b/Dialogflow/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -59,6 +57,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Dlp/synth.py b/Dlp/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/ErrorReporting/synth.py b/ErrorReporting/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Firestore/synth.py b/Firestore/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -86,6 +84,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    ["src/Admin/**/*.php", "src/V*/**/*.php"],
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/V1beta1/Gapic/*GapicClient.php',

diff --git a/Iot/synth.py b/Iot/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -61,6 +59,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Kms/synth.py b/Kms/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -55,6 +53,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix copyright year
 s.replace(
     'src/V1/**/*Client.php',

diff --git a/Language/synth.py b/Language/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -61,6 +59,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     'src/V1beta2/**/*.php',

diff --git a/Logging/synth.py b/Logging/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 s.replace(
     '**/Gapic/*GapicClient.php',

diff --git a/Monitoring/synth.py b/Monitoring/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -60,6 +58,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/V*/**/*.php",
+    r"final class",
+    r"class")
+
 # fix year
 for client in ['GroupService', 'MetricService', 'UptimeCheckService']:
     s.replace(

diff --git a/OsLogin/synth.py b/OsLogin/synth.py
@@ -15,8 +15,6 @@
 """This script is used to synthesize generated parts of this library."""
 
 import os
-# https://github.com/googleapis/artman/pull/655#issuecomment-507784277
-os.environ["SYNTHTOOL_ARTMAN_VERSION"] = "0.29.1"
 import synthtool as s
 import synthtool.gcp as gcp
 import logging
@@ -69,6 +67,12 @@
     r"\$transportConfig, and any \$serviceAddress",
     r"$transportConfig, and any `$apiEndpoint`")
 
+# prevent proto messages from being marked final
+s.replace(
+    "src/**/*.php",
+    r"final class",
+    r"class")
+
 # fix copyright year
 s.replace(
     'src/V1beta/**/*.php',