Skip to content

Commit 95da686

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: KMS configuration in settings
chore: formatting changes PiperOrigin-RevId: 430243637
1 parent fec96b7 commit 95da686

8 files changed

Lines changed: 52 additions & 21 deletions

File tree

‎google/logging/type/http_request.proto‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ syntax = "proto3";
1616

1717
package google.logging.type;
1818

19-
import "google/api/annotations.proto";
2019
import "google/protobuf/duration.proto";
2120

2221
option csharp_namespace = "Google.Cloud.Logging.Type";

‎google/logging/type/log_severity.proto‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ syntax = "proto3";
1616

1717
package google.logging.type;
1818

19-
import "google/api/annotations.proto";
20-
2119
option csharp_namespace = "Google.Cloud.Logging.Type";
2220
option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype";
2321
option java_multiple_files = true;

‎google/logging/v2/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ java_gapic_library(
8282
srcs = [":logging_proto_with_info"],
8383
gapic_yaml = "logging_gapic.yaml",
8484
grpc_service_config = "logging_grpc_service_config.json",
85-
service_yaml = "logging.yaml",
85+
service_yaml = "logging_v2.yaml",
8686
test_deps = [
8787
":logging_java_grpc",
8888
],
@@ -146,7 +146,7 @@ go_gapic_library(
146146
grpc_service_config = "logging_grpc_service_config.json",
147147
importpath = "cloud.google.com/go/logging/apiv2;logging",
148148
metadata = True,
149-
service_yaml = "logging.yaml",
149+
service_yaml = "logging_v2.yaml",
150150
deps = [
151151
":logging_go_proto",
152152
"//google/api:metric_go_proto",
@@ -266,7 +266,7 @@ nodejs_gapic_library(
266266
grpc_service_config = "logging_grpc_service_config.json",
267267
main_service = "logging",
268268
package = "google.logging.v2",
269-
service_yaml = "logging.yaml",
269+
service_yaml = "logging_v2.yaml",
270270
deps = [],
271271
)
272272

@@ -358,7 +358,7 @@ csharp_gapic_library(
358358
srcs = [":logging_proto_with_info"],
359359
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
360360
grpc_service_config = "logging_grpc_service_config.json",
361-
service_yaml = "logging.yaml",
361+
service_yaml = "logging_v2.yaml",
362362
deps = [
363363
":logging_csharp_grpc",
364364
":logging_csharp_proto",

‎google/logging/v2/log_entry.proto‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ syntax = "proto3";
1616

1717
package google.logging.v2;
1818

19-
import "google/api/annotations.proto";
2019
import "google/api/field_behavior.proto";
2120
import "google/api/monitored_resource.proto";
2221
import "google/api/resource.proto";

‎google/logging/v2/logging.proto‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ import "google/api/field_behavior.proto";
2222
import "google/api/monitored_resource.proto";
2323
import "google/api/resource.proto";
2424
import "google/logging/v2/log_entry.proto";
25-
import "google/logging/v2/logging_config.proto";
2625
import "google/protobuf/duration.proto";
2726
import "google/protobuf/empty.proto";
28-
import "google/protobuf/field_mask.proto";
29-
import "google/protobuf/timestamp.proto";
3027
import "google/rpc/status.proto";
3128

3229
option cc_enable_arenas = true;
@@ -241,7 +238,9 @@ message WriteLogEntriesRequest {
241238
}
242239

243240
// Result returned from WriteLogEntries.
244-
message WriteLogEntriesResponse {}
241+
message WriteLogEntriesResponse {
242+
243+
}
245244

246245
// Error details for WriteLogEntries with partial success.
247246
message WriteLogEntriesPartialErrors {

‎google/logging/v2/logging_config.proto‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import "google/api/client.proto";
2121
import "google/api/field_behavior.proto";
2222
import "google/api/resource.proto";
2323
import "google/longrunning/operations.proto";
24-
import "google/protobuf/duration.proto";
2524
import "google/protobuf/empty.proto";
2625
import "google/protobuf/field_mask.proto";
2726
import "google/protobuf/timestamp.proto";
@@ -34,7 +33,6 @@ option java_outer_classname = "LoggingConfigProto";
3433
option java_package = "com.google.logging.v2";
3534
option php_namespace = "Google\\Cloud\\Logging\\V2";
3635
option ruby_package = "Google::Cloud::Logging::V2";
37-
3836
option (google.api.resource_definition) = {
3937
type: "logging.googleapis.com/OrganizationLocation"
4038
pattern: "organizations/{organization}/locations/{location}"
@@ -47,6 +45,7 @@ option (google.api.resource_definition) = {
4745
type: "logging.googleapis.com/BillingAccountLocation"
4846
pattern: "billingAccounts/{billing_account}/locations/{location}"
4947
};
48+
5049
// Service for configuring sinks used to route log entries.
5150
service ConfigServiceV2 {
5251
option (google.api.default_host) = "logging.googleapis.com";
@@ -1807,6 +1806,49 @@ message Settings {
18071806
// Output only. The resource name of the settings.
18081807
string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
18091808

1809+
// Optional. The resource name for the configured Cloud KMS key.
1810+
//
1811+
// KMS key name format:
1812+
//
1813+
// "projects/[PROJECT_ID]/locations/[LOCATION]/keyRings/[KEYRING]/cryptoKeys/[KEY]"
1814+
//
1815+
// For example:
1816+
//
1817+
// `"projects/my-project/locations/us-central1/keyRings/my-ring/cryptoKeys/my-key"`
1818+
//
1819+
//
1820+
//
1821+
// To enable CMEK for the Log Router, set this field to a valid
1822+
// `kms_key_name` for which the associated service account has the required
1823+
// `roles/cloudkms.cryptoKeyEncrypterDecrypter` role assigned for the key.
1824+
//
1825+
// The Cloud KMS key used by the Log Router can be updated by changing the
1826+
// `kms_key_name` to a new valid key name. Encryption operations that are in
1827+
// progress will be completed with the key that was in use when they started.
1828+
// Decryption operations will be completed using the key that was used at the
1829+
// time of encryption unless access to that key has been revoked.
1830+
//
1831+
// To disable CMEK for the Log Router, set this field to an empty string.
1832+
//
1833+
// See [Enabling CMEK for Log
1834+
// Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
1835+
// for more information.
1836+
string kms_key_name = 2 [(google.api.field_behavior) = OPTIONAL];
1837+
1838+
// Output only. The service account that will be used by the Log Router to access your
1839+
// Cloud KMS key.
1840+
//
1841+
// Before enabling CMEK for Log Router, you must first assign the role
1842+
// `roles/cloudkms.cryptoKeyEncrypterDecrypter` to the service account that
1843+
// the Log Router will use to access your Cloud KMS key. Use
1844+
// [GetSettings][google.logging.v2.ConfigServiceV2.GetSettings] to
1845+
// obtain the service account ID.
1846+
//
1847+
// See [Enabling CMEK for Log
1848+
// Router](https://cloud.google.com/logging/docs/routing/managed-encryption)
1849+
// for more information.
1850+
string kms_service_account_id = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
1851+
18101852
// Optional. The Cloud region that will be used for _Default and _Required log buckets
18111853
// for newly created projects and folders. For example `europe-west1`.
18121854
// This setting does not affect the location of custom log buckets.

‎google/logging/v2/logging_metrics.proto‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import "google/api/distribution.proto";
2222
import "google/api/field_behavior.proto";
2323
import "google/api/metric.proto";
2424
import "google/api/resource.proto";
25-
import "google/protobuf/duration.proto";
2625
import "google/protobuf/empty.proto";
27-
import "google/protobuf/field_mask.proto";
2826
import "google/protobuf/timestamp.proto";
2927

3028
option cc_enable_arenas = true;

google/logging/v2/logging.yaml renamed to google/logging/v2/logging_v2.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ types:
1313
- name: google.logging.v2.CopyLogEntriesResponse
1414

1515
documentation:
16-
summary: |-
17-
Writes log entries and manages your Cloud Logging configuration. The table
18-
entries below are presented in alphabetical order, not in order of common
19-
use. For explanations of the concepts found in the table entries, read the
20-
documentation at https://cloud.google.com/logging/docs.
16+
summary: Writes log entries and manages your Cloud Logging configuration.
2117
overview: '# Introduction
2218
2319
The Cloud Logging service.'

0 commit comments

Comments
 (0)