Skip to content

Commit c7db2c8

Browse files
committed
Change config value to camel case
1 parent e208fd2 commit c7db2c8

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

google/cloud/storage/bucket_encryption_feature_test.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ TEST(BucketEncryptionTest, Parse) {
3030
"encryption": {
3131
"defaultKmsKeyName": "projects/test-project-name/locations/us-central1/keyRings/test-keyring-name/cryptoKeys/test-key-name",
3232
"googleManagedEncryptionEnforcementConfig": {
33-
"restrictionMode": "FULLY_RESTRICTED",
33+
"restrictionMode": "FullyRestricted",
3434
"effectiveTime": "2025-12-18T18:13:15Z"
3535
},
3636
"customerManagedEncryptionEnforcementConfig": {
37-
"restrictionMode": "NOT_RESTRICTED",
37+
"restrictionMode": "NotRestricted",
3838
"effectiveTime": "2025-12-18T18:13:15Z"
3939
},
4040
"customerSuppliedEncryptionEnforcementConfig": {
41-
"restrictionMode": "NOT_RESTRICTED",
41+
"restrictionMode": "NotRestricted",
4242
"effectiveTime": "2025-12-18T18:13:15Z"
4343
}
4444
}
@@ -55,22 +55,22 @@ TEST(BucketEncryptionTest, Parse) {
5555
encryption.default_kms_key_name);
5656

5757
EXPECT_EQ(
58-
"FULLY_RESTRICTED",
58+
"FullyRestricted",
5959
encryption.google_managed_encryption_enforcement_config.restriction_mode);
6060
EXPECT_EQ("2025-12-18T18:13:15Z",
6161
google::cloud::internal::FormatRfc3339(
6262
encryption.google_managed_encryption_enforcement_config
6363
.effective_time));
6464

65-
EXPECT_EQ("NOT_RESTRICTED",
65+
EXPECT_EQ("NotRestricted",
6666
encryption.customer_managed_encryption_enforcement_config
6767
.restriction_mode);
6868
EXPECT_EQ("2025-12-18T18:13:15Z",
6969
google::cloud::internal::FormatRfc3339(
7070
encryption.customer_managed_encryption_enforcement_config
7171
.effective_time));
7272

73-
EXPECT_EQ("NOT_RESTRICTED",
73+
EXPECT_EQ("NotRestricted",
7474
encryption.customer_supplied_encryption_enforcement_config
7575
.restriction_mode);
7676
EXPECT_EQ("2025-12-18T18:13:15Z",
@@ -84,11 +84,11 @@ TEST(BucketEncryptionTest, ToJson) {
8484
BucketEncryption encryption;
8585
encryption.default_kms_key_name = "test-key";
8686
encryption.google_managed_encryption_enforcement_config.restriction_mode =
87-
"FULLY_RESTRICTED";
87+
"FullyRestricted";
8888
encryption.google_managed_encryption_enforcement_config.effective_time =
8989
google::cloud::internal::ParseRfc3339("2025-12-18T18:13:15Z").value();
9090
encryption.customer_managed_encryption_enforcement_config.restriction_mode =
91-
"NOT_RESTRICTED";
91+
"NotRestricted";
9292
encryption.customer_managed_encryption_enforcement_config.effective_time =
9393
google::cloud::internal::ParseRfc3339("2025-12-18T18:13:15Z").value();
9494

@@ -100,11 +100,11 @@ TEST(BucketEncryptionTest, ToJson) {
100100
ASSERT_TRUE(json.contains("encryption"));
101101
auto e = json["encryption"];
102102
EXPECT_EQ("test-key", e["defaultKmsKeyName"]);
103-
EXPECT_EQ("FULLY_RESTRICTED",
103+
EXPECT_EQ("FullyRestricted",
104104
e["googleManagedEncryptionEnforcementConfig"]["restrictionMode"]);
105105
EXPECT_EQ("2025-12-18T18:13:15Z",
106106
e["googleManagedEncryptionEnforcementConfig"]["effectiveTime"]);
107-
EXPECT_EQ("NOT_RESTRICTED",
107+
EXPECT_EQ("NotRestricted",
108108
e["customerManagedEncryptionEnforcementConfig"]["restrictionMode"]);
109109
EXPECT_EQ("2025-12-18T18:13:15Z",
110110
e["customerManagedEncryptionEnforcementConfig"]["effectiveTime"]);
@@ -116,7 +116,7 @@ TEST(BucketEncryptionTest, Patch) {
116116
BucketEncryption encryption;
117117
encryption.default_kms_key_name = "test-key";
118118
encryption.google_managed_encryption_enforcement_config.restriction_mode =
119-
"FULLY_RESTRICTED";
119+
"FullyRestricted";
120120
encryption.google_managed_encryption_enforcement_config.effective_time =
121121
google::cloud::internal::ParseRfc3339("2025-12-18T18:13:15Z").value();
122122

@@ -128,7 +128,7 @@ TEST(BucketEncryptionTest, Patch) {
128128
ASSERT_TRUE(patch.contains("encryption"));
129129
auto e = patch["encryption"];
130130
EXPECT_EQ("test-key", e["defaultKmsKeyName"]);
131-
EXPECT_EQ("FULLY_RESTRICTED",
131+
EXPECT_EQ("FullyRestricted",
132132
e["googleManagedEncryptionEnforcementConfig"]["restrictionMode"]);
133133
EXPECT_EQ("2025-12-18T18:13:15Z",
134134
e["googleManagedEncryptionEnforcementConfig"]["effectiveTime"]);

google/cloud/storage/bucket_metadata_test.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ BucketMetadata CreateBucketMetadataForTest() {
109109
"encryption": {
110110
"defaultKmsKeyName": "projects/test-project-name/locations/us-central1/keyRings/test-keyring-name/cryptoKeys/test-key-name",
111111
"googleManagedEncryptionEnforcementConfig": {
112-
"restrictionMode": "FULLY_RESTRICTED",
112+
"restrictionMode": "FullyRestricted",
113113
"effectiveTime": "2025-12-18T18:13:15Z"
114114
},
115115
"customerManagedEncryptionEnforcementConfig": {
116-
"restrictionMode": "NOT_RESTRICTED",
116+
"restrictionMode": "NotRestricted",
117117
"effectiveTime": "2025-12-18T18:13:15Z"
118118
},
119119
"customerSuppliedEncryptionEnforcementConfig": {
120-
"restrictionMode": "NOT_RESTRICTED",
120+
"restrictionMode": "NotRestricted",
121121
"effectiveTime": "2025-12-18T18:13:15Z"
122122
}
123123
},
@@ -236,15 +236,15 @@ TEST(BucketMetadataTest, Parse) {
236236
"projects/test-project-name/locations/us-central1/keyRings/"
237237
"test-keyring-name/cryptoKeys/test-key-name",
238238
actual.encryption().default_kms_key_name);
239-
EXPECT_EQ("FULLY_RESTRICTED",
239+
EXPECT_EQ("FullyRestricted",
240240
actual.encryption()
241241
.google_managed_encryption_enforcement_config.restriction_mode);
242242
EXPECT_EQ(
243-
"NOT_RESTRICTED",
243+
"NotRestricted",
244244
actual.encryption()
245245
.customer_managed_encryption_enforcement_config.restriction_mode);
246246
EXPECT_EQ(
247-
"NOT_RESTRICTED",
247+
"NotRestricted",
248248
actual.encryption()
249249
.customer_supplied_encryption_enforcement_config.restriction_mode);
250250
EXPECT_EQ(
@@ -523,21 +523,21 @@ TEST(BucketMetadataTest, ToJsonString) {
523523
"test-keyring-name/cryptoKeys/test-key-name",
524524
encryption.value("defaultKmsKeyName", ""));
525525

526-
EXPECT_EQ("FULLY_RESTRICTED",
526+
EXPECT_EQ("FullyRestricted",
527527
encryption["googleManagedEncryptionEnforcementConfig"].value(
528528
"restrictionMode", ""));
529529
EXPECT_EQ("2025-12-18T18:13:15Z",
530530
encryption["googleManagedEncryptionEnforcementConfig"].value(
531531
"effectiveTime", ""));
532532

533-
EXPECT_EQ("NOT_RESTRICTED",
533+
EXPECT_EQ("NotRestricted",
534534
encryption["customerManagedEncryptionEnforcementConfig"].value(
535535
"restrictionMode", ""));
536536
EXPECT_EQ("2025-12-18T18:13:15Z",
537537
encryption["customerManagedEncryptionEnforcementConfig"].value(
538538
"effectiveTime", ""));
539539

540-
EXPECT_EQ("NOT_RESTRICTED",
540+
EXPECT_EQ("NotRestricted",
541541
encryption["customerSuppliedEncryptionEnforcementConfig"].value(
542542
"restrictionMode", ""));
543543
EXPECT_EQ("2025-12-18T18:13:15Z",
@@ -899,7 +899,7 @@ TEST(BucketMetadataTest, SetEncryption) {
899899
std::string fake_key_name =
900900
"projects/test-project-name/locations/us-central1/keyRings/"
901901
"test-keyring-name/cryptoKeys/another-test-key-name";
902-
std::string fake_restriction_mode = "FULLY_RESTRICTED";
902+
std::string fake_restriction_mode = "FullyRestricted";
903903

904904
copy.set_encryption(BucketEncryption{fake_key_name,
905905
{fake_restriction_mode, {}},

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,15 @@ TEST(GrpcBucketRequestParser, PatchBucketRequestAllOptions) {
461461
encryption {
462462
default_kms_key: "test-only-kms-key"
463463
google_managed_encryption_enforcement_config {
464-
restriction_mode: "FULLY_RESTRICTED"
464+
restriction_mode: "FullyRestricted"
465465
effective_time { seconds: 1766175572 }
466466
}
467467
customer_managed_encryption_enforcement_config {
468-
restriction_mode: "NOT_RESTRICTED"
468+
restriction_mode: "NotRestricted"
469469
effective_time { seconds: 1766175695 }
470470
}
471471
customer_supplied_encryption_enforcement_config {
472-
restriction_mode: "FULLY_RESTRICTED"
472+
restriction_mode: "FullyRestricted"
473473
effective_time { seconds: 1766175739 }
474474
}
475475
}
@@ -551,17 +551,17 @@ TEST(GrpcBucketRequestParser, PatchBucketRequestAllOptions) {
551551
/*.default_kms_key=*/"test-only-kms-key",
552552
/*.google_managed_encryption_enforcement_config=*/
553553
storage::GoogleManagedEncryptionEnforcementConfig{
554-
"FULLY_RESTRICTED",
554+
"FullyRestricted",
555555
google::cloud::internal::ParseRfc3339("2025-12-19T20:19:32Z")
556556
.value()},
557557
/*.customer_managed_encryption_enforcement_config=*/
558558
storage::CustomerManagedEncryptionEnforcementConfig{
559-
"NOT_RESTRICTED",
559+
"NotRestricted",
560560
google::cloud::internal::ParseRfc3339("2025-12-19T20:21:35Z")
561561
.value()},
562562
/*.customer_supplied_encryption_enforcement_config=*/
563563
storage::CustomerSuppliedEncryptionEnforcementConfig{
564-
"FULLY_RESTRICTED",
564+
"FullyRestricted",
565565
google::cloud::internal::ParseRfc3339("2025-12-19T20:22:19Z")
566566
.value()}})
567567
.SetAutoclass(storage::BucketAutoclass{true})
@@ -745,15 +745,15 @@ TEST(GrpcBucketRequestParser, UpdateBucketRequestAllOptions) {
745745
encryption {
746746
default_kms_key: "test-only-kms-key"
747747
google_managed_encryption_enforcement_config {
748-
restriction_mode: "FULLY_RESTRICTED"
748+
restriction_mode: "FullyRestricted"
749749
effective_time { seconds: 1766176065 }
750750
}
751751
customer_managed_encryption_enforcement_config {
752-
restriction_mode: "NOT_RESTRICTED"
752+
restriction_mode: "NotRestricted"
753753
effective_time { seconds: 1766176105 }
754754
}
755755
customer_supplied_encryption_enforcement_config {
756-
restriction_mode: "FULLY_RESTRICTED"
756+
restriction_mode: "FullyRestricted"
757757
effective_time { seconds: 1766176151 }
758758
}
759759
}
@@ -833,17 +833,17 @@ TEST(GrpcBucketRequestParser, UpdateBucketRequestAllOptions) {
833833
/*.default_kms_key=*/"test-only-kms-key",
834834
/*.google_managed_encryption_enforcement_config=*/
835835
storage::GoogleManagedEncryptionEnforcementConfig{
836-
"FULLY_RESTRICTED",
836+
"FullyRestricted",
837837
google::cloud::internal::ParseRfc3339("2025-12-19T20:27:45Z")
838838
.value()},
839839
/*.customer_managed_encryption_enforcement_config=*/
840840
storage::CustomerManagedEncryptionEnforcementConfig{
841-
"NOT_RESTRICTED",
841+
"NotRestricted",
842842
google::cloud::internal::ParseRfc3339("2025-12-19T20:28:25Z")
843843
.value()},
844844
/*.customer_supplied_encryption_enforcement_config=*/
845845
storage::CustomerSuppliedEncryptionEnforcementConfig{
846-
"FULLY_RESTRICTED",
846+
"FullyRestricted",
847847
google::cloud::internal::ParseRfc3339("2025-12-19T20:29:11Z")
848848
.value()}})
849849
.set_autoclass(storage::BucketAutoclass{true})

0 commit comments

Comments
 (0)