File tree Expand file tree Collapse file tree
trunk/google-cloud-storage/src/test/java/com/google/cloud/storage Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11---
2- refs/heads/master: 56b34dfb1ac66b12ba8c3d13aa9147501e8692b6
2+ refs/heads/master: 47701ed4c644a4c19b99ebe8aaef1e896b533f0d
33refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44refs/heads/gh-pages: a9cc59cb77938ae027038f2041e9459553038de7
55refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ public class BlobInfoTest {
6666 private static final String KEY_SHA256 = "keySha" ;
6767 private static final CustomerEncryption CUSTOMER_ENCRYPTION =
6868 new CustomerEncryption (ENCRYPTION_ALGORITHM , KEY_SHA256 );
69- private static final String KMS_KEY_NAME = "projects/p/keyRings /kr/location /kr-loc/cryptoKey /key" ;
69+ private static final String KMS_KEY_NAME = "projects/p/locations /kr-loc/keyRings /kr/cryptoKeys /key" ;
7070 private static final StorageClass STORAGE_CLASS = StorageClass .COLDLINE ;
7171
7272 // Unit tests include Customer Supplied encryption which may be confusing with the KMS KEY NAME
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ public class BucketInfoTest {
6060 private static final String NOT_FOUND_PAGE = "error.html" ;
6161 private static final String LOCATION = "ASIA" ;
6262 private static final StorageClass STORAGE_CLASS = StorageClass .STANDARD ;
63- private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings /kr/location /kr-loc/cryptoKey /key" ;
63+ private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations /kr-loc/keyRings /kr/cryptoKeys /key" ;
6464 private static final Boolean VERSIONING_ENABLED = true ;
6565 private static final Map <String , String > BUCKET_LABELS = ImmutableMap .of ("label1" , "value1" );
6666 private static final Boolean REQUESTER_PAYS = true ;
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ public class BucketTest {
7777 private static final String NOT_FOUND_PAGE = "error.html" ;
7878 private static final String LOCATION = "ASIA" ;
7979 private static final StorageClass STORAGE_CLASS = StorageClass .STANDARD ;
80- private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings /kr/location /kr-loc/cryptoKey /key" ;
80+ private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations /kr-loc/keyRings /kr/cryptoKeys /key" ;
8181 private static final Boolean VERSIONING_ENABLED = true ;
8282 private static final Map <String , String > BUCKET_LABELS = ImmutableMap .of ("label1" , "value1" );
8383 private static final Boolean REQUESTER_PAYS = true ;
You can’t perform that action at this time.
0 commit comments