googleapis
diff --git a/‎google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java‎
Lines changed: 47 additions & 0 deletions b/‎google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/StorageSnippets.java‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java‎
Lines changed: 20 additions & 0 deletions b/‎google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITStorageSnippets.java‎
Lines changed: 20 additions & 0 deletions
@@ -179,6 +179,27 @@ public Blob createEncryptedBlob(String bucketName, String blobName, String encry
     return blob;
   }
 
+  /**
+   * Example of uploading a blob encrypted by a KMS-key.
+   */
+  // [TARGET create(BlobInfo, InputStream, BlobWriteOption...)]
+  // [VARIABLE "my_unique_bucket"]
+  // [VARIABLE "my_blob_name"]
+  // [VARIABLE "kms_key_name"]
+  public Blob createKmsEncrpytedBlob(String bucketName, String blobName, String kmsKeyName) {
+    // [START storage_upload_with_kms_key]
+    InputStream content = new ByteArrayInputStream("Hello, World!".getBytes(UTF_8));
+
+    BlobId blobId = BlobId.of(bucketName, blobName);
+    BlobInfo blobInfo = BlobInfo.newBuilder(blobId)
+        .setContentType("text/plain")
+        .build();
+    Blob blob = storage.create(blobInfo, content, BlobWriteOption.kmsKeyName(kmsKeyName));
+    // [END storage_upload_with_kms_key]
+
+    return blob;
+  }
+
   /**
    * Example of getting information on a bucket, only if its metageneration matches a value,
    * otherwise a {@link StorageException} is thrown.
@@ -1133,8 +1154,34 @@ public void downloadFileUsingRequesterPays(String projectId, String bucketName,
     // Get specific file from specified bucket
     Blob blob = storage.get(BlobId.of(bucketName, srcFilename));
 
+
     // Download file to specified path
     blob.downloadTo(destFilePath, Blob.BlobSourceOption.userProject(projectId));
     // [END storage_download_file_requester_pays]
   }
+
+
+  /**
+   * Example of retrieving Requester pays status on a bucket.
+   */
+  public Bucket setDefaultKMSKey(String bucketName, String kmsKeyName) throws StorageException {
+    // [START storage_set_bucket_default_kms_key]
+    // Instantiate a Google Cloud Storage client
+    Storage storage = StorageOptions.getDefaultInstance().getService();
+
+    // The name of the KMS-key to use as a default
+    // Key names are provided in the following format:
+    // 'projects/<PROJECT>/locations/<LOCATION>/keyRings/<RING_NAME>/cryptoKeys/<KEY_NAME>'
+    // String kmsKeyname = ""
+
+    BucketInfo bucketInfo = BucketInfo.newBuilder(bucketName)
+        .setDefaultKmsKeyName(kmsKeyName)
+        .build();
+
+    Bucket bucket = storage.update(bucketInfo);
+
+    System.out.println("Default KMS Key Name: " + bucket.getDefaultKmsKeyName());
+    // [END storage_set_bucket_default_kms_key]
+    return bucket;
+  }
 }
@@ -72,6 +72,8 @@ public class ITStorageSnippets {
   private static final String USER_EMAIL = "google-cloud-java-tests@"
       + "java-docs-samples-tests.iam.gserviceaccount.com";
 
+  private static final String KMS_KEY_NAME = ""; //TODO: Supply KMS_KEY_NAME?
+
   private static Storage storage;
   private static StorageSnippets storageSnippets;
   private static List<String> bucketsToCleanUp;
@@ -178,6 +180,16 @@ public void testCreateUpdateEncryptedBlob() throws InterruptedException {
     assertEquals("text/plain", blob.getContentType());
   }
 
+  @Test
+  public void testCreateKMSEncryptedBlob() {
+    String kmsKeyName = "";
+    String blobName = "kms-encrypted-blob";
+
+    Blob blob = storageSnippets.createKmsEncrpytedBlob(BUCKET, blobName, kmsKeyName);
+
+    assertNotNull(blob);
+  }
+
   @Test
   public void testCreateCopyAndGetBlob() {
     String blobName = "test-create-copy-get-blob";
@@ -429,4 +441,12 @@ public void testRequesterPays() throws Exception {
     bucket = storageSnippets.disableRequesterPays(BUCKET);
     assertFalse(bucket.requesterPays());
   }
+
+  @Test
+  public void testDefaultKMSKey(){
+    Bucket bucket = storageSnippets.setDefaultKMSKey(BUCKET, KMS_KEY_NAME);
+    assertTrue(KMS_KEY_NAME.equals(bucket.getDefaultKmsKeyName()));
+    // Remove default key
+    storageSnippets.setDefaultKMSKey(BUCKET,"");
+  }
 }