From b22e26db76cf956f865a16aad4320befacee8cc7 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Fri, 10 Feb 2023 09:16:18 -0500 Subject: [PATCH] chore: clean up owlbot post-processing (#5856) --- AccessApproval/owlbot.py | 30 ------------------- AccessContextManager/owlbot.py | 24 --------------- AiPlatform/owlbot.py | 25 ---------------- AnalyticsAdmin/owlbot.py | 24 --------------- AnalyticsData/owlbot.py | 23 -------------- ApiGateway/owlbot.py | 30 ------------------- ApiKeys/owlbot.py | 6 ---- ApigeeConnect/owlbot.py | 30 ------------------- ApigeeRegistry/owlbot.py | 23 -------------- AppEngineAdmin/owlbot.py | 30 ------------------- ArtifactRegistry/owlbot.py | 26 ---------------- Asset/owlbot.py | 26 ---------------- AssuredWorkloads/owlbot.py | 26 ---------------- AutoMl/owlbot.py | 26 ---------------- BareMetalSolution/owlbot.py | 23 -------------- Batch/owlbot.py | 24 --------------- BeyondCorpAppConnections/owlbot.py | 24 --------------- BeyondCorpAppConnectors/owlbot.py | 24 --------------- BeyondCorpAppGateways/owlbot.py | 24 --------------- BeyondCorpClientConnectorServices/owlbot.py | 24 --------------- BeyondCorpClientGateways/owlbot.py | 24 --------------- BigQueryAnalyticsHub/owlbot.py | 6 ---- BigQueryConnection/owlbot.py | 29 ------------------ BigQueryDataExchange/owlbot.py | 23 -------------- BigQueryDataPolicies/owlbot.py | 6 ---- BigQueryDataTransfer/owlbot.py | 26 ---------------- BigQueryMigration/owlbot.py | 6 ---- BigQueryReservation/owlbot.py | 29 ------------------ BigQueryStorage/owlbot.py | 26 ---------------- Bigtable/owlbot.py | 23 -------------- Billing/owlbot.py | 24 --------------- BillingBudgets/owlbot.py | 30 ------------------- BinaryAuthorization/owlbot.py | 26 ---------------- Build/owlbot.py | 26 ---------------- CertificateManager/owlbot.py | 25 ---------------- Channel/owlbot.py | 30 ------------------- Compute/owlbot.py | 17 ----------- ContactCenterInsights/owlbot.py | 24 --------------- Container/owlbot.py | 26 ---------------- ContainerAnalysis/owlbot.py | 24 --------------- DataCatalog/owlbot.py | 33 --------------------- DataFusion/owlbot.py | 25 ---------------- DataLabeling/owlbot.py | 26 ---------------- Dataflow/owlbot.py | 26 ---------------- Dataform/owlbot.py | 24 --------------- Dataplex/owlbot.py | 25 ---------------- Dataproc/owlbot.py | 26 ---------------- DataprocMetastore/owlbot.py | 26 ---------------- Datastore/owlbot.py | 23 -------------- DatastoreAdmin/owlbot.py | 23 -------------- Datastream/owlbot.py | 24 --------------- Debugger/owlbot.py | 23 -------------- Deploy/owlbot.py | 24 --------------- Dialogflow/owlbot.py | 30 ------------------- Dlp/owlbot.py | 17 ----------- Dms/owlbot.py | 30 ------------------- DocumentAi/owlbot.py | 23 -------------- Domains/owlbot.py | 23 -------------- ErrorReporting/owlbot.py | 23 -------------- EssentialContacts/owlbot.py | 24 --------------- Eventarc/owlbot.py | 30 ------------------- EventarcPublishing/owlbot.py | 25 ---------------- Filestore/owlbot.py | 30 ------------------- Firestore/owlbot.py | 23 -------------- Functions/owlbot.py | 23 -------------- GSuiteAddOns/owlbot.py | 6 ---- Gaming/owlbot.py | 23 -------------- GkeBackup/owlbot.py | 23 -------------- GkeConnectGateway/owlbot.py | 26 ---------------- GkeHub/owlbot.py | 24 --------------- GkeMultiCloud/owlbot.py | 23 -------------- Grafeas/owlbot.py | 23 -------------- Iam/owlbot.py | 6 ---- IamCredentials/owlbot.py | 23 -------------- Iap/owlbot.py | 30 ------------------- Ids/owlbot.py | 25 ---------------- Iot/owlbot.py | 26 ---------------- Kms/owlbot.py | 27 +---------------- Language/owlbot.py | 23 -------------- LifeSciences/owlbot.py | 26 ---------------- Logging/owlbot.py | 23 -------------- LongRunning/owlbot.py | 17 ----------- ManagedIdentities/owlbot.py | 30 ------------------- MediaTranslation/owlbot.py | 26 ---------------- Memcache/owlbot.py | 30 ------------------- Monitoring/owlbot.py | 23 -------------- NetworkConnectivity/owlbot.py | 30 ------------------- NetworkManagement/owlbot.py | 30 ------------------- NetworkSecurity/owlbot.py | 23 -------------- Notebooks/owlbot.py | 24 --------------- Optimization/owlbot.py | 24 --------------- OrchestrationAirflow/owlbot.py | 30 ------------------- OrgPolicy/owlbot.py | 24 --------------- OsConfig/owlbot.py | 17 ----------- OsLogin/owlbot.py | 19 ------------ PolicyTroubleshooter/owlbot.py | 30 ------------------- PrivateCatalog/owlbot.py | 24 --------------- Profiler/owlbot.py | 30 ------------------- PubSub/owlbot.py | 23 -------------- RecaptchaEnterprise/owlbot.py | 24 --------------- RecommendationEngine/owlbot.py | 31 ------------------- Recommender/owlbot.py | 26 ---------------- Redis/owlbot.py | 27 ----------------- ResourceManager/owlbot.py | 23 -------------- ResourceSettings/owlbot.py | 23 -------------- Retail/owlbot.py | 23 -------------- Run/owlbot.py | 23 -------------- Scheduler/owlbot.py | 26 ---------------- SecretManager/owlbot.py | 26 ---------------- SecurityCenter/owlbot.py | 27 +---------------- SecurityPrivateCa/owlbot.py | 23 -------------- SecurityPublicCA/owlbot.py | 6 ---- ServiceControl/owlbot.py | 23 -------------- ServiceDirectory/owlbot.py | 24 --------------- ServiceManagement/owlbot.py | 23 -------------- ServiceUsage/owlbot.py | 23 -------------- Shell/owlbot.py | 23 -------------- Spanner/owlbot.py | 23 -------------- Speech/owlbot.py | 25 ---------------- SqlAdmin/owlbot.py | 23 -------------- StorageTransfer/owlbot.py | 23 -------------- Talent/owlbot.py | 23 -------------- Tasks/owlbot.py | 26 ---------------- TextToSpeech/owlbot.py | 26 ---------------- Tpu/owlbot.py | 23 -------------- Trace/owlbot.py | 26 ---------------- Translate/owlbot.py | 26 ---------------- VideoIntelligence/owlbot.py | 26 ---------------- VideoLiveStream/owlbot.py | 25 ---------------- VideoStitcher/owlbot.py | 25 ---------------- VideoTranscoder/owlbot.py | 23 -------------- Vision/owlbot.py | 25 ---------------- VmMigration/owlbot.py | 25 ---------------- VmwareEngine/owlbot.py | 6 ---- VpcAccess/owlbot.py | 23 -------------- WebRisk/owlbot.py | 26 ---------------- WebSecurityScanner/owlbot.py | 23 -------------- Workflows/owlbot.py | 23 -------------- 138 files changed, 2 insertions(+), 3298 deletions(-) diff --git a/AccessApproval/owlbot.py b/AccessApproval/owlbot.py index dc5f6535e264..1c3242feba40 100644 --- a/AccessApproval/owlbot.py +++ b/AccessApproval/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - # [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AccessContextManager/owlbot.py b/AccessContextManager/owlbot.py index e10940791ca0..83eca31d8c63 100644 --- a/AccessContextManager/owlbot.py +++ b/AccessContextManager/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AiPlatform/owlbot.py b/AiPlatform/owlbot.py index e3fd10a05fdf..b9761c9858b0 100644 --- a/AiPlatform/owlbot.py +++ b/AiPlatform/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AnalyticsAdmin/owlbot.py b/AnalyticsAdmin/owlbot.py index 78c297c8614b..1e62d859ebe5 100644 --- a/AnalyticsAdmin/owlbot.py +++ b/AnalyticsAdmin/owlbot.py @@ -39,24 +39,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -73,12 +55,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AnalyticsData/owlbot.py b/AnalyticsData/owlbot.py index ad9b62c1d792..6d2c05c28890 100644 --- a/AnalyticsData/owlbot.py +++ b/AnalyticsData/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ApiGateway/owlbot.py b/ApiGateway/owlbot.py index 978df8c60e09..bed0fcd45795 100644 --- a/ApiGateway/owlbot.py +++ b/ApiGateway/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ApiKeys/owlbot.py b/ApiKeys/owlbot.py index cbd8b306a83e..e09c1aef4409 100644 --- a/ApiKeys/owlbot.py +++ b/ApiKeys/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ApigeeConnect/owlbot.py b/ApigeeConnect/owlbot.py index 1b6b3e6faa07..2f3e3c3b148d 100644 --- a/ApigeeConnect/owlbot.py +++ b/ApigeeConnect/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ApigeeRegistry/owlbot.py b/ApigeeRegistry/owlbot.py index 36636a08010b..d085b335303d 100644 --- a/ApigeeRegistry/owlbot.py +++ b/ApigeeRegistry/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AppEngineAdmin/owlbot.py b/AppEngineAdmin/owlbot.py index aff129f66876..1fb398bc3d9d 100644 --- a/AppEngineAdmin/owlbot.py +++ b/AppEngineAdmin/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ArtifactRegistry/owlbot.py b/ArtifactRegistry/owlbot.py index 3f9859a55581..59e026157de7 100644 --- a/ArtifactRegistry/owlbot.py +++ b/ArtifactRegistry/owlbot.py @@ -28,26 +28,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -64,12 +44,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Asset/owlbot.py b/Asset/owlbot.py index a4a3f649a29e..6e03d56eb159 100644 --- a/Asset/owlbot.py +++ b/Asset/owlbot.py @@ -28,26 +28,6 @@ dest = Path().resolve() php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -64,12 +44,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AssuredWorkloads/owlbot.py b/AssuredWorkloads/owlbot.py index cc80e8f13d73..e30d63687ede 100644 --- a/AssuredWorkloads/owlbot.py +++ b/AssuredWorkloads/owlbot.py @@ -28,26 +28,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -64,12 +44,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/AutoMl/owlbot.py b/AutoMl/owlbot.py index d3f284375629..10b9172e5852 100644 --- a/AutoMl/owlbot.py +++ b/AutoMl/owlbot.py @@ -28,26 +28,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -93,12 +73,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BareMetalSolution/owlbot.py b/BareMetalSolution/owlbot.py index d77c02436c5b..fa2e47441dd7 100644 --- a/BareMetalSolution/owlbot.py +++ b/BareMetalSolution/owlbot.py @@ -38,23 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -66,12 +49,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Batch/owlbot.py b/Batch/owlbot.py index 599d896c4537..7bfa9828e969 100644 --- a/Batch/owlbot.py +++ b/Batch/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BeyondCorpAppConnections/owlbot.py b/BeyondCorpAppConnections/owlbot.py index c3d6cf3e10f3..c02f34ff1e7c 100644 --- a/BeyondCorpAppConnections/owlbot.py +++ b/BeyondCorpAppConnections/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BeyondCorpAppConnectors/owlbot.py b/BeyondCorpAppConnectors/owlbot.py index 43f6d1ac8d17..e26780eecc65 100644 --- a/BeyondCorpAppConnectors/owlbot.py +++ b/BeyondCorpAppConnectors/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BeyondCorpAppGateways/owlbot.py b/BeyondCorpAppGateways/owlbot.py index cdb2d8b2dfb2..13fe4259a0b7 100644 --- a/BeyondCorpAppGateways/owlbot.py +++ b/BeyondCorpAppGateways/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BeyondCorpClientConnectorServices/owlbot.py b/BeyondCorpClientConnectorServices/owlbot.py index 300058ef37f3..3d9cbc2794e0 100644 --- a/BeyondCorpClientConnectorServices/owlbot.py +++ b/BeyondCorpClientConnectorServices/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BeyondCorpClientGateways/owlbot.py b/BeyondCorpClientGateways/owlbot.py index c5b3b79332c6..6c4a77a86902 100644 --- a/BeyondCorpClientGateways/owlbot.py +++ b/BeyondCorpClientGateways/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryAnalyticsHub/owlbot.py b/BigQueryAnalyticsHub/owlbot.py index 3c9a72a33e0e..2d91fedc994e 100644 --- a/BigQueryAnalyticsHub/owlbot.py +++ b/BigQueryAnalyticsHub/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryConnection/owlbot.py b/BigQueryConnection/owlbot.py index 1d9959ef8632..9e203a68a283 100644 --- a/BigQueryConnection/owlbot.py +++ b/BigQueryConnection/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # prevent null reference error when descriptor uses optional field. s.replace( @@ -78,12 +61,6 @@ }""" ) -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - # fix test group s.replace( 'tests/**/V1/*Test.php', @@ -100,12 +77,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryDataExchange/owlbot.py b/BigQueryDataExchange/owlbot.py index 00c074eeace2..b738591a3701 100644 --- a/BigQueryDataExchange/owlbot.py +++ b/BigQueryDataExchange/owlbot.py @@ -38,23 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -66,12 +49,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryDataPolicies/owlbot.py b/BigQueryDataPolicies/owlbot.py index 53051ff25122..3119d011803d 100644 --- a/BigQueryDataPolicies/owlbot.py +++ b/BigQueryDataPolicies/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryDataTransfer/owlbot.py b/BigQueryDataTransfer/owlbot.py index fed50a25cf5b..9273a2fec845 100644 --- a/BigQueryDataTransfer/owlbot.py +++ b/BigQueryDataTransfer/owlbot.py @@ -38,26 +38,6 @@ ] ) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -86,12 +66,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryMigration/owlbot.py b/BigQueryMigration/owlbot.py index 15c8f958b5c6..bb460e5eea33 100644 --- a/BigQueryMigration/owlbot.py +++ b/BigQueryMigration/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryReservation/owlbot.py b/BigQueryReservation/owlbot.py index 3d0a0495b116..0289cc2a59e4 100644 --- a/BigQueryReservation/owlbot.py +++ b/BigQueryReservation/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # prevent null reference error when descriptor uses optional field. s.replace( @@ -78,12 +61,6 @@ }""" ) -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - # fix test group s.replace( 'tests/**/V1/*Test.php', @@ -100,12 +77,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BigQueryStorage/owlbot.py b/BigQueryStorage/owlbot.py index 9e89b487873c..db7fd471b731 100644 --- a/BigQueryStorage/owlbot.py +++ b/BigQueryStorage/owlbot.py @@ -28,26 +28,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -70,12 +50,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Bigtable/owlbot.py b/Bigtable/owlbot.py index 075764ff2141..c8359f87e963 100644 --- a/Bigtable/owlbot.py +++ b/Bigtable/owlbot.py @@ -56,23 +56,6 @@ # copy GPBMetadata file to metadata s.move(admin_library / f'proto/src/GPBMetadata/Google/Bigtable', f'metadata/', merge=preserve_copyright_year) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # fix unit test namespace s.replace( @@ -123,12 +106,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Billing/owlbot.py b/Billing/owlbot.py index c25bb5f6d941..3a7df9c0f376 100644 --- a/Billing/owlbot.py +++ b/Billing/owlbot.py @@ -34,24 +34,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"serviceAddress =>", - r"apiEndpoint =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -74,12 +56,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BillingBudgets/owlbot.py b/BillingBudgets/owlbot.py index 7b89d7746d2e..2eb18fbe47cd 100644 --- a/BillingBudgets/owlbot.py +++ b/BillingBudgets/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/BinaryAuthorization/owlbot.py b/BinaryAuthorization/owlbot.py index 523cab9c7bee..1e6def5482ba 100644 --- a/BinaryAuthorization/owlbot.py +++ b/BinaryAuthorization/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Build/owlbot.py b/Build/owlbot.py index 6c32f92cd895..de793d0275c3 100644 --- a/Build/owlbot.py +++ b/Build/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/CertificateManager/owlbot.py b/CertificateManager/owlbot.py index 17c3da23c806..306fdb37b6a1 100644 --- a/CertificateManager/owlbot.py +++ b/CertificateManager/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Channel/owlbot.py b/Channel/owlbot.py index e50f16f5d338..0e0d530f007f 100644 --- a/Channel/owlbot.py +++ b/Channel/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Compute/owlbot.py b/Compute/owlbot.py index f99692be9b56..cf1ef4a931db 100644 --- a/Compute/owlbot.py +++ b/Compute/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes diff --git a/ContactCenterInsights/owlbot.py b/ContactCenterInsights/owlbot.py index da30e56e4ca1..35f373259081 100644 --- a/ContactCenterInsights/owlbot.py +++ b/ContactCenterInsights/owlbot.py @@ -38,7 +38,6 @@ ] ) - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -50,23 +49,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -78,12 +60,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/Container/owlbot.py b/Container/owlbot.py index d9986abf8974..a609da1b1a52 100644 --- a/Container/owlbot.py +++ b/Container/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -91,12 +71,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ContainerAnalysis/owlbot.py b/ContainerAnalysis/owlbot.py index 1d215773f0d7..d833bb5078b5 100644 --- a/ContainerAnalysis/owlbot.py +++ b/ContainerAnalysis/owlbot.py @@ -38,7 +38,6 @@ ] ) - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -50,23 +49,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -78,12 +60,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/DataCatalog/owlbot.py b/DataCatalog/owlbot.py index c7458f39ad3b..9d4e99031c21 100644 --- a/DataCatalog/owlbot.py +++ b/DataCatalog/owlbot.py @@ -32,33 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# fix namespace casing -s.replace( - "**/*.php", - r"(namespace|use) Google\\Cloud\\Datacatalog", - r"\1 Google\\Cloud\\DataCatalog", -) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -81,12 +54,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/DataFusion/owlbot.py b/DataFusion/owlbot.py index 74c607668db6..70be311fb188 100644 --- a/DataFusion/owlbot.py +++ b/DataFusion/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/DataLabeling/owlbot.py b/DataLabeling/owlbot.py index 32862ef2844d..d75dfe4a75c5 100644 --- a/DataLabeling/owlbot.py +++ b/DataLabeling/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Dataflow/owlbot.py b/Dataflow/owlbot.py index af91e48c8e43..4fdbf7349de4 100644 --- a/Dataflow/owlbot.py +++ b/Dataflow/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Dataform/owlbot.py b/Dataform/owlbot.py index c8b0014c6c87..f903f99c5612 100644 --- a/Dataform/owlbot.py +++ b/Dataform/owlbot.py @@ -39,24 +39,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Dataplex/owlbot.py b/Dataplex/owlbot.py index 071ae0f31bd2..5bc5a75e58bf 100644 --- a/Dataplex/owlbot.py +++ b/Dataplex/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Dataproc/owlbot.py b/Dataproc/owlbot.py index 0f7310f48d25..b45c681cdb34 100644 --- a/Dataproc/owlbot.py +++ b/Dataproc/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/DataprocMetastore/owlbot.py b/DataprocMetastore/owlbot.py index 0f27ad4092f3..1681b97bf6c0 100644 --- a/DataprocMetastore/owlbot.py +++ b/DataprocMetastore/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Datastore/owlbot.py b/Datastore/owlbot.py index 237151cf09cd..6d38be2ead7b 100644 --- a/Datastore/owlbot.py +++ b/Datastore/owlbot.py @@ -38,23 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # Fix class references in gapic samples for version in ['V1']: @@ -91,12 +74,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/DatastoreAdmin/owlbot.py b/DatastoreAdmin/owlbot.py index 5c3b60cd5353..234a7859b405 100644 --- a/DatastoreAdmin/owlbot.py +++ b/DatastoreAdmin/owlbot.py @@ -34,23 +34,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") s.replace( "**/Gapic/DatastoreAdminGapicClient.php", @@ -69,12 +52,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Datastream/owlbot.py b/Datastream/owlbot.py index 2fff8712bac4..2088f5493e4c 100644 --- a/Datastream/owlbot.py +++ b/Datastream/owlbot.py @@ -39,24 +39,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Debugger/owlbot.py b/Debugger/owlbot.py index 6d4dfd44e08e..a906c74e7a69 100644 --- a/Debugger/owlbot.py +++ b/Debugger/owlbot.py @@ -34,23 +34,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -62,12 +45,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Deploy/owlbot.py b/Deploy/owlbot.py index fba02e93d126..705060c89592 100644 --- a/Deploy/owlbot.py +++ b/Deploy/owlbot.py @@ -38,7 +38,6 @@ ] ) - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -50,23 +49,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -78,12 +60,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/Dialogflow/owlbot.py b/Dialogflow/owlbot.py index 02dd19940b81..218eac1f3b4a 100644 --- a/Dialogflow/owlbot.py +++ b/Dialogflow/owlbot.py @@ -54,30 +54,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - # Use new namespace in the doc sample. See # https://github.com/googleapis/gapic-generator/issues/2141 s.replace( @@ -100,12 +76,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Dlp/owlbot.py b/Dlp/owlbot.py index b1d47ea4e443..2e489dbad357 100644 --- a/Dlp/owlbot.py +++ b/Dlp/owlbot.py @@ -34,23 +34,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # V2 is GA, so remove @experimental tags s.replace( diff --git a/Dms/owlbot.py b/Dms/owlbot.py index 568b3d721dab..831213e3c2e7 100644 --- a/Dms/owlbot.py +++ b/Dms/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/DocumentAi/owlbot.py b/DocumentAi/owlbot.py index d790d5ea8390..cc94a14b0da0 100644 --- a/DocumentAi/owlbot.py +++ b/DocumentAi/owlbot.py @@ -50,23 +50,6 @@ -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -78,12 +61,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/Domains/owlbot.py b/Domains/owlbot.py index c66e74bd10d3..3c172975cfeb 100644 --- a/Domains/owlbot.py +++ b/Domains/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ErrorReporting/owlbot.py b/ErrorReporting/owlbot.py index a1da9725babe..84a962769472 100644 --- a/ErrorReporting/owlbot.py +++ b/ErrorReporting/owlbot.py @@ -32,23 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -60,12 +43,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/EssentialContacts/owlbot.py b/EssentialContacts/owlbot.py index 37f9e3cd6e64..87283d223625 100644 --- a/EssentialContacts/owlbot.py +++ b/EssentialContacts/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Eventarc/owlbot.py b/Eventarc/owlbot.py index 2ffde5cd1051..4aa3e8f7253b 100644 --- a/Eventarc/owlbot.py +++ b/Eventarc/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/EventarcPublishing/owlbot.py b/EventarcPublishing/owlbot.py index b0bac30df5e8..0b0ae44f22f3 100644 --- a/EventarcPublishing/owlbot.py +++ b/EventarcPublishing/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Filestore/owlbot.py b/Filestore/owlbot.py index 358ecdd59a7a..7b7cd62163b9 100644 --- a/Filestore/owlbot.py +++ b/Filestore/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Firestore/owlbot.py b/Firestore/owlbot.py index 74098054200b..b859bc527d9b 100644 --- a/Firestore/owlbot.py +++ b/Firestore/owlbot.py @@ -63,23 +63,6 @@ # copy GPBMetadata file to metadata s.move(admin_library / f'proto/src/GPBMetadata/Google/Firestore', f'metadata/', merge=preserve_copyright_year) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") yearFixes = [ { @@ -135,12 +118,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Functions/owlbot.py b/Functions/owlbot.py index 75b773a50c55..b4b5737bc956 100644 --- a/Functions/owlbot.py +++ b/Functions/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/GSuiteAddOns/owlbot.py b/GSuiteAddOns/owlbot.py index de07be682a0c..52aaaadc39d1 100644 --- a/GSuiteAddOns/owlbot.py +++ b/GSuiteAddOns/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Gaming/owlbot.py b/Gaming/owlbot.py index a9411af2590a..2c6c71417d71 100644 --- a/Gaming/owlbot.py +++ b/Gaming/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/GkeBackup/owlbot.py b/GkeBackup/owlbot.py index bdf8a3ecc523..b2c18a0bbe56 100644 --- a/GkeBackup/owlbot.py +++ b/GkeBackup/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/GkeConnectGateway/owlbot.py b/GkeConnectGateway/owlbot.py index df86df6a66fa..f7b96f481151 100644 --- a/GkeConnectGateway/owlbot.py +++ b/GkeConnectGateway/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/GkeHub/owlbot.py b/GkeHub/owlbot.py index b9c855344b6d..13cc24105ba0 100644 --- a/GkeHub/owlbot.py +++ b/GkeHub/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/GkeMultiCloud/owlbot.py b/GkeMultiCloud/owlbot.py index d4a7aaf82157..b22132746abb 100644 --- a/GkeMultiCloud/owlbot.py +++ b/GkeMultiCloud/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Grafeas/owlbot.py b/Grafeas/owlbot.py index 8d7ec1827d69..db3469d53e14 100644 --- a/Grafeas/owlbot.py +++ b/Grafeas/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/Iam/owlbot.py b/Iam/owlbot.py index 616f7341451c..6f1f236bc9c1 100644 --- a/Iam/owlbot.py +++ b/Iam/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/IamCredentials/owlbot.py b/IamCredentials/owlbot.py index e56200c27874..2c72103da3b1 100644 --- a/IamCredentials/owlbot.py +++ b/IamCredentials/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Iap/owlbot.py b/Iap/owlbot.py index 8e9a82ad8cfa..205587f518e7 100644 --- a/Iap/owlbot.py +++ b/Iap/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Ids/owlbot.py b/Ids/owlbot.py index f9e9241c07d7..0ba12d50ced5 100644 --- a/Ids/owlbot.py +++ b/Ids/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Iot/owlbot.py b/Iot/owlbot.py index 5cf22641cad9..a03f77936152 100644 --- a/Iot/owlbot.py +++ b/Iot/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Kms/owlbot.py b/Kms/owlbot.py index 0948d7319663..7a1f95992c5e 100644 --- a/Kms/owlbot.py +++ b/Kms/owlbot.py @@ -37,26 +37,6 @@ src / "*/src/V1/KeyManagementServiceClient.php" ] ) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -79,6 +59,7 @@ 'src/V1/Gapic/KeyManagementServiceGapicClient.php', r'CryptoKey_CryptoKeyPurpose', 'CryptoKeyPurpose') + # Change the wording for the deprecation warning. s.replace( 'src/V1/CryptoKey*_*.php', @@ -95,12 +76,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Language/owlbot.py b/Language/owlbot.py index d46e111e68f4..5d014c17eb49 100644 --- a/Language/owlbot.py +++ b/Language/owlbot.py @@ -32,23 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # Fix class references in gapic samples for version in ['V1', 'V1beta2']: @@ -77,12 +60,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/LifeSciences/owlbot.py b/LifeSciences/owlbot.py index a4e43103e48a..c23e85728675 100644 --- a/LifeSciences/owlbot.py +++ b/LifeSciences/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Logging/owlbot.py b/Logging/owlbot.py index 36e3f20d033e..fabfe6a44a1f 100644 --- a/Logging/owlbot.py +++ b/Logging/owlbot.py @@ -32,23 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -60,12 +43,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/LongRunning/owlbot.py b/LongRunning/owlbot.py index 40b1164d6ec6..fc547a8a4251 100644 --- a/LongRunning/owlbot.py +++ b/LongRunning/owlbot.py @@ -66,23 +66,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes diff --git a/ManagedIdentities/owlbot.py b/ManagedIdentities/owlbot.py index 200cd088050b..2d99710f42a4 100644 --- a/ManagedIdentities/owlbot.py +++ b/ManagedIdentities/owlbot.py @@ -54,30 +54,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -88,12 +64,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/MediaTranslation/owlbot.py b/MediaTranslation/owlbot.py index 26f0a7c8e8fe..f269a4a94d58 100644 --- a/MediaTranslation/owlbot.py +++ b/MediaTranslation/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -68,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Memcache/owlbot.py b/Memcache/owlbot.py index 77d11a270257..cdef6b47988e 100644 --- a/Memcache/owlbot.py +++ b/Memcache/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Monitoring/owlbot.py b/Monitoring/owlbot.py index d0833dffb4f4..c56862e09a80 100644 --- a/Monitoring/owlbot.py +++ b/Monitoring/owlbot.py @@ -42,23 +42,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # V3 is GA, so remove @experimental tags s.replace( @@ -113,12 +96,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/NetworkConnectivity/owlbot.py b/NetworkConnectivity/owlbot.py index 2950ea85ed49..baac27b85273 100644 --- a/NetworkConnectivity/owlbot.py +++ b/NetworkConnectivity/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/NetworkManagement/owlbot.py b/NetworkManagement/owlbot.py index be4c7847b197..0db16c32873f 100644 --- a/NetworkManagement/owlbot.py +++ b/NetworkManagement/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/NetworkSecurity/owlbot.py b/NetworkSecurity/owlbot.py index 1ee104509853..8880ae409101 100644 --- a/NetworkSecurity/owlbot.py +++ b/NetworkSecurity/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - ### [END] protoc backwards compatibility fixes # fix relative cloud.google.com links diff --git a/Notebooks/owlbot.py b/Notebooks/owlbot.py index f273df2b176b..8505efd3a495 100644 --- a/Notebooks/owlbot.py +++ b/Notebooks/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Optimization/owlbot.py b/Optimization/owlbot.py index ee0c4af19566..e062ddb1f10d 100644 --- a/Optimization/owlbot.py +++ b/Optimization/owlbot.py @@ -38,24 +38,6 @@ ] ) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -75,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/OrchestrationAirflow/owlbot.py b/OrchestrationAirflow/owlbot.py index 401219db26e4..522314d65e40 100644 --- a/OrchestrationAirflow/owlbot.py +++ b/OrchestrationAirflow/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/OrgPolicy/owlbot.py b/OrgPolicy/owlbot.py index 36029530241e..4e1387f272bf 100644 --- a/OrgPolicy/owlbot.py +++ b/OrgPolicy/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/OsConfig/owlbot.py b/OsConfig/owlbot.py index acb9fb1f7d23..dba40534c090 100644 --- a/OsConfig/owlbot.py +++ b/OsConfig/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes diff --git a/OsLogin/owlbot.py b/OsLogin/owlbot.py index 9d108ef8f94d..460f2b276901 100644 --- a/OsLogin/owlbot.py +++ b/OsLogin/owlbot.py @@ -31,25 +31,6 @@ _tracked_paths.add(src) php.owlbot_main(src=src, dest=dest) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', diff --git a/PolicyTroubleshooter/owlbot.py b/PolicyTroubleshooter/owlbot.py index c847cc244407..86042536d6cb 100644 --- a/PolicyTroubleshooter/owlbot.py +++ b/PolicyTroubleshooter/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/PrivateCatalog/owlbot.py b/PrivateCatalog/owlbot.py index bcb72d1e7f09..a41770665ba5 100644 --- a/PrivateCatalog/owlbot.py +++ b/PrivateCatalog/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -66,12 +48,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Profiler/owlbot.py b/Profiler/owlbot.py index 252d1fcef934..36c97c4c0de1 100644 --- a/Profiler/owlbot.py +++ b/Profiler/owlbot.py @@ -48,30 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - -# Change the wording for the deprecation warning. -s.replace( - 'src/*/*_*.php', - r'will be removed in the next major release', - 'will be removed in a future release') - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/PubSub/owlbot.py b/PubSub/owlbot.py index d116446897fa..b6ae167da85e 100644 --- a/PubSub/owlbot.py +++ b/PubSub/owlbot.py @@ -32,23 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") s.replace( 'tests/**/V1/*Test.php', @@ -71,12 +54,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/RecaptchaEnterprise/owlbot.py b/RecaptchaEnterprise/owlbot.py index 217ce28ad8e4..811fca766e34 100644 --- a/RecaptchaEnterprise/owlbot.py +++ b/RecaptchaEnterprise/owlbot.py @@ -32,24 +32,6 @@ php.owlbot_main(src=src, dest=dest) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -72,12 +54,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/RecommendationEngine/owlbot.py b/RecommendationEngine/owlbot.py index 8debf1c15bf0..d50424242ad4 100644 --- a/RecommendationEngine/owlbot.py +++ b/RecommendationEngine/owlbot.py @@ -47,31 +47,6 @@ + "\n", '') -# fix namespace casing -s.replace( - "**/*.php", - r"(namespace|use) Google\\Cloud\\Recommendationengine", - r"\1 Google\\Cloud\\RecommendationEngine", -) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -82,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Recommender/owlbot.py b/Recommender/owlbot.py index 9e1b7472605b..11669e52741b 100644 --- a/Recommender/owlbot.py +++ b/Recommender/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -74,12 +54,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Redis/owlbot.py b/Redis/owlbot.py index f70af54400dc..b83e85778eec 100644 --- a/Redis/owlbot.py +++ b/Redis/owlbot.py @@ -38,33 +38,12 @@ src / "*/src/V1beta1/CloudRedisClient.php" ] ) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', r'^(\s+\*\n)?\s+\*\s@experimental\n', '') - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -102,12 +81,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ResourceManager/owlbot.py b/ResourceManager/owlbot.py index 009c2c799b9b..f70129a8c5c0 100644 --- a/ResourceManager/owlbot.py +++ b/ResourceManager/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ResourceSettings/owlbot.py b/ResourceSettings/owlbot.py index e2301715e9af..8e9943546a6c 100644 --- a/ResourceSettings/owlbot.py +++ b/ResourceSettings/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Retail/owlbot.py b/Retail/owlbot.py index 2bb71b729572..f67ccbc8950b 100644 --- a/Retail/owlbot.py +++ b/Retail/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Run/owlbot.py b/Run/owlbot.py index 7e581a3a7e47..52d48b710831 100644 --- a/Run/owlbot.py +++ b/Run/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Scheduler/owlbot.py b/Scheduler/owlbot.py index 4a9620497484..7da1898726be 100644 --- a/Scheduler/owlbot.py +++ b/Scheduler/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -125,12 +105,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/SecretManager/owlbot.py b/SecretManager/owlbot.py index fd9bfc18db20..06e09cbf3b3c 100644 --- a/SecretManager/owlbot.py +++ b/SecretManager/owlbot.py @@ -31,26 +31,6 @@ _tracked_paths.add(src) php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -73,12 +53,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/SecurityCenter/owlbot.py b/SecurityCenter/owlbot.py index 322871d9cd79..a519a5c058fb 100644 --- a/SecurityCenter/owlbot.py +++ b/SecurityCenter/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -64,6 +44,7 @@ 'src/V1/Gapic/SecurityCenterGapicClient.php', r'Finding_State', r'Finding\\State') + # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -80,12 +61,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/SecurityPrivateCa/owlbot.py b/SecurityPrivateCa/owlbot.py index ab2c60b08516..1e6eef9151d7 100644 --- a/SecurityPrivateCa/owlbot.py +++ b/SecurityPrivateCa/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/SecurityPublicCA/owlbot.py b/SecurityPublicCA/owlbot.py index ebf9cc26d703..77da9d58cffa 100644 --- a/SecurityPublicCA/owlbot.py +++ b/SecurityPublicCA/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ServiceControl/owlbot.py b/ServiceControl/owlbot.py index a523625b249a..ed96c48e2a61 100644 --- a/ServiceControl/owlbot.py +++ b/ServiceControl/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ServiceDirectory/owlbot.py b/ServiceDirectory/owlbot.py index 82cce9f85c00..958caf27797b 100644 --- a/ServiceDirectory/owlbot.py +++ b/ServiceDirectory/owlbot.py @@ -48,24 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"serviceAddress =>", - r"apiEndpoint =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - ### [START] protoc backwards compatibility fixes # roll back to private properties. @@ -76,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ServiceManagement/owlbot.py b/ServiceManagement/owlbot.py index 727b3eff70e0..5f1455f1f61e 100644 --- a/ServiceManagement/owlbot.py +++ b/ServiceManagement/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/ServiceUsage/owlbot.py b/ServiceUsage/owlbot.py index d7e366250c1f..582c4a1bda78 100644 --- a/ServiceUsage/owlbot.py +++ b/ServiceUsage/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Shell/owlbot.py b/Shell/owlbot.py index 0bf75b3af39a..ba2c9ecf6647 100644 --- a/Shell/owlbot.py +++ b/Shell/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Spanner/owlbot.py b/Spanner/owlbot.py index ddc136185bc7..8981c6fae457 100644 --- a/Spanner/owlbot.py +++ b/Spanner/owlbot.py @@ -68,23 +68,6 @@ # copy GPBMetadata file to metadata s.move(admin_library / f'proto/src/GPBMetadata/Google/Spanner', f'metadata/', merge=php._merge) -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") # Fix test namespaces s.replace( @@ -193,12 +176,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Speech/owlbot.py b/Speech/owlbot.py index 54f437392997..446706835a42 100644 --- a/Speech/owlbot.py +++ b/Speech/owlbot.py @@ -41,25 +41,6 @@ src / "*/src/V2/SpeechClient.php" ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -101,12 +82,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/SqlAdmin/owlbot.py b/SqlAdmin/owlbot.py index 3641c5c2c463..5988743ac085 100644 --- a/SqlAdmin/owlbot.py +++ b/SqlAdmin/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/StorageTransfer/owlbot.py b/StorageTransfer/owlbot.py index 25b5a8fa7c09..749b288938ef 100644 --- a/StorageTransfer/owlbot.py +++ b/StorageTransfer/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Talent/owlbot.py b/Talent/owlbot.py index ff96274da63a..6f5863f91be4 100644 --- a/Talent/owlbot.py +++ b/Talent/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") clients = ['ApplicationService', 'CompanyService', 'Completion', 'EventService', 'JobService', 'ProfileService', 'TenantService'] for client in clients: @@ -97,12 +80,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Tasks/owlbot.py b/Tasks/owlbot.py index ada175841195..56b433ca7786 100644 --- a/Tasks/owlbot.py +++ b/Tasks/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Use new namespace in the doc sample. See # https://github.com/googleapis/gapic-generator/issues/2141 s.replace( @@ -137,12 +117,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/TextToSpeech/owlbot.py b/TextToSpeech/owlbot.py index aec467fb9d6c..0e7a92dd21d7 100644 --- a/TextToSpeech/owlbot.py +++ b/TextToSpeech/owlbot.py @@ -31,26 +31,6 @@ _tracked_paths.add(src) php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -67,12 +47,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Tpu/owlbot.py b/Tpu/owlbot.py index 6e819baa48e1..0c04d732756e 100644 --- a/Tpu/owlbot.py +++ b/Tpu/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Trace/owlbot.py b/Trace/owlbot.py index 8122cab747e5..58f4b735b2dd 100644 --- a/Trace/owlbot.py +++ b/Trace/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -80,12 +60,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Translate/owlbot.py b/Translate/owlbot.py index e8aeeef8a8e0..5095cd42dc40 100644 --- a/Translate/owlbot.py +++ b/Translate/owlbot.py @@ -37,26 +37,6 @@ src / "*/src/V2/TranslateClient.php" ] ) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # Change the wording for the deprecation warning. s.replace( 'src/*/*_*.php', @@ -73,12 +53,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VideoIntelligence/owlbot.py b/VideoIntelligence/owlbot.py index e6508e75e5cb..4d28e9601ec1 100644 --- a/VideoIntelligence/owlbot.py +++ b/VideoIntelligence/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/VideoIntelligenceServiceClient.php', @@ -72,12 +52,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VideoLiveStream/owlbot.py b/VideoLiveStream/owlbot.py index 1d47fe3f95a9..ef07c22ec3e9 100644 --- a/VideoLiveStream/owlbot.py +++ b/VideoLiveStream/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VideoStitcher/owlbot.py b/VideoStitcher/owlbot.py index 7fa5c3f7f1d5..dd650436677c 100644 --- a/VideoStitcher/owlbot.py +++ b/VideoStitcher/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VideoTranscoder/owlbot.py b/VideoTranscoder/owlbot.py index 1cbac807e01c..859fb6a5c361 100644 --- a/VideoTranscoder/owlbot.py +++ b/VideoTranscoder/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Vision/owlbot.py b/Vision/owlbot.py index 6a51bf3730d0..211857e015fa 100644 --- a/Vision/owlbot.py +++ b/Vision/owlbot.py @@ -38,25 +38,6 @@ src / "*/src/V1/ImageAnnotatorClient.php", ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -87,12 +68,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VmMigration/owlbot.py b/VmMigration/owlbot.py index f336cbd0dc4b..6e2638682f4a 100644 --- a/VmMigration/owlbot.py +++ b/VmMigration/owlbot.py @@ -38,25 +38,6 @@ ] ) - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # remove class_alias code s.replace( "src/V*/**/*.php", @@ -76,12 +57,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VmwareEngine/owlbot.py b/VmwareEngine/owlbot.py index b2347e412fbe..28fbd220c0ea 100644 --- a/VmwareEngine/owlbot.py +++ b/VmwareEngine/owlbot.py @@ -58,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/VpcAccess/owlbot.py b/VpcAccess/owlbot.py index 344dec1fcfcd..31517e5493cf 100644 --- a/VpcAccess/owlbot.py +++ b/VpcAccess/owlbot.py @@ -48,23 +48,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -76,12 +59,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/WebRisk/owlbot.py b/WebRisk/owlbot.py index 2c9c33de717e..0ff772bc9871 100644 --- a/WebRisk/owlbot.py +++ b/WebRisk/owlbot.py @@ -32,26 +32,6 @@ php.owlbot_main(src=src, dest=dest) - - -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") - # V1 is GA, so remove @experimental tags s.replace( 'src/V1/**/*Client.php', @@ -89,12 +69,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/WebSecurityScanner/owlbot.py b/WebSecurityScanner/owlbot.py index 54da41fd27bc..504bc01f477b 100644 --- a/WebSecurityScanner/owlbot.py +++ b/WebSecurityScanner/owlbot.py @@ -47,23 +47,6 @@ + "\n", '') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -75,12 +58,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php", diff --git a/Workflows/owlbot.py b/Workflows/owlbot.py index 34cb93761cd5..c43aa09d074e 100644 --- a/Workflows/owlbot.py +++ b/Workflows/owlbot.py @@ -92,23 +92,6 @@ r'namespace Google\\Cloud\\Workflows\\Executions\\Tests\\Unit', r'namespace Google\\Cloud\\Workflows\\Tests\\Unit\\Executions') -# document and utilize apiEndpoint instead of serviceAddress -s.replace( - "**/Gapic/*GapicClient.php", - r"'serviceAddress' =>", - r"'apiEndpoint' =>") -s.replace( - "**/Gapic/*GapicClient.php", - r"@type string \$serviceAddress\n\s+\*\s+The address", - r"""@type string $serviceAddress - * **Deprecated**. This option will be removed in a future major release. Please - * utilize the `$apiEndpoint` option instead. - * @type string $apiEndpoint - * The address""") -s.replace( - "**/Gapic/*GapicClient.php", - r"\$transportConfig, and any \$serviceAddress", - r"$transportConfig, and any `$apiEndpoint`") ### [START] protoc backwards compatibility fixes @@ -120,12 +103,6 @@ */ private $""") -# prevent proto messages from being marked final -s.replace( - "src/**/V*/**/*.php", - r"final class", - r"class") - # Replace "Unwrapped" with "Value" for method names. s.replace( "src/**/V*/**/*.php",