From 007233b42d2736433493bad6211b0f91273de9f4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:49:46 -0500 Subject: [PATCH] feat: KMS configuration in settings (#322) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Update Logging API with latest changes PiperOrigin-RevId: 429289471 Source-Link: https://github.com/googleapis/googleapis/commit/acd5f89b8addd2ff54f41a7d43ff9b122bb43337 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: https://github.com/googleapis/googleapis/commit/95da686e8840cf3edf872ce3d095967e24e41bf6 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 --- .../google/logging/type/HttpRequestProto.java | 33 +++++++++---------- .../google/logging/type/LogSeverityProto.java | 26 +++++++-------- .../google/logging/type/http_request.proto | 3 +- .../google/logging/type/log_severity.proto | 5 ++- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java index bc29a446a6..39fdf74853 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/HttpRequestProto.java @@ -42,29 +42,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n&google/logging/type/http_request.proto" + "\022\023google.logging.type\032\036google/protobuf/d" - + "uration.proto\032\034google/api/annotations.pr" - + "oto\"\357\002\n\013HttpRequest\022\026\n\016request_method\030\001 " - + "\001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014request_size" - + "\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresponse_size\030" - + "\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tremote_ip\030\007" - + " \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007referer\030\010 \001(\t" - + "\022*\n\007latency\030\016 \001(\0132\031.google.protobuf.Dura" - + "tion\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\tcache_hit\030" - + "\t \001(\010\022*\n\"cache_validated_with_origin_ser" - + "ver\030\n \001(\010\022\030\n\020cache_fill_bytes\030\014 \001(\003\022\020\n\010p" - + "rotocol\030\017 \001(\tB\276\001\n\027com.google.logging.typ" - + "eB\020HttpRequestProtoP\001Z8google.golang.org" - + "/genproto/googleapis/logging/type;ltype\252" - + "\002\031Google.Cloud.Logging.Type\312\002\031Google\\Clo" - + "ud\\Logging\\Type\352\002\034Google::Cloud::Logging" - + "::Typeb\006proto3" + + "uration.proto\"\357\002\n\013HttpRequest\022\026\n\016request" + + "_method\030\001 \001(\t\022\023\n\013request_url\030\002 \001(\t\022\024\n\014re" + + "quest_size\030\003 \001(\003\022\016\n\006status\030\004 \001(\005\022\025\n\rresp" + + "onse_size\030\005 \001(\003\022\022\n\nuser_agent\030\006 \001(\t\022\021\n\tr" + + "emote_ip\030\007 \001(\t\022\021\n\tserver_ip\030\r \001(\t\022\017\n\007ref" + + "erer\030\010 \001(\t\022*\n\007latency\030\016 \001(\0132\031.google.pro" + + "tobuf.Duration\022\024\n\014cache_lookup\030\013 \001(\010\022\021\n\t" + + "cache_hit\030\t \001(\010\022*\n\"cache_validated_with_" + + "origin_server\030\n \001(\010\022\030\n\020cache_fill_bytes\030" + + "\014 \001(\003\022\020\n\010protocol\030\017 \001(\tB\276\001\n\027com.google.l" + + "ogging.typeB\020HttpRequestProtoP\001Z8google." + + "golang.org/genproto/googleapis/logging/t" + + "ype;ltype\252\002\031Google.Cloud.Logging.Type\312\002\031" + + "Google\\Cloud\\Logging\\Type\352\002\034Google::Clou" + + "d::Logging::Typeb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.protobuf.DurationProto.getDescriptor(), - com.google.api.AnnotationsProto.getDescriptor(), }); internal_static_google_logging_type_HttpRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -89,7 +87,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Protocol", }); com.google.protobuf.DurationProto.getDescriptor(); - com.google.api.AnnotationsProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java index 9843f955df..3f205fc516 100644 --- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java +++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/logging/type/LogSeverityProto.java @@ -36,24 +36,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n&google/logging/type/log_severity.proto" - + "\022\023google.logging.type\032\034google/api/annota" - + "tions.proto*\202\001\n\013LogSeverity\022\013\n\007DEFAULT\020\000" - + "\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTICE\020\254\002\022\014\n\007W" - + "ARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITICAL\020\330\004\022\n\n\005" - + "ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\276\001\n\027com.google." - + "logging.typeB\020LogSeverityProtoP\001Z8google" - + ".golang.org/genproto/googleapis/logging/" - + "type;ltype\252\002\031Google.Cloud.Logging.Type\312\002" - + "\031Google\\Cloud\\Logging\\Type\352\002\034Google::Clo" - + "ud::Logging::Typeb\006proto3" + + "\022\023google.logging.type*\202\001\n\013LogSeverity\022\013\n" + + "\007DEFAULT\020\000\022\t\n\005DEBUG\020d\022\t\n\004INFO\020\310\001\022\013\n\006NOTI" + + "CE\020\254\002\022\014\n\007WARNING\020\220\003\022\n\n\005ERROR\020\364\003\022\r\n\010CRITI" + + "CAL\020\330\004\022\n\n\005ALERT\020\274\005\022\016\n\tEMERGENCY\020\240\006B\305\001\n\027c" + + "om.google.logging.typeB\020LogSeverityProto" + + "P\001Z8google.golang.org/genproto/googleapi" + + "s/logging/type;ltype\242\002\004GLOG\252\002\031Google.Clo" + + "ud.Logging.Type\312\002\031Google\\Cloud\\Logging\\T" + + "ype\352\002\034Google::Cloud::Logging::Typeb\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), - }); - com.google.api.AnnotationsProto.getDescriptor(); + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); } // @@protoc_insertion_point(outer_class_scope) diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto index d34fe7be4c..b878d60dce 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/http_request.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ syntax = "proto3"; package google.logging.type; import "google/protobuf/duration.proto"; -import "google/api/annotations.proto"; option csharp_namespace = "Google.Cloud.Logging.Type"; option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype"; diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto index 0762b5c93a..bed71935f9 100644 --- a/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto +++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/logging/type/log_severity.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,13 +16,12 @@ syntax = "proto3"; package google.logging.type; -import "google/api/annotations.proto"; - option csharp_namespace = "Google.Cloud.Logging.Type"; option go_package = "google.golang.org/genproto/googleapis/logging/type;ltype"; option java_multiple_files = true; option java_outer_classname = "LogSeverityProto"; option java_package = "com.google.logging.type"; +option objc_class_prefix = "GLOG"; option php_namespace = "Google\\Cloud\\Logging\\Type"; option ruby_package = "Google::Cloud::Logging::Type";