Merge branch 'main' into release-please--branches--main

packages/google-cloud-security-privateca/protos/google/cloud/security/privateca/v1/resources.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -1431,7 +1431,7 @@ enum SubjectRequestMode {
   DEFAULT = 1;
 
   // A mode reserved for special cases. Indicates that the certificate should
-  // have one or more SPIFFE
+  // have one SPIFFE
   // [SubjectAltNames][google.cloud.security.privateca.v1.SubjectAltNames] set
   // by the service based on the caller's identity. This mode will ignore any
   // explicitly specified [Subject][google.cloud.security.privateca.v1.Subject]

packages/google-cloud-security-privateca/protos/google/cloud/security/privateca/v1/service.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/cloud/security/privateca/v1/resources.proto";
 import "google/longrunning/operations.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 
@@ -720,6 +721,12 @@ message DisableCertificateAuthorityRequest {
   // The request ID must be a valid UUID with the exception that zero UUID is
   // not supported (00000000-0000-0000-0000-000000000000).
   string request_id = 2 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. This field allows this CA to be disabled even if it's being
+  // depended on by another resource. However, doing so may result in unintended
+  // and unrecoverable effects on any dependent resource(s) since the CA will
+  // no longer be able to issue certificates.
+  bool ignore_dependent_resources = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for
@@ -903,6 +910,12 @@ message DeleteCertificateAuthorityRequest {
   // soon as possible without a 30-day grace period where undeletion would have
   // been allowed. If you proceed, there will be no way to recover this CA.
   bool skip_grace_period = 5 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. This field allows this ca to be deleted even if it's being
+  // depended on by another resource. However, doing so may result in unintended
+  // and unrecoverable effects on any dependent resource(s) since the CA will
+  // no longer be able to issue certificates.
+  bool ignore_dependent_resources = 6 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for
@@ -1025,6 +1038,12 @@ message DeleteCaPoolRequest {
   // The request ID must be a valid UUID with the exception that zero UUID is
   // not supported (00000000-0000-0000-0000-000000000000).
   string request_id = 2 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. This field allows this pool to be deleted even if it's being
+  // depended on by another resource. However, doing so may result in unintended
+  // and unrecoverable effects on any dependent resource(s) since the pool will
+  // no longer be able to issue certificates.
+  bool ignore_dependent_resources = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for