Skip to content

Commit 007233b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: KMS configuration in settings (#322)
* feat: Update Logging API with latest changes PiperOrigin-RevId: 429289471 Source-Link: googleapis/googleapis@acd5f89 Source-Link: https://github.com/googleapis/googleapis-gen/commit/8a12622536ae2e9a8978198a151e89234b839b20 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGExMjYyMjUzNmFlMmU5YTg5NzgxOThhMTUxZTg5MjM0YjgzOWIyMCJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: KMS configuration in settings chore: formatting changes PiperOrigin-RevId: 430243637 Source-Link: googleapis/googleapis@95da686 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a1f056b7689ccbe5aebc0bfdd318e9945ee7602a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTFmMDU2Yjc2ODljY2JlNWFlYmMwYmZkZDMxOGU5OTQ1ZWU3NjAyYSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 484477c commit 007233b

File tree

4 files changed

+29
-38
lines changed

4 files changed

+29
-38
lines changed

‎java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java

+15-18
Original file line numberDiff line numberDiff line change
@@ -42,29 +42,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
4242
java.lang.String[] descriptorData = {
4343
"\n&google/logging/type/http_request.proto"
4444
+ "\022\023google.logging.type\032\036google/protobuf/d"
45-
+ "uration.proto\032\034google/api/annotations.pr"
46-
+ "oto\"\357\002\n\013HttpRequest\022\026\n\016request_method\030\001 "
47-
+ "\001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014request_size"
48-
+ "\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresponse_size\030"
49-
+ "\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tremote_ip\030\007"
50-
+ " \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007referer\030\010 \001(\t"
51-
+ "\022*\n\007latency\030\016 \001(\0132\031.google.protobuf.Dura"
52-
+ "tion\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\tcache_hit\030"
53-
+ "\t \001(\010\022*\n\"cache_validated_with_origin_ser"
54-
+ "ver\030\n \001(\010\022\030\n\020cache_fill_bytes\030\014 \001(\003\022\020\n\010p"
55-
+ "rotocol\030\017 \001(\tB\276\001\n\027com.google.logging.typ"
56-
+ "eB\020HttpRequestProtoP\001Z8google.golang.org"
57-
+ "/genproto/googleapis/logging/type;ltype\252"
58-
+ "\002\031Google.Cloud.Logging.Type\312\002\031Google\\Clo"
59-
+ "ud\\Logging\\Type\352\002\034Google::Cloud::Logging"
60-
+ "::Typeb\006proto3"
45+
+ "uration.proto\"\357\002\n\013HttpRequest\022\026\n\016request"
46+
+ "_method\030\001 \001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014re"
47+
+ "quest_size\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresp"
48+
+ "onse_size\030\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tr"
49+
+ "emote_ip\030\007 \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007ref"
50+
+ "erer\030\010 \001(\t\022*\n\007latency\030\016 \001(\0132\031.google.pro"
51+
+ "tobuf.Duration\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\t"
52+
+ "cache_hit\030\t \001(\010\022*\n\"cache_validated_with_"
53+
+ "origin_server\030\n \001(\010\022\030\n\020cache_fill_bytes\030"
54+
+ "\014 \001(\003\022\020\n\010protocol\030\017 \001(\tB\276\001\n\027com.google.l"
55+
+ "ogging.typeB\020HttpRequestProtoP\001Z8google."
56+
+ "golang.org/genproto/googleapis/logging/t"
57+
+ "ype;ltype\252\002\031Google.Cloud.Logging.Type\312\002\031"
58+
+ "Google\\Cloud\\Logging\\Type\352\002\034Google::Clou"
59+
+ "d::Logging::Typeb\006proto3"
6160
};
6261
descriptor =
6362
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
6463
descriptorData,
6564
new com.google.protobuf.Descriptors.FileDescriptor[] {
6665
com.google.protobuf.DurationProto.getDescriptor(),
67-
com.google.api.AnnotationsProto.getDescriptor(),
6866
});
6967
internal_static_google_logging_type_HttpRequest_descriptor =
7068
getDescriptor().getMessageTypes().get(0);
@@ -89,7 +87,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
8987
"Protocol",
9088
});
9189
com.google.protobuf.DurationProto.getDescriptor();
92-
com.google.api.AnnotationsProto.getDescriptor();
9390
}
9491

9592
// @@protoc_insertion_point(outer_class_scope)

‎java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java

+11-15
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
3636
static {
3737
java.lang.String[] descriptorData = {
3838
"\n&google/logging/type/log_severity.proto"
39-
+ "\022\023google.logging.type\032\034google/api/annota"
40-
+ "tions.proto*\202\001\n\013LogSeverity\022\013\n\007DEFAULT\020\000"
41-
+ "\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTICE\020\254\002\022\014\n\007W"
42-
+ "ARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITICAL\020\330\004\022\n\n\005"
43-
+ "ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\276\001\n\027com.google."
44-
+ "logging.typeB\020LogSeverityProtoP\001Z8google"
45-
+ ".golang.org/genproto/googleapis/logging/"
46-
+ "type;ltype\252\002\031Google.Cloud.Logging.Type\312\002"
47-
+ "\031Google\\Cloud\\Logging\\Type\352\002\034Google::Clo"
48-
+ "ud::Logging::Typeb\006proto3"
39+
+ "\022\023google.logging.type*\202\001\n\013LogSeverity\022\013\n"
40+
+ "\007DEFAULT\020\000\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTI"
41+
+ "CE\020\254\002\022\014\n\007WARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITI"
42+
+ "CAL\020\330\004\022\n\n\005ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\305\001\n\027c"
43+
+ "om.google.logging.typeB\020LogSeverityProto"
44+
+ "P\001Z8google.golang.org/genproto/googleapi"
45+
+ "s/logging/type;ltype\242\002\004GLOG\252\002\031Google.Clo"
46+
+ "ud.Logging.Type\312\002\031Google\\Cloud\\Logging\\T"
47+
+ "ype\352\002\034Google::Cloud::Logging::Typeb\006prot"
48+
+ "o3"
4949
};
5050
descriptor =
5151
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
52-
descriptorData,
53-
new com.google.protobuf.Descriptors.FileDescriptor[] {
54-
com.google.api.AnnotationsProto.getDescriptor(),
55-
});
56-
com.google.api.AnnotationsProto.getDescriptor();
52+
descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {});
5753
}
5854

5955
// @@protoc_insertion_point(outer_class_scope)

‎java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ syntax = "proto3";
1717
package google.logging.type;
1818

1919
import "google/protobuf/duration.proto";
20-
import "google/api/annotations.proto";
2120

2221
option csharp_namespace = "Google.Cloud.Logging.Type";
2322
option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype";

‎java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@ 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;
2422
option java_outer_classname = "LogSeverityProto";
2523
option java_package = "com.google.logging.type";
24+
option objc_class_prefix = "GLOG";
2625
option php_namespace = "Google\\Cloud\\Logging\\Type";
2726
option ruby_package = "Google::Cloud::Logging::Type";
2827

0 commit comments

Comments
 (0)