Skip to content

Commit e208fd2

Browse files
committed
ci failure fix
1 parent 21d2f86 commit e208fd2

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

google/cloud/storage/bucket_encryption.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ inline bool operator>=(EncryptionEnforcementConfig<Tag> const& lhs,
7979
template <typename Tag>
8080
inline std::ostream& operator<<(std::ostream& os,
8181
EncryptionEnforcementConfig<Tag> const& rhs) {
82-
return os << EncryptionEnforcementConfigName<Tag>::value
82+
return os << EncryptionEnforcementConfigName<Tag>::kValue
8383
<< "={restriction_mode=" << rhs.restriction_mode
8484
<< ", effective_time="
8585
<< google::cloud::internal::FormatRfc3339(rhs.effective_time)
@@ -93,7 +93,7 @@ using GoogleManagedEncryptionEnforcementConfig =
9393
template <>
9494
struct EncryptionEnforcementConfigName<
9595
GoogleManagedEncryptionEnforcementConfigTag> {
96-
static constexpr char const* value =
96+
static constexpr char const* kValue =
9797
"GoogleManagedEncryptionEnforcementConfig";
9898
};
9999

@@ -104,7 +104,7 @@ using CustomerManagedEncryptionEnforcementConfig =
104104
template <>
105105
struct EncryptionEnforcementConfigName<
106106
CustomerManagedEncryptionEnforcementConfigTag> {
107-
static constexpr char const* value =
107+
static constexpr char const* kValue =
108108
"CustomerManagedEncryptionEnforcementConfig";
109109
};
110110

@@ -115,7 +115,7 @@ using CustomerSuppliedEncryptionEnforcementConfig =
115115
template <>
116116
struct EncryptionEnforcementConfigName<
117117
CustomerSuppliedEncryptionEnforcementConfigTag> {
118-
static constexpr char const* value =
118+
static constexpr char const* kValue =
119119
"CustomerSuppliedEncryptionEnforcementConfig";
120120
};
121121

google/cloud/storage/bucket_metadata_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,9 +902,9 @@ TEST(BucketMetadataTest, SetEncryption) {
902902
std::string fake_restriction_mode = "FULLY_RESTRICTED";
903903

904904
copy.set_encryption(BucketEncryption{fake_key_name,
905-
{fake_restriction_mode},
906-
{fake_restriction_mode},
907-
{fake_restriction_mode}});
905+
{fake_restriction_mode, {}},
906+
{fake_restriction_mode, {}},
907+
{fake_restriction_mode, {}}});
908908
EXPECT_EQ(fake_key_name, copy.encryption().default_kms_key_name);
909909
EXPECT_EQ(fake_restriction_mode,
910910
copy.encryption()
@@ -1387,7 +1387,7 @@ TEST(BucketMetadataPatchBuilder, SetEncryption) {
13871387
std::string expected =
13881388
"projects/test-project-name/locations/us-central1/keyRings/"
13891389
"test-keyring-name/cryptoKeys/test-key-name";
1390-
builder.SetEncryption(BucketEncryption{expected});
1390+
builder.SetEncryption(BucketEncryption{expected, {}, {}, {}});
13911391

13921392
auto actual = builder.BuildPatch();
13931393
auto json = nlohmann::json::parse(actual);

google/cloud/storage/examples/storage_bucket_default_kms_key_samples.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void AddBucketDefaultKmsKey(google::cloud::storage::Client client,
3434
std::string const& key_name) {
3535
StatusOr<gcs::BucketMetadata> updated = client.PatchBucket(
3636
bucket_name, gcs::BucketMetadataPatchBuilder().SetEncryption(
37-
gcs::BucketEncryption{key_name}));
37+
gcs::BucketEncryption{key_name, {}, {}, {}}));
3838
if (!updated) throw std::move(updated).status();
3939

4040
if (!updated->has_encryption()) {

google/cloud/storage/internal/bucket_requests_test.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,8 @@ TEST(PatchBucketRequestTest, DiffSetEncryption) {
406406
BucketMetadata original = CreateBucketMetadataForTest();
407407
original.reset_encryption();
408408
BucketMetadata updated = original;
409-
updated.set_encryption(BucketEncryption{"invalid-key-name-just-for-test"});
409+
updated.set_encryption(
410+
BucketEncryption{"invalid-key-name-just-for-test", {}, {}, {}});
410411
PatchBucketRequest request("test-bucket", original, updated);
411412

412413
auto patch = nlohmann::json::parse(request.payload());
@@ -418,7 +419,8 @@ TEST(PatchBucketRequestTest, DiffSetEncryption) {
418419

419420
TEST(PatchBucketRequestTest, DiffResetEncryption) {
420421
BucketMetadata original = CreateBucketMetadataForTest();
421-
original.set_encryption(BucketEncryption{"invalid-key-name-just-for-test"});
422+
original.set_encryption(
423+
BucketEncryption{"invalid-key-name-just-for-test", {}, {}, {}});
422424
BucketMetadata updated = original;
423425
updated.reset_encryption();
424426
PatchBucketRequest request("test-bucket", original, updated);

google/cloud/storage/internal/grpc/bucket_metadata_parser_test.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,10 @@ TEST(GrpcBucketMetadataParser, BucketEncryptionRoundtrip) {
333333
google::storage::v2::Bucket::Encryption start;
334334
EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(kText, &start));
335335
auto const expected = storage::BucketEncryption{
336-
"projects/test-p/locations/us/keyRings/test-kr/cryptoKeys/test-key"};
336+
"projects/test-p/locations/us/keyRings/test-kr/cryptoKeys/test-key",
337+
{},
338+
{},
339+
{}};
337340
auto const middle = FromProto(start);
338341
EXPECT_EQ(middle, expected);
339342
auto const end = ToProto(middle);

0 commit comments

Comments
 (0)