fix: Update encryption_key fields to "bytes" type.

Google APIs · copybara-github · commit 46fdf2d70c3c · 2021-07-27T15:00:43.000-07:00
fix: Improve date/times and field name clarity in lifecycle conditions. Committer: @BrandonY PiperOrigin-RevId: 387204174
diff --git a/google/storage/v2/BUILD.bazel b/google/storage/v2/BUILD.bazel
@@ -29,6 +29,7 @@ proto_library(
         "//google/api:resource_proto",
         "//google/iam/v1:iam_policy_proto",
         "//google/iam/v1:policy_proto",
+        "//google/type:date_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -118,6 +119,7 @@ go_proto_library(
     deps = [
         "//google/api:annotations_go_proto",
         "//google/iam/v1:iam_go_proto",
+        "//google/type:date_go_proto",
     ],
 )
 
@@ -303,18 +305,18 @@ ruby_gapic_assembly_pkg(
 #     "csharp_grpc_library",
 #     "csharp_proto_library",
 # )
-
+#
 # csharp_proto_library(
 #     name = "storage_csharp_proto",
 #     deps = [":storage_proto"],
 # )
-
+#
 # csharp_grpc_library(
 #     name = "storage_csharp_grpc",
 #     srcs = [":storage_proto"],
 #     deps = [":storage_csharp_proto"],
 # )
-
+#
 # csharp_gapic_library(
 #     name = "storage_csharp_gapic",
 #     srcs = [":storage_proto_with_info"],
@@ -325,7 +327,7 @@ ruby_gapic_assembly_pkg(
 #         ":storage_csharp_proto",
 #     ],
 # )
-
+#
 # # Open Source Packages
 # csharp_gapic_assembly_pkg(
 #     name = "google-cloud-storage-v2-csharp",
diff --git a/google/storage/v2/storage.proto b/google/storage/v2/storage.proto
@@ -24,6 +24,7 @@ import "google/iam/v1/policy.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
+import "google/type/date.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/storage/v2;storage";
 option java_multiple_files = true;
@@ -341,11 +342,12 @@ message CommonObjectRequestParams {
   string encryption_algorithm = 1;
 
   // Encryption key used with Customer-Supplied Encryption Keys feature.
-  string encryption_key = 2;
+  // In raw bytes format (not base64-encoded).
+  bytes encryption_key_bytes = 4;
 
   // SHA256 hash of encryption key used with Customer-Supplied Encryption Keys
   // feature.
-  string encryption_key_sha256 = 3;
+  bytes encryption_key_sha256_bytes = 5;
 }
 
 // Parameters that can be passed to any request.
@@ -549,13 +551,13 @@ message Bucket {
       message Condition {
         // Age of an object (in days). This condition is satisfied when an
         // object reaches the specified age.
-        int32 age_days = 1;
+        // A value of 0 indicates that all objects immediately match this
+        // condition.
+        optional int32 age_days = 1;
 
-        // A date in [RFC 3339][1] format with only the date part (for
-        // instance, "2013-01-15"). This condition is satisfied when an
-        // object is created before midnight of the specified date in UTC.
-        // [1]: https://tools.ietf.org/html/rfc3339
-        google.protobuf.Timestamp created_before_time = 2;
+        // This condition is satisfied when an object is created before midnight
+        // of the specified date in UTC.
+        google.type.Date created_before = 2;
 
         // Relevant only for versioned objects. If the value is
         // `true`, this condition matches live objects; if the value
@@ -565,41 +567,34 @@ message Bucket {
         // Relevant only for versioned objects. If the value is N, this
         // condition is satisfied when there are at least N versions (including
         // the live version) newer than this version of the object.
-        int32 num_newer_versions = 4;
+        optional int32 num_newer_versions = 4;
 
         // Objects having any of the storage classes specified by this condition
         // will be matched. Values include `MULTI_REGIONAL`, `REGIONAL`,
         // `NEARLINE`, `COLDLINE`, `STANDARD`, and
         // `DURABLE_REDUCED_AVAILABILITY`.
         repeated string matches_storage_class = 5;
 
-        // A regular expression that satisfies the RE2 syntax. This condition is
-        // satisfied when the name of the object matches the RE2 pattern.  Note:
-        // This feature is currently in the "Early Access" launch stage and is
-        // only available to an allowlisted set of users; that means that this
-        // feature may be changed in backward-incompatible ways and that it is
-        // not guaranteed to be released.
-        string matches_pattern = 6;
-
-        // Number of days that has elapsed since the custom timestamp set on an
+        // Number of days that have elapsed since the custom timestamp set on an
         // object.
-        int32 days_since_custom_time = 7;
+        // The value of the field must be a nonnegative integer.
+        optional int32 days_since_custom_time = 7;
 
         // An object matches this condition if the custom timestamp set on the
-        // object is before this timestamp.
-        google.protobuf.Timestamp custom_time_before_time = 8;
+        // object is before the specified date in UTC.
+        google.type.Date custom_time_before = 8;
 
         // This condition is relevant only for versioned objects. An object
         // version satisfies this condition only if these many days have been
         // passed since it became noncurrent. The value of the field must be a
         // nonnegative integer. If it's zero, the object version will become
         // eligible for Lifecycle action as soon as it becomes noncurrent.
-        int32 days_since_noncurrent_time = 9;
+        optional int32 days_since_noncurrent_time = 9;
 
         // This condition is relevant only for versioned objects. An object
         // version satisfies this condition only if it became noncurrent before
-        // the specified timestamp.
-        google.protobuf.Timestamp noncurrent_time_before_time = 10;
+        // the specified date in UTC.
+        google.type.Date noncurrent_time_before = 10;
       }
 
       // The action to take.
