Skip to content

Commit 07cd9df

Browse files
authored
Merge branch 'main' into update-binary-20250404T153305
2 parents c04a65c + d347102 commit 07cd9df

80 files changed

Lines changed: 228 additions & 173 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.

gapic-generator-ads/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History for gapic-generator-ads
22

3+
### 0.43.0 / 2025-04-24
4+
5+
* Includes changes from gapic-generator 0.43.0
6+
* Fix: Fixed typo in generated wrapper readmes
7+
* Fix: Provide a better check for grpc when typechecking credentials
8+
39
### 0.42.1 / 2025-02-04
410

511
* Includes changes from gapic-generator 0.42.1

gapic-generator-ads/Gemfile.lock

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../gapic-generator
33
specs:
4-
gapic-generator (0.42.1)
4+
gapic-generator (0.43.0)
55
actionpack (~> 5.2)
66
bigdecimal (~> 3.0)
77
google-cloud-common (~> 1.2)
@@ -12,8 +12,8 @@ PATH
1212
PATH
1313
remote: .
1414
specs:
15-
gapic-generator-ads (0.42.1)
16-
gapic-generator (= 0.42.1)
15+
gapic-generator-ads (0.43.0)
16+
gapic-generator (= 0.43.0)
1717

1818
GEM
1919
remote: https://rubygems.org/
@@ -36,33 +36,33 @@ GEM
3636
i18n (>= 0.7, < 2)
3737
minitest (~> 5.1)
3838
tzinfo (~> 1.1)
39-
ast (2.4.2)
39+
ast (2.4.3)
4040
bigdecimal (3.1.9)
4141
builder (3.3.0)
4242
coderay (1.1.3)
4343
concurrent-ruby (1.3.5)
4444
crass (1.0.6)
4545
drb (2.2.1)
4646
erubi (1.13.1)
47-
google-cloud-common (1.7.0)
47+
google-cloud-common (1.8.0)
4848
google-protobuf (>= 3.18, < 5.a)
4949
googleapis-common-protos-types (~> 1.7)
50-
google-protobuf (3.25.6-x86_64-linux)
50+
google-protobuf (3.25.7-x86_64-linux)
5151
google-style (1.27.1)
5252
rubocop (~> 1.56)
53-
googleapis-common-protos-types (1.18.0)
53+
googleapis-common-protos-types (1.19.0)
5454
google-protobuf (>= 3.18, < 5.a)
5555
grpc-tools (1.60.2)
5656
i18n (1.14.7)
5757
concurrent-ruby (~> 1.0)
58-
json (2.10.2)
58+
json (2.11.2)
5959
language_server-protocol (3.17.0.4)
6060
lint_roller (1.1.0)
6161
loofah (2.24.0)
6262
crass (~> 1.0.2)
6363
nokogiri (>= 1.12.0)
6464
method_source (1.1.0)
65-
minitest (5.25.4)
65+
minitest (5.25.5)
6666
minitest-autotest (1.1.1)
6767
minitest-server (~> 1.0)
6868
path_expander (~> 1.0)
@@ -71,13 +71,14 @@ GEM
7171
minitest-server (1.0.8)
7272
drb (~> 2.0)
7373
minitest (~> 5.16)
74-
nokogiri (1.18.3-x86_64-linux-gnu)
74+
nokogiri (1.18.8-x86_64-linux-gnu)
7575
racc (~> 1.4)
76-
parallel (1.26.3)
77-
parser (3.3.7.1)
76+
parallel (1.27.0)
77+
parser (3.3.8.0)
7878
ast (~> 2.4.1)
7979
racc
8080
path_expander (1.1.3)
81+
prism (1.4.0)
8182
pry (0.15.2)
8283
coderay (~> 1.1)
8384
method_source (~> 1.0)
@@ -95,19 +96,20 @@ GEM
9596
rainbow (3.1.1)
9697
redcarpet (3.6.1)
9798
regexp_parser (2.10.0)
98-
rubocop (1.73.2)
99+
rubocop (1.75.3)
99100
json (~> 2.3)
100101
language_server-protocol (~> 3.17.0.2)
101102
lint_roller (~> 1.1.0)
102103
parallel (~> 1.10)
103104
parser (>= 3.3.0.2)
104105
rainbow (>= 2.2.2, < 4.0)
105106
regexp_parser (>= 2.9.3, < 3.0)
106-
rubocop-ast (>= 1.38.0, < 2.0)
107+
rubocop-ast (>= 1.44.0, < 2.0)
107108
ruby-progressbar (~> 1.7)
108109
unicode-display_width (>= 2.4.0, < 4.0)
109-
rubocop-ast (1.38.1)
110-
parser (>= 3.3.1.0)
110+
rubocop-ast (1.44.1)
111+
parser (>= 3.3.7.2)
112+
prism (~> 1.4)
111113
ruby-progressbar (1.13.0)
112114
thread_safe (0.3.6)
113115
tzinfo (1.2.11)

gapic-generator-ads/lib/gapic/generator/ads/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module Gapic
1919
module Generator
2020
module Ads
21-
VERSION = "0.42.1"
21+
VERSION = "0.43.0"
2222
end
2323
end
2424
end

gapic-generator-cloud/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History for gapic-generator-cloud
22

3+
### 0.43.0 / 2025-04-24
4+
5+
* Includes changes from gapic-generator 0.43.0
6+
* Fix: Fixed typo in generated wrapper readmes
7+
* Fix: Provide a better check for grpc when typechecking credentials
8+
39
### 0.42.1 / 2025-02-04
410

511
* Includes changes from gapic-generator 0.42.1

gapic-generator-cloud/Gemfile.lock

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../gapic-generator
33
specs:
4-
gapic-generator (0.42.1)
4+
gapic-generator (0.43.0)
55
actionpack (~> 5.2)
66
bigdecimal (~> 3.0)
77
google-cloud-common (~> 1.2)
@@ -12,8 +12,8 @@ PATH
1212
PATH
1313
remote: .
1414
specs:
15-
gapic-generator-cloud (0.42.1)
16-
gapic-generator (= 0.42.1)
15+
gapic-generator-cloud (0.43.0)
16+
gapic-generator (= 0.43.0)
1717

1818
GEM
1919
remote: https://rubygems.org/
@@ -36,33 +36,33 @@ GEM
3636
i18n (>= 0.7, < 2)
3737
minitest (~> 5.1)
3838
tzinfo (~> 1.1)
39-
ast (2.4.2)
39+
ast (2.4.3)
4040
bigdecimal (3.1.9)
4141
builder (3.3.0)
4242
coderay (1.1.3)
4343
concurrent-ruby (1.3.5)
4444
crass (1.0.6)
4545
drb (2.2.1)
4646
erubi (1.13.1)
47-
google-cloud-common (1.7.0)
47+
google-cloud-common (1.8.0)
4848
google-protobuf (>= 3.18, < 5.a)
4949
googleapis-common-protos-types (~> 1.7)
50-
google-protobuf (3.25.6-x86_64-linux)
50+
google-protobuf (3.25.7-x86_64-linux)
5151
google-style (1.27.1)
5252
rubocop (~> 1.56)
53-
googleapis-common-protos-types (1.18.0)
53+
googleapis-common-protos-types (1.19.0)
5454
google-protobuf (>= 3.18, < 5.a)
5555
grpc-tools (1.60.2)
5656
i18n (1.14.7)
5757
concurrent-ruby (~> 1.0)
58-
json (2.10.2)
58+
json (2.11.2)
5959
language_server-protocol (3.17.0.4)
6060
lint_roller (1.1.0)
6161
loofah (2.24.0)
6262
crass (~> 1.0.2)
6363
nokogiri (>= 1.12.0)
6464
method_source (1.1.0)
65-
minitest (5.25.4)
65+
minitest (5.25.5)
6666
minitest-autotest (1.1.1)
6767
minitest-server (~> 1.0)
6868
path_expander (~> 1.0)
@@ -71,13 +71,14 @@ GEM
7171
minitest-server (1.0.8)
7272
drb (~> 2.0)
7373
minitest (~> 5.16)
74-
nokogiri (1.18.3-x86_64-linux-gnu)
74+
nokogiri (1.18.8-x86_64-linux-gnu)
7575
racc (~> 1.4)
76-
parallel (1.26.3)
77-
parser (3.3.7.1)
76+
parallel (1.27.0)
77+
parser (3.3.8.0)
7878
ast (~> 2.4.1)
7979
racc
8080
path_expander (1.1.3)
81+
prism (1.4.0)
8182
pry (0.15.2)
8283
coderay (~> 1.1)
8384
method_source (~> 1.0)
@@ -95,19 +96,20 @@ GEM
9596
rainbow (3.1.1)
9697
redcarpet (3.6.1)
9798
regexp_parser (2.10.0)
98-
rubocop (1.73.2)
99+
rubocop (1.75.3)
99100
json (~> 2.3)
100101
language_server-protocol (~> 3.17.0.2)
101102
lint_roller (~> 1.1.0)
102103
parallel (~> 1.10)
103104
parser (>= 3.3.0.2)
104105
rainbow (>= 2.2.2, < 4.0)
105106
regexp_parser (>= 2.9.3, < 3.0)
106-
rubocop-ast (>= 1.38.0, < 2.0)
107+
rubocop-ast (>= 1.44.0, < 2.0)
107108
ruby-progressbar (~> 1.7)
108109
unicode-display_width (>= 2.4.0, < 4.0)
109-
rubocop-ast (1.38.1)
110-
parser (>= 3.3.1.0)
110+
rubocop-ast (1.44.1)
111+
parser (>= 3.3.7.2)
112+
prism (~> 1.4)
111113
ruby-progressbar (1.13.0)
112114
thread_safe (0.3.6)
113115
tzinfo (1.2.11)

gapic-generator-cloud/lib/gapic/generator/cloud/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module Gapic
1919
module Generator
2020
module Cloud
21-
VERSION = "0.42.1"
21+
VERSION = "0.43.0"
2222
end
2323
end
2424
end

gapic-generator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History for gapic-generator
22

3+
### 0.43.0 / 2025-04-24
4+
5+
* Fix: Fixed typo in generated wrapper readmes
6+
* Fix: Provide a better check for grpc when typechecking credentials
7+
* Feature: bless "::Google::Auth::BaseClient" as an allowed by default credentials type in Config
8+
39
### 0.42.1 / 2025-02-04
410

511
* Fix: Wrappers load release dependencies if local dependencies do not match

gapic-generator/Gemfile.lock

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
gapic-generator (0.42.1)
4+
gapic-generator (0.43.0)
55
actionpack (~> 5.2)
66
bigdecimal (~> 3.0)
77
google-cloud-common (~> 1.2)
@@ -30,33 +30,33 @@ GEM
3030
i18n (>= 0.7, < 2)
3131
minitest (~> 5.1)
3232
tzinfo (~> 1.1)
33-
ast (2.4.2)
33+
ast (2.4.3)
3434
bigdecimal (3.1.9)
3535
builder (3.3.0)
3636
coderay (1.1.3)
3737
concurrent-ruby (1.3.5)
3838
crass (1.0.6)
3939
drb (2.2.1)
4040
erubi (1.13.1)
41-
google-cloud-common (1.7.0)
41+
google-cloud-common (1.8.0)
4242
google-protobuf (>= 3.18, < 5.a)
4343
googleapis-common-protos-types (~> 1.7)
44-
google-protobuf (3.25.6-x86_64-linux)
44+
google-protobuf (3.25.7-x86_64-linux)
4545
google-style (1.27.1)
4646
rubocop (~> 1.56)
47-
googleapis-common-protos-types (1.18.0)
47+
googleapis-common-protos-types (1.19.0)
4848
google-protobuf (>= 3.18, < 5.a)
4949
grpc-tools (1.60.2)
5050
i18n (1.14.7)
5151
concurrent-ruby (~> 1.0)
52-
json (2.10.2)
52+
json (2.11.2)
5353
language_server-protocol (3.17.0.4)
5454
lint_roller (1.1.0)
5555
loofah (2.24.0)
5656
crass (~> 1.0.2)
5757
nokogiri (>= 1.12.0)
5858
method_source (1.1.0)
59-
minitest (5.25.4)
59+
minitest (5.25.5)
6060
minitest-autotest (1.1.1)
6161
minitest-server (~> 1.0)
6262
path_expander (~> 1.0)
@@ -65,13 +65,14 @@ GEM
6565
minitest-server (1.0.8)
6666
drb (~> 2.0)
6767
minitest (~> 5.16)
68-
nokogiri (1.18.3-x86_64-linux-gnu)
68+
nokogiri (1.18.8-x86_64-linux-gnu)
6969
racc (~> 1.4)
70-
parallel (1.26.3)
71-
parser (3.3.7.1)
70+
parallel (1.27.0)
71+
parser (3.3.8.0)
7272
ast (~> 2.4.1)
7373
racc
7474
path_expander (1.1.3)
75+
prism (1.4.0)
7576
pry (0.15.2)
7677
coderay (~> 1.1)
7778
method_source (~> 1.0)
@@ -89,19 +90,20 @@ GEM
8990
rainbow (3.1.1)
9091
redcarpet (3.6.1)
9192
regexp_parser (2.10.0)
92-
rubocop (1.73.2)
93+
rubocop (1.75.3)
9394
json (~> 2.3)
9495
language_server-protocol (~> 3.17.0.2)
9596
lint_roller (~> 1.1.0)
9697
parallel (~> 1.10)
9798
parser (>= 3.3.0.2)
9899
rainbow (>= 2.2.2, < 4.0)
99100
regexp_parser (>= 2.9.3, < 3.0)
100-
rubocop-ast (>= 1.38.0, < 2.0)
101+
rubocop-ast (>= 1.44.0, < 2.0)
101102
ruby-progressbar (~> 1.7)
102103
unicode-display_width (>= 2.4.0, < 4.0)
103-
rubocop-ast (1.38.1)
104-
parser (>= 3.3.1.0)
104+
rubocop-ast (1.44.1)
105+
parser (>= 3.3.7.2)
106+
prism (~> 1.4)
105107
ruby-progressbar (1.13.0)
106108
thread_safe (0.3.6)
107109
tzinfo (1.2.11)

gapic-generator/lib/gapic/generator/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
module Gapic
1818
module Generator
19-
VERSION = "0.42.1"
19+
VERSION = "0.43.0"
2020
end
2121
end

gapic-generator/lib/gapic/model/method/http_annotation.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ def routing_params_with_patterns
8282
def self.create_with_override proto_method, service_config = nil
8383
proto_http = proto_method.http
8484

85-
http_override = begin
86-
unless service_config&.http.nil?
87-
service_config.http.rules.find { |http_rule| http_rule.selector == proto_method.full_name }
88-
end
89-
end
85+
http_override = service_config&.http&.rules&.find { |http_rule| http_rule.selector == proto_method.full_name }
9086

9187
http = http_override || proto_http
9288
HttpAnnotation.new http

0 commit comments

Comments
 (0)