Skip to content

Commit 0bf3720

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: Existing resource_reference option of the field name is removed from message google.cloud.recaptchaenterprise.v1.RelatedAccountGroupMemberShip
feat: Existing resource_reference option of the field name is removed from message `google.cloud.recaptchaenterprise.v1.RelatedAccountGroup` --- feat: add Cloudflare key creation support --- chore: update go_package and Go importpath PiperOrigin-RevId: 618268077
1 parent 078a38b commit 0bf3720

3 files changed

Lines changed: 49 additions & 12 deletions

File tree

‎google/cloud/recaptchaenterprise/v1/BUILD.bazel‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
# * extra_protoc_file_parameters
1010
# The complete list of preserved parameters can be found in the source code.
1111

12+
# buildifier: disable=load-on-top
13+
1214
# This is an API workspace, having public visibility by default makes perfect sense.
1315
package(default_visibility = ["//visibility:public"])
1416

1517
##############################################################################
1618
# Common
1719
##############################################################################
18-
load("@rules_proto//proto:defs.bzl", "proto_library")
20+
# buildifier: disable=same-origin-load
1921
load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
22+
load("@rules_proto//proto:defs.bzl", "proto_library")
2023

2124
proto_library(
2225
name = "recaptchaenterprise_proto",
@@ -27,6 +30,7 @@ proto_library(
2730
"//google/api:annotations_proto",
2831
"//google/api:client_proto",
2932
"//google/api:field_behavior_proto",
33+
"//google/api:field_info_proto",
3034
"//google/api:resource_proto",
3135
"//google/rpc:status_proto",
3236
"@com_google_protobuf//:empty_proto",
@@ -46,6 +50,7 @@ proto_library_with_info(
4650
##############################################################################
4751
# Java
4852
##############################################################################
53+
# buildifier: disable=same-origin-load
4954
load(
5055
"@com_google_googleapis_imports//:imports.bzl",
5156
"java_gapic_assembly_gradle_pkg",
@@ -107,6 +112,7 @@ java_gapic_assembly_gradle_pkg(
107112
##############################################################################
108113
# Go
109114
##############################################################################
115+
# buildifier: disable=same-origin-load
110116
load(
111117
"@com_google_googleapis_imports//:imports.bzl",
112118
"go_gapic_assembly_pkg",
@@ -155,6 +161,7 @@ go_gapic_assembly_pkg(
155161
##############################################################################
156162
# Python
157163
##############################################################################
164+
# buildifier: disable=same-origin-load
158165
load(
159166
"@com_google_googleapis_imports//:imports.bzl",
160167
"py_gapic_assembly_pkg",
@@ -195,6 +202,7 @@ py_gapic_assembly_pkg(
195202
##############################################################################
196203
# PHP
197204
##############################################################################
205+
# buildifier: disable=same-origin-load
198206
load(
199207
"@com_google_googleapis_imports//:imports.bzl",
200208
"php_gapic_assembly_pkg",
@@ -232,6 +240,7 @@ php_gapic_assembly_pkg(
232240
##############################################################################
233241
# Node.js
234242
##############################################################################
243+
# buildifier: disable=same-origin-load
235244
load(
236245
"@com_google_googleapis_imports//:imports.bzl",
237246
"nodejs_gapic_assembly_pkg",
@@ -262,6 +271,7 @@ nodejs_gapic_assembly_pkg(
262271
##############################################################################
263272
# Ruby
264273
##############################################################################
274+
# buildifier: disable=same-origin-load
265275
load(
266276
"@com_google_googleapis_imports//:imports.bzl",
267277
"ruby_cloud_gapic_library",
@@ -316,6 +326,7 @@ ruby_gapic_assembly_pkg(
316326
##############################################################################
317327
# C#
318328
##############################################################################
329+
# buildifier: disable=same-origin-load
319330
load(
320331
"@com_google_googleapis_imports//:imports.bzl",
321332
"csharp_gapic_assembly_pkg",
@@ -362,6 +373,7 @@ csharp_gapic_assembly_pkg(
362373
##############################################################################
363374
# C++
364375
##############################################################################
376+
# buildifier: disable=same-origin-load
365377
load(
366378
"@com_google_googleapis_imports//:imports.bzl",
367379
"cc_grpc_library",

‎google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package google.cloud.recaptchaenterprise.v1;
1919
import "google/api/annotations.proto";
2020
import "google/api/client.proto";
2121
import "google/api/field_behavior.proto";
22+
import "google/api/field_info.proto";
2223
import "google/api/resource.proto";
2324
import "google/protobuf/empty.proto";
2425
import "google/protobuf/field_mask.proto";
@@ -598,6 +599,8 @@ message Assessment {
598599
option (google.api.resource) = {
599600
type: "recaptchaenterprise.googleapis.com/Assessment"
600601
pattern: "projects/{project}/assessments/{assessment}"
602+
plural: "assessments"
603+
singular: "assessment"
601604
};
602605

603606
// Output only. Identifier. The resource name for the Assessment in the format
@@ -664,7 +667,10 @@ message Event {
664667

665668
// Optional. The IP address in the request from the user's device related to
666669
// this event.
667-
string user_ip_address = 4 [(google.api.field_behavior) = OPTIONAL];
670+
string user_ip_address = 4 [
671+
(google.api.field_info).format = IPV4_OR_IPV6,
672+
(google.api.field_behavior) = OPTIONAL
673+
];
668674

669675
// Optional. The expected action for this type of event. This should be the
670676
// same action provided at token generation time on client-side platforms
@@ -1352,6 +1358,8 @@ message Metrics {
13521358
option (google.api.resource) = {
13531359
type: "recaptchaenterprise.googleapis.com/Metrics"
13541360
pattern: "projects/{project}/keys/{key}/metrics"
1361+
plural: "metrics"
1362+
singular: "metrics"
13551363
};
13561364

13571365
// Output only. Identifier. The name of the metrics, in the format
@@ -1390,6 +1398,8 @@ message Key {
13901398
option (google.api.resource) = {
13911399
type: "recaptchaenterprise.googleapis.com/Key"
13921400
pattern: "projects/{project}/keys/{key}"
1401+
plural: "keys"
1402+
singular: "key"
13931403
};
13941404

13951405
// Identifier. The resource name for the Key in the format
@@ -1694,6 +1704,8 @@ message FirewallPolicy {
16941704
option (google.api.resource) = {
16951705
type: "recaptchaenterprise.googleapis.com/FirewallPolicy"
16961706
pattern: "projects/{project}/firewallpolicies/{firewallpolicy}"
1707+
plural: "firewallPolicies"
1708+
singular: "firewallPolicy"
16971709
};
16981710

16991711
// Identifier. The resource name for the FirewallPolicy in the format
@@ -1809,7 +1821,7 @@ message SearchRelatedAccountGroupMembershipsRequest {
18091821
string project = 1 [
18101822
(google.api.field_behavior) = REQUIRED,
18111823
(google.api.resource_reference) = {
1812-
child_type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
1824+
type: "cloudresourcemanager.googleapis.com/Project"
18131825
}
18141826
];
18151827

@@ -1857,16 +1869,15 @@ message RelatedAccountGroupMembership {
18571869
option (google.api.resource) = {
18581870
type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
18591871
pattern: "projects/{project}/relatedaccountgroups/{relatedaccountgroup}/memberships/{membership}"
1872+
plural: "relatedAccountGroupMemberships"
1873+
singular: "relatedAccountGroupMembership"
18601874
};
18611875

18621876
// Required. Identifier. The resource name for this membership in the format
18631877
// `projects/{project}/relatedaccountgroups/{relatedaccountgroup}/memberships/{membership}`.
18641878
string name = 1 [
18651879
(google.api.field_behavior) = IDENTIFIER,
1866-
(google.api.field_behavior) = REQUIRED,
1867-
(google.api.resource_reference) = {
1868-
type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
1869-
}
1880+
(google.api.field_behavior) = REQUIRED
18701881
];
18711882

18721883
// The unique stable account identifier of the member. The identifier
@@ -1886,17 +1897,16 @@ message RelatedAccountGroup {
18861897
option (google.api.resource) = {
18871898
type: "recaptchaenterprise.googleapis.com/RelatedAccountGroup"
18881899
pattern: "projects/{project}/relatedaccountgroups/{relatedaccountgroup}"
1900+
plural: "relatedAccountGroups"
1901+
singular: "relatedAccountGroup"
18891902
};
18901903

18911904
// Required. Identifier. The resource name for the related account group in
18921905
// the format
18931906
// `projects/{project}/relatedaccountgroups/{related_account_group}`.
18941907
string name = 1 [
18951908
(google.api.field_behavior) = IDENTIFIER,
1896-
(google.api.field_behavior) = REQUIRED,
1897-
(google.api.resource_reference) = {
1898-
type: "recaptchaenterprise.googleapis.com/RelatedAccountGroup"
1899-
}
1909+
(google.api.field_behavior) = REQUIRED
19001910
];
19011911
}
19021912

@@ -1934,6 +1944,9 @@ message WafSettings {
19341944

19351945
// Fastly
19361946
FASTLY = 3;
1947+
1948+
// Cloudflare
1949+
CLOUDFLARE = 4;
19371950
}
19381951

19391952
// Required. The WAF service that uses this key.

‎google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
# * extra_protoc_file_parameters
1010
# The complete list of preserved parameters can be found in the source code.
1111

12+
# buildifier: disable=load-on-top
13+
1214
# This is an API workspace, having public visibility by default makes perfect sense.
1315
package(default_visibility = ["//visibility:public"])
1416

1517
##############################################################################
1618
# Common
1719
##############################################################################
18-
load("@rules_proto//proto:defs.bzl", "proto_library")
20+
# buildifier: disable=same-origin-load
1921
load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
22+
load("@rules_proto//proto:defs.bzl", "proto_library")
2023

2124
proto_library(
2225
name = "recaptchaenterprise_proto",
@@ -43,6 +46,7 @@ proto_library_with_info(
4346
##############################################################################
4447
# Java
4548
##############################################################################
49+
# buildifier: disable=same-origin-load
4650
load(
4751
"@com_google_googleapis_imports//:imports.bzl",
4852
"java_gapic_assembly_gradle_pkg",
@@ -105,6 +109,7 @@ java_gapic_assembly_gradle_pkg(
105109
##############################################################################
106110
# Go
107111
##############################################################################
112+
# buildifier: disable=same-origin-load
108113
load(
109114
"@com_google_googleapis_imports//:imports.bzl",
110115
"go_gapic_assembly_pkg",
@@ -152,6 +157,7 @@ go_gapic_assembly_pkg(
152157
##############################################################################
153158
# Python
154159
##############################################################################
160+
# buildifier: disable=same-origin-load
155161
load(
156162
"@com_google_googleapis_imports//:imports.bzl",
157163
"py_gapic_assembly_pkg",
@@ -192,6 +198,7 @@ py_gapic_assembly_pkg(
192198
##############################################################################
193199
# PHP
194200
##############################################################################
201+
# buildifier: disable=same-origin-load
195202
load(
196203
"@com_google_googleapis_imports//:imports.bzl",
197204
"php_gapic_assembly_pkg",
@@ -229,6 +236,7 @@ php_gapic_assembly_pkg(
229236
##############################################################################
230237
# Node.js
231238
##############################################################################
239+
# buildifier: disable=same-origin-load
232240
load(
233241
"@com_google_googleapis_imports//:imports.bzl",
234242
"nodejs_gapic_assembly_pkg",
@@ -259,6 +267,7 @@ nodejs_gapic_assembly_pkg(
259267
##############################################################################
260268
# Ruby
261269
##############################################################################
270+
# buildifier: disable=same-origin-load
262271
load(
263272
"@com_google_googleapis_imports//:imports.bzl",
264273
"ruby_cloud_gapic_library",
@@ -314,6 +323,7 @@ ruby_gapic_assembly_pkg(
314323
##############################################################################
315324
# C#
316325
##############################################################################
326+
# buildifier: disable=same-origin-load
317327
load(
318328
"@com_google_googleapis_imports//:imports.bzl",
319329
"csharp_gapic_assembly_pkg",
@@ -324,6 +334,7 @@ load(
324334

325335
csharp_proto_library(
326336
name = "recaptchaenterprise_csharp_proto",
337+
extra_opts = [],
327338
deps = [":recaptchaenterprise_proto"],
328339
)
329340

@@ -360,6 +371,7 @@ csharp_gapic_assembly_pkg(
360371
##############################################################################
361372
# C++
362373
##############################################################################
374+
# buildifier: disable=same-origin-load
363375
load(
364376
"@com_google_googleapis_imports//:imports.bzl",
365377
"cc_grpc_library",

0 commit comments

Comments
 (0)