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
googleapis · Mar 22, 2024 · 0bf3720 · 0bf3720
1 parent 078a38b
commit 0bf3720
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 12 deletions.
diff --git a/google/cloud/recaptchaenterprise/v1/BUILD.bazel b/google/cloud/recaptchaenterprise/v1/BUILD.bazel
@@ -9,14 +9,17 @@
 #    * extra_protoc_file_parameters
 # The complete list of preserved parameters can be found in the source code.
 
+# buildifier: disable=load-on-top
+
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])
 
 ##############################################################################
 # Common
 ##############################################################################
-load("@rules_proto//proto:defs.bzl", "proto_library")
+# buildifier: disable=same-origin-load
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "recaptchaenterprise_proto",
@@ -27,6 +30,7 @@ proto_library(
         "//google/api:annotations_proto",
         "//google/api:client_proto",
         "//google/api:field_behavior_proto",
+        "//google/api:field_info_proto",
         "//google/api:resource_proto",
         "//google/rpc:status_proto",
         "@com_google_protobuf//:empty_proto",
@@ -46,6 +50,7 @@ proto_library_with_info(
 ##############################################################################
 # Java
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "java_gapic_assembly_gradle_pkg",
@@ -107,6 +112,7 @@ java_gapic_assembly_gradle_pkg(
 ##############################################################################
 # Go
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "go_gapic_assembly_pkg",
@@ -155,6 +161,7 @@ go_gapic_assembly_pkg(
 ##############################################################################
 # Python
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "py_gapic_assembly_pkg",
@@ -195,6 +202,7 @@ py_gapic_assembly_pkg(
 ##############################################################################
 # PHP
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "php_gapic_assembly_pkg",
@@ -232,6 +240,7 @@ php_gapic_assembly_pkg(
 ##############################################################################
 # Node.js
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "nodejs_gapic_assembly_pkg",
@@ -262,6 +271,7 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 # Ruby
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "ruby_cloud_gapic_library",
@@ -316,6 +326,7 @@ ruby_gapic_assembly_pkg(
 ##############################################################################
 # C#
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "csharp_gapic_assembly_pkg",
@@ -362,6 +373,7 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 # C++
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "cc_grpc_library",

diff --git a/google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto b/google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto
@@ -19,6 +19,7 @@ package google.cloud.recaptchaenterprise.v1;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
+import "google/api/field_info.proto";
 import "google/api/resource.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
@@ -598,6 +599,8 @@ message Assessment {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/Assessment"
     pattern: "projects/{project}/assessments/{assessment}"
+    plural: "assessments"
+    singular: "assessment"
   };
 
   // Output only. Identifier. The resource name for the Assessment in the format
@@ -664,7 +667,10 @@ message Event {
 
   // Optional. The IP address in the request from the user's device related to
   // this event.
-  string user_ip_address = 4 [(google.api.field_behavior) = OPTIONAL];
+  string user_ip_address = 4 [
+    (google.api.field_info).format = IPV4_OR_IPV6,
+    (google.api.field_behavior) = OPTIONAL
+  ];
 
   // Optional. The expected action for this type of event. This should be the
   // same action provided at token generation time on client-side platforms
@@ -1352,6 +1358,8 @@ message Metrics {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/Metrics"
     pattern: "projects/{project}/keys/{key}/metrics"
+    plural: "metrics"
+    singular: "metrics"
   };
 
   // Output only. Identifier. The name of the metrics, in the format
@@ -1390,6 +1398,8 @@ message Key {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/Key"
     pattern: "projects/{project}/keys/{key}"
+    plural: "keys"
+    singular: "key"
   };
 
   // Identifier. The resource name for the Key in the format
@@ -1694,6 +1704,8 @@ message FirewallPolicy {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/FirewallPolicy"
     pattern: "projects/{project}/firewallpolicies/{firewallpolicy}"
+    plural: "firewallPolicies"
+    singular: "firewallPolicy"
   };
 
   // Identifier. The resource name for the FirewallPolicy in the format
@@ -1809,7 +1821,7 @@ message SearchRelatedAccountGroupMembershipsRequest {
   string project = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
-      child_type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
+      type: "cloudresourcemanager.googleapis.com/Project"
     }
   ];
 
@@ -1857,16 +1869,15 @@ message RelatedAccountGroupMembership {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
     pattern: "projects/{project}/relatedaccountgroups/{relatedaccountgroup}/memberships/{membership}"
+    plural: "relatedAccountGroupMemberships"
+    singular: "relatedAccountGroupMembership"
   };
 
   // Required. Identifier. The resource name for this membership in the format
   // `projects/{project}/relatedaccountgroups/{relatedaccountgroup}/memberships/{membership}`.
   string name = 1 [
     (google.api.field_behavior) = IDENTIFIER,
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = {
-      type: "recaptchaenterprise.googleapis.com/RelatedAccountGroupMembership"
-    }
+    (google.api.field_behavior) = REQUIRED
   ];
 
   // The unique stable account identifier of the member. The identifier
@@ -1886,17 +1897,16 @@ message RelatedAccountGroup {
   option (google.api.resource) = {
     type: "recaptchaenterprise.googleapis.com/RelatedAccountGroup"
     pattern: "projects/{project}/relatedaccountgroups/{relatedaccountgroup}"
+    plural: "relatedAccountGroups"
+    singular: "relatedAccountGroup"
   };
 
   // Required. Identifier. The resource name for the related account group in
   // the format
   // `projects/{project}/relatedaccountgroups/{related_account_group}`.
   string name = 1 [
     (google.api.field_behavior) = IDENTIFIER,
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = {
-      type: "recaptchaenterprise.googleapis.com/RelatedAccountGroup"
-    }
+    (google.api.field_behavior) = REQUIRED
   ];
 }
 
@@ -1934,6 +1944,9 @@ message WafSettings {
 
     // Fastly
     FASTLY = 3;
+
+    // Cloudflare
+    CLOUDFLARE = 4;
   }
 
   // Required. The WAF service that uses this key.

diff --git a/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel b/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel
@@ -9,14 +9,17 @@
 #    * extra_protoc_file_parameters
 # The complete list of preserved parameters can be found in the source code.
 
+# buildifier: disable=load-on-top
+
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])
 
 ##############################################################################
 # Common
 ##############################################################################
-load("@rules_proto//proto:defs.bzl", "proto_library")
+# buildifier: disable=same-origin-load
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "recaptchaenterprise_proto",
@@ -43,6 +46,7 @@ proto_library_with_info(
 ##############################################################################
 # Java
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "java_gapic_assembly_gradle_pkg",
@@ -105,6 +109,7 @@ java_gapic_assembly_gradle_pkg(
 ##############################################################################
 # Go
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "go_gapic_assembly_pkg",
@@ -152,6 +157,7 @@ go_gapic_assembly_pkg(
 ##############################################################################
 # Python
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "py_gapic_assembly_pkg",
@@ -192,6 +198,7 @@ py_gapic_assembly_pkg(
 ##############################################################################
 # PHP
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "php_gapic_assembly_pkg",
@@ -229,6 +236,7 @@ php_gapic_assembly_pkg(
 ##############################################################################
 # Node.js
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "nodejs_gapic_assembly_pkg",
@@ -259,6 +267,7 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 # Ruby
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "ruby_cloud_gapic_library",
@@ -314,6 +323,7 @@ ruby_gapic_assembly_pkg(
 ##############################################################################
 # C#
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "csharp_gapic_assembly_pkg",
@@ -324,6 +334,7 @@ load(
 
 csharp_proto_library(
     name = "recaptchaenterprise_csharp_proto",
+    extra_opts = [],
     deps = [":recaptchaenterprise_proto"],
 )
 
@@ -360,6 +371,7 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 # C++
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "cc_grpc_library",