Skip to content

Commit 8e6bfff

Browse files
author
Frank Natividad
committed
---
yaml --- r: 9639 b: refs/heads/master c: 8d042d2 h: refs/heads/master i: 9637: 9fbd2fd 9635: 79d611e 9631: edcc628
1 parent 98eb3b2 commit 8e6bfff

9 files changed

Lines changed: 87 additions & 119 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 86830e59f66d58dcd6a9552510509561a006cf62
2+
refs/heads/master: 8d042d2544d4d22ebd8d4564074a68a39722d698
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: a9cc59cb77938ae027038f2041e9459553038de7
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,6 @@ private Tuple<BlobInfo, Storage.BlobTargetOption> toTargetOption(BlobInfo blobIn
190190
case USER_PROJECT:
191191
return Tuple.of(blobInfo,
192192
Storage.BlobTargetOption.userProject((String) getValue()));
193-
case KMS_KEY_NAME:
194-
return Tuple.of(blobInfo,
195-
Storage.BlobTargetOption.kmsKeyName((String) getValue()));
196193
default:
197194
throw new AssertionError("Unexpected enum value");
198195
}
@@ -277,13 +274,6 @@ public static BlobTargetOption userProject(String userProject) {
277274
return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject);
278275
}
279276

280-
/**
281-
* Returns an option for blob's kms key name.
282-
*/
283-
public static BlobTargetOption kmsKeyName(String kmsKeyName) {
284-
return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName);
285-
}
286-
287277
static Tuple<BlobInfo, Storage.BlobTargetOption[]> toTargetOptions(
288278
BlobInfo info, BlobTargetOption... options) {
289279
Set<StorageRpc.Option> optionSet =
@@ -355,8 +345,6 @@ private Tuple<BlobInfo, Storage.BlobWriteOption> toWriteOption(BlobInfo blobInfo
355345
Storage.BlobWriteOption.encryptionKey((String) value));
356346
case USER_PROJECT:
357347
return Tuple.of(blobInfo, Storage.BlobWriteOption.userProject((String) value));
358-
case KMS_KEY_NAME:
359-
return Tuple.of(blobInfo, Storage.BlobWriteOption.kmsKeyName((String) value));
360348
default:
361349
throw new AssertionError("Unexpected enum value");
362350
}
@@ -482,13 +470,6 @@ public static BlobWriteOption userProject(String userProject) {
482470
return new BlobWriteOption(Storage.BlobWriteOption.Option.USER_PROJECT, userProject);
483471
}
484472

485-
/**
486-
* Returns an option for blob's kms key name.
487-
*/
488-
public static BlobWriteOption kmsKeyName(String kmsKeyName) {
489-
return new BlobWriteOption(Storage.BlobWriteOption.Option.KMS_KEY_NAME, kmsKeyName);
490-
}
491-
492473
static Tuple<BlobInfo, Storage.BlobWriteOption[]> toWriteOptions(
493474
BlobInfo info, BlobWriteOption... options) {
494475
Set<Storage.BlobWriteOption.Option> optionSet =

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,6 @@ public static BucketTargetOption metagenerationNotMatch() {
208208
public static BucketTargetOption userProject(String userProject) {
209209
return new BucketTargetOption(StorageRpc.Option.USER_PROJECT, userProject);
210210
}
211-
212-
// /**
213-
// * Returns an option to define the defaultKmsKeyName.
214-
// */
215-
// public static BucketTargetOption defaultKmsKeyName(String defaultKmsKeyName) {
216-
// defaultKmsKeyName = defaultKmsKeyName != null
217-
// ? new String(defaultKmsKeyName) : Data.<String>nullOf(String.class);
218-
// return new BucketTargetOption(StorageRpc.Option.KMS_KEY_NAME, defaultKmsKeyName);
219-
// }
220211
}
221212

222213
/**
@@ -394,15 +385,6 @@ public static BlobTargetOption encryptionKey(String key) {
394385
return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key);
395386
}
396387

397-
/**
398-
* Returns an option to set a KMS key resource name of the blob.
399-
*
400-
* @param kmsKeyName the KMS crypto key resource name
401-
*/
402-
public static BlobTargetOption kmsKeyName(String kmsKeyName) {
403-
return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName);
404-
}
405-
406388
static Tuple<BlobInfo, BlobTargetOption[]> convert(BlobInfo info, BlobWriteOption... options) {
407389
BlobInfo.Builder infoBuilder = info.toBuilder().setCrc32c(null).setMd5(null);
408390
List<BlobTargetOption> targetOptions = Lists.newArrayListWithCapacity(options.length);
@@ -436,7 +418,7 @@ class BlobWriteOption implements Serializable {
436418

437419
enum Option {
438420
PREDEFINED_ACL, IF_GENERATION_MATCH, IF_GENERATION_NOT_MATCH, IF_METAGENERATION_MATCH,
439-
IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT, KMS_KEY_NAME;
421+
IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT;
440422

441423
StorageRpc.Option toRpcOption() {
442424
return StorageRpc.Option.valueOf(this.name());
@@ -561,10 +543,6 @@ public static BlobWriteOption encryptionKey(String key) {
561543
public static BlobWriteOption userProject(String userProject) {
562544
return new BlobWriteOption(Option.USER_PROJECT, userProject);
563545
}
564-
565-
public static BlobWriteOption kmsKeyName(String kmsKeyName) {
566-
return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName);
567-
}
568546
}
569547

570548
/**

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,9 @@ public CopyWriter copy(final CopyRequest copyRequest) {
437437
RewriteResponse rewriteResponse = runWithRetries(new Callable<RewriteResponse>() {
438438
@Override
439439
public RewriteResponse call() {
440-
441440
return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions,
442441
copyRequest.overrideInfo(), targetObject, targetOptions,
443442
copyRequest.getMegabytesCopiedPerChunk()));
444-
445443
}
446444
}, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock());
447445
return new CopyWriter(getOptions(), rewriteResponse);

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
import java.util.LinkedList;
8282
import java.util.List;
8383
import java.util.Map;
84+
85+
import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
8486
import org.apache.http.HttpStatus;
8587

8688
public class HttpStorageRpc implements StorageRpc {
@@ -426,7 +428,6 @@ public StorageObject get(StorageObject object, Map<Option, ?> options) {
426428
public Bucket patch(Bucket bucket, Map<Option, ?> options) {
427429
Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_PATCH_BUCKET);
428430
Scope scope = tracer.withSpan(span);
429-
430431
try {
431432
return storage.buckets()
432433
.patch(bucket.getName(), bucket)
@@ -790,11 +791,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
790791
if (userProject == null) {
791792
userProject = Option.USER_PROJECT.getString(req.targetOptions);
792793
}
793-
794-
String kmsKeyName = Option.KMS_KEY_NAME.getString(req.targetOptions);
795-
if (kmsKeyName == null) {
796-
kmsKeyName = req.target.getKmsKeyName();
797-
}
794+
String kmsKeyName = req.target.getKmsKeyName();
798795

799796
Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null
800797
? req.megabytesRewrittenPerCall * MEGABYTE : null;
@@ -816,7 +813,6 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
816813
.setIfGenerationNotMatch(Option.IF_GENERATION_NOT_MATCH.getLong(req.targetOptions))
817814
.setUserProject(userProject)
818815
.setDestinationKmsKeyName(kmsKeyName);
819-
820816
HttpHeaders requestHeaders = rewrite.getRequestHeaders();
821817
setEncryptionHeaders(requestHeaders, SOURCE_ENCRYPTION_KEY_PREFIX, req.sourceOptions);
822818
setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, req.targetOptions);

‎trunk/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public class BlobTest {
9191
private static final String KEY_SHA256 = "keySha";
9292
private static final BlobInfo.CustomerEncryption CUSTOMER_ENCRYPTION =
9393
new BlobInfo.CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256);
94-
// TODO: Figure out CMEK + CSEK world
9594
private static final BlobInfo FULL_BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION)
9695
.setAcl(ACLS)
9796
.setComponentCount(COMPONENT_COUNT)

‎trunk/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import com.google.common.collect.Lists;
4242
import com.google.common.io.BaseEncoding;
4343

44-
import com.sun.net.ssl.KeyManagerFactorySpi;
4544
import org.junit.After;
4645
import org.junit.Before;
4746
import org.junit.Rule;
@@ -135,12 +134,12 @@ private void initializeExpectedBucket(int optionsCalls) {
135134
replay(serviceMockReturnsOptions);
136135
expectedBucket = new Bucket(serviceMockReturnsOptions, new BucketInfo.BuilderImpl(BUCKET_INFO));
137136
blobResults = ImmutableList.of(
138-
new Blob(serviceMockReturnsOptions,
139-
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())),
140-
new Blob(serviceMockReturnsOptions,
141-
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())),
142-
new Blob(serviceMockReturnsOptions,
143-
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build())));
137+
new Blob(serviceMockReturnsOptions,
138+
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())),
139+
new Blob(serviceMockReturnsOptions,
140+
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())),
141+
new Blob(serviceMockReturnsOptions,
142+
new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build())));
144143
}
145144

146145
private void initializeBucket() {

‎trunk/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,6 @@ public void testCreateBlobWithEncryptionKey() throws IOException {
561561
assertEquals(-1, byteStream.read(streamBytes));
562562
}
563563

564-
// TODO: Add tests for KMS Key name
565-
566564
@Test
567565
public void testCreateBlobFromStream() throws IOException {
568566
Capture<ByteArrayInputStream> capturedStream = Capture.newInstance();

0 commit comments

Comments
 (0)