Skip to content

Commit 2a57eed

Browse files
bshafferbshaffer
authored
chore!: migrate Dataflow to new surface (#7945)
1 parent 0cb8e6e commit 2a57eed

146 files changed

Lines changed: 586 additions & 5691 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dataflow/.OwlBot.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
deep-copy-regex:
2-
- source: /google/dataflow/v1beta3/.*-php/(.*)
3-
dest: /owl-bot-staging/Dataflow/v1beta3/$1
2+
- source: /google/dataflow/(v1beta3)/.*-php/(.*)
3+
dest: /owl-bot-staging/Dataflow/$1/$2
44
api-name: Dataflow

‎Dataflow/owlbot.py‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021 Google LLC
1+
# Copyright 2024 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -32,37 +32,14 @@
3232

3333
php.owlbot_main(src=src, dest=dest)
3434

35-
# Change the wording for the deprecation warning.
35+
# remove class_alias code
3636
s.replace(
37-
'src/*/*_*.php',
38-
r'will be removed in the next major release',
39-
'will be removed in a future release')
40-
41-
### [START] protoc backwards compatibility fixes
42-
43-
# roll back to private properties.
44-
s.replace(
45-
"src/**/V*/**/*.php",
46-
r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$",
47-
r"""Generated from protobuf field \1
48-
*/
49-
private $""")
50-
51-
# Replace "Unwrapped" with "Value" for method names.
52-
s.replace(
53-
"src/**/V*/**/*.php",
54-
r"public function ([s|g]\w{3,})Unwrapped",
55-
r"public function \1Value"
56-
)
57-
58-
### [END] protoc backwards compatibility fixes
59-
60-
# fix relative cloud.google.com links
61-
s.replace(
62-
"src/**/V*/**/*.php",
63-
r"(.{0,})\]\((/.{0,})\)",
64-
r"\1](https://cloud.google.com\2)"
65-
)
37+
"src/V*/**/*.php",
38+
r"^// Adding a class alias for backwards compatibility with the previous class name.$"
39+
+ "\n"
40+
+ r"^class_alias\(.*\);$"
41+
+ "\n",
42+
'')
6643

6744
# format generated clients
6845
subprocess.run([
@@ -72,8 +49,8 @@
7249
'--package=@prettier/plugin-php@^0.16',
7350
'--',
7451
'prettier',
75-
'**/Gapic/*',
52+
'**/Client/*',
7653
'--write',
7754
'--parser=php',
7855
'--single-quote',
79-
'--print-width=80'])
56+
'--print-width=120'])

‎Dataflow/src/V1beta3/AutoscalingEvent.php‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/AutoscalingEvent/AutoscalingEventType.php‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/AutoscalingEvent_AutoscalingEventType.php‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Dataflow/src/V1beta3/AutoscalingSettings.php‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/BigQueryIODetails.php‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/BigTableIODetails.php‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/CheckActiveJobsRequest.php‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dataflow/src/V1beta3/CheckActiveJobsResponse.php‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)