-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: remove server unimplemented GrpcStorageImpl#{get,list,create,del…
…ete,Update}HmacKey Partial revert of 84e4adf
- Loading branch information
1 parent
9de9a92
commit 51e841c
Showing
3 changed files
with
10 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,19 +26,13 @@ | |
| import com.google.cloud.storage.Bucket; | ||
| import com.google.cloud.storage.BucketInfo; | ||
| import com.google.cloud.storage.CopyWriter; | ||
| import com.google.cloud.storage.HmacKey; | ||
| import com.google.cloud.storage.HmacKey.HmacKeyMetadata; | ||
| import com.google.cloud.storage.HmacKey.HmacKeyState; | ||
| import com.google.cloud.storage.ServiceAccount; | ||
| import com.google.cloud.storage.Storage; | ||
| import com.google.cloud.storage.Storage.BlobListOption; | ||
| import com.google.cloud.storage.Storage.BlobSourceOption; | ||
| import com.google.cloud.storage.Storage.BlobTargetOption; | ||
| import com.google.cloud.storage.Storage.BlobWriteOption; | ||
| import com.google.cloud.storage.Storage.BucketTargetOption; | ||
| import com.google.cloud.storage.Storage.CopyRequest; | ||
| import com.google.cloud.storage.Storage.CreateHmacKeyOption; | ||
| import com.google.cloud.storage.Storage.ListHmacKeysOption; | ||
| import com.google.cloud.storage.StorageOptions; | ||
| import com.google.cloud.storage.TransportCompatibility.Transport; | ||
| import com.google.cloud.storage.it.runner.StorageITRunner; | ||
|
|
@@ -110,61 +104,6 @@ public void listBuckets() { | |
| assertThat(bucketNames).contains(bucketInfo.getName()); | ||
| } | ||
|
|
||
| @Test | ||
| public void createHmacKey() { | ||
| ServiceAccount serviceAccount = ServiceAccount.of("[email protected]"); | ||
| HmacKey hmacKey = storage.createHmacKey(serviceAccount); | ||
| assertThat(hmacKey).isNotNull(); | ||
| assertThat(hmacKey.getSecretKey()).isNotNull(); | ||
| assertThat(hmacKey.getMetadata().getServiceAccount()).isEqualTo(serviceAccount); | ||
| } | ||
|
|
||
| @Test | ||
| public void getHmacKey() { | ||
| ServiceAccount serviceAccount = ServiceAccount.of("[email protected]"); | ||
| HmacKey hmacKey = storage.createHmacKey(serviceAccount); | ||
| HmacKeyMetadata actual = storage.getHmacKey(hmacKey.getMetadata().getAccessId()); | ||
| assertThat(actual).isEqualTo(hmacKey.getMetadata()); | ||
| } | ||
|
|
||
| @Test | ||
| public void listHmacKeys() { | ||
| ImmutableList<HmacKey> keys = | ||
| IntStream.rangeClosed(1, 4) | ||
| .mapToObj(i -> ServiceAccount.of(String.format("x-%[email protected]", i))) | ||
| .map(sa -> storage.createHmacKey(sa, CreateHmacKeyOption.projectId("proj"))) | ||
| .collect(ImmutableList.toImmutableList()); | ||
|
|
||
| ImmutableList<HmacKeyMetadata> expected = | ||
| keys.stream().map(HmacKey::getMetadata).collect(ImmutableList.toImmutableList()); | ||
|
|
||
| Page<HmacKeyMetadata> page = storage.listHmacKeys(ListHmacKeysOption.projectId("proj")); | ||
|
|
||
| ImmutableList<HmacKeyMetadata> actual = | ||
| StreamSupport.stream(page.iterateAll().spliterator(), false) | ||
| .collect(ImmutableList.toImmutableList()); | ||
|
|
||
| assertThat(actual).containsAtLeastElementsIn(expected); | ||
| } | ||
|
|
||
| @Test | ||
| public void updateHmacKey() { | ||
| ServiceAccount serviceAccount = ServiceAccount.of("[email protected]"); | ||
| HmacKey hmacKey = storage.createHmacKey(serviceAccount); | ||
| HmacKeyMetadata updated = | ||
| storage.updateHmacKeyState(hmacKey.getMetadata(), HmacKeyState.INACTIVE); | ||
| assertThat(updated.getServiceAccount()).isEqualTo(serviceAccount); | ||
| assertThat(updated.getState()).isEqualTo(HmacKeyState.INACTIVE); | ||
| } | ||
|
|
||
| @Test | ||
| public void deleteHmacKey() { | ||
| ServiceAccount serviceAccount = ServiceAccount.of("[email protected]"); | ||
| HmacKey hmacKey = storage.createHmacKey(serviceAccount); | ||
| storage.updateHmacKeyState(hmacKey.getMetadata(), HmacKeyState.INACTIVE); | ||
| storage.deleteHmacKey(hmacKey.getMetadata()); | ||
| } | ||
|
|
||
| @Test | ||
| public void object_writeGetRead() { | ||
| Storage s = storage; | ||
|
|
||