---

Frank Natividad · Frank Natividad · commit 44c132b75107 · 2018-05-01T01:43:47.000-07:00
yaml --- r: 9743 b: refs/heads/spanner-gapic-migration c: 47701ed h: refs/heads/master i: 9741: c178a0a 9739: f5a8402 9735: 51ff487 9727: 084c67d
diff --git a/[refs] b/[refs]
@@ -80,7 +80,7 @@ refs/tags/v0.34.0: bf31760a31a66acb239322a70dcd03dbe1d0c7ca
 refs/tags/v0.35.0: c28951c5f4cc97a1be07900d19df6984115a4bd6
 refs/tags/v0.36.0: 6b75c61f73e6827b3ca379bd54f88f750290162f
 refs/tags/v0.37.0: db2e142f92601709fdd48db159776f905742e30f
-refs/heads/spanner-gapic-migration: 56b34dfb1ac66b12ba8c3d13aa9147501e8692b6
+refs/heads/spanner-gapic-migration: 47701ed4c644a4c19b99ebe8aaef1e896b533f0d
 refs/tags/v0.38.0: c235ee4df5e1248e1769dae3f86a0d7ab7fd8301
 refs/tags/v0.39.0: ab231c9d22475242a43d6d9554aa4a3f736dab01
 refs/tags/v0.40.0: a1d5b05206cce7734365f1b910396a2c9d6605ec
diff --git a/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java
@@ -66,7 +66,7 @@ public class BlobInfoTest {
   private static final String KEY_SHA256 = "keySha";
   private static final CustomerEncryption CUSTOMER_ENCRYPTION =
       new CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256);
-  private static final String KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key";
+  private static final String KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key";
   private static final StorageClass STORAGE_CLASS = StorageClass.COLDLINE;
 
   // Unit tests include Customer Supplied encryption which may be confusing with the KMS KEY NAME
diff --git a/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
@@ -60,7 +60,7 @@ public class BucketInfoTest {
   private static final String NOT_FOUND_PAGE = "error.html";
   private static final String LOCATION = "ASIA";
   private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD;
-  private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key";
+  private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key";
   private static final Boolean VERSIONING_ENABLED = true;
   private static final Map<String, String> BUCKET_LABELS = ImmutableMap.of("label1", "value1");
   private static final Boolean REQUESTER_PAYS = true;
diff --git a/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/branches/spanner-gapic-migration/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
@@ -77,7 +77,7 @@ public class BucketTest {
   private static final String NOT_FOUND_PAGE = "error.html";
   private static final String LOCATION = "ASIA";
   private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD;
-  private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key";
+  private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key";
   private static final Boolean VERSIONING_ENABLED = true;
   private static final Map<String, String> BUCKET_LABELS = ImmutableMap.of("label1", "value1");
   private static final Boolean REQUESTER_PAYS = true;
