Skip to content

Commit

Permalink
Update samples per client changes
Browse files Browse the repository at this point in the history
  • Loading branch information
frankyn committed Jan 25, 2019
1 parent 49598ec commit 01ee6b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1538,9 +1538,8 @@ public Bucket enableBucketPolicyOnly(String bucketName) throws StorageException
// The name of a bucket, e.g. "my-bucket"
// String bucketName = "my-bucket";

BucketInfo.BucketPolicyOnly bucketPolicyOnly = BucketInfo.BucketPolicyOnly.newBuilder().setEnabled(true).build();
BucketInfo.IamConfiguration iamConfiguration = BucketInfo.IamConfiguration.newBuilder().setBucketPolicyOnly(
bucketPolicyOnly).build();
BucketInfo.IamConfiguration iamConfiguration = BucketInfo.IamConfiguration.newBuilder().setIsBucketPolicyOnlyEnabled(
true).build();
Bucket bucket =
storage.update(BucketInfo.newBuilder(bucketName).setIamConfiguration(iamConfiguration).build());

Expand All @@ -1560,9 +1559,8 @@ public Bucket disableBucketPolicyOnly(String bucketName) throws StorageException
// The name of a bucket, e.g. "my-bucket"
// String bucketName = "my-bucket";

BucketInfo.BucketPolicyOnly bucketPolicyOnly = BucketInfo.BucketPolicyOnly.newBuilder().setEnabled(false).build();
BucketInfo.IamConfiguration iamConfiguration = BucketInfo.IamConfiguration.newBuilder().setBucketPolicyOnly(
bucketPolicyOnly).build();
BucketInfo.IamConfiguration iamConfiguration = BucketInfo.IamConfiguration.newBuilder().setIsBucketPolicyOnlyEnabled(
false).build();
Bucket bucket =
storage.update(BucketInfo.newBuilder(bucketName).setIamConfiguration(iamConfiguration).build());

Expand All @@ -1585,8 +1583,8 @@ public Bucket getBucketPolicyOnly(String bucketName) throws StorageException {
Bucket bucket = storage.get(bucketName, BucketGetOption.fields(BucketField.IAMCONFIGURATION));
BucketInfo.IamConfiguration iamConfiguration = bucket.getIamConfiguration();

Boolean enabled = iamConfiguration.getBucketPolicyOnly().getEnabled();
Date lockedTime = new Date(iamConfiguration.getBucketPolicyOnly().getLockedTime().getValue());
Boolean enabled = iamConfiguration.isBucketPolicyOnlyEnabled();
Date lockedTime = new Date(iamConfiguration.getBucketPolicyOnlyLockedTime());

if (enabled != null && enabled) {
System.out.println("Bucket Policy Only is enabled for " + bucketName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,12 @@ public void testBucketPolicyOnly() {
Bucket bucket = storageSnippets.createBucket(tempBucket);
assertNotNull(bucket);
bucket = storageSnippets.enableBucketPolicyOnly(tempBucket);
assertTrue(bucket.getIamConfiguration().getBucketPolicyOnly().getEnabled());
assertNotNull(bucket.getIamConfiguration().getBucketPolicyOnly().getLockedTime());
assertTrue(bucket.getIamConfiguration().isBucketPolicyOnlyEnabled());
assertNotNull(bucket.getIamConfiguration().getBucketPolicyOnlyLockedTime());
bucket = storageSnippets.getBucketPolicyOnly(tempBucket);
assertTrue(bucket.getIamConfiguration().getBucketPolicyOnly().getEnabled());
assertNotNull(bucket.getIamConfiguration().getBucketPolicyOnly().getLockedTime());
assertTrue(bucket.getIamConfiguration().isBucketPolicyOnlyEnabled());
assertNotNull(bucket.getIamConfiguration().getBucketPolicyOnlyLockedTime());
bucket = storageSnippets.disableBucketPolicyOnly(tempBucket);
assertFalse(bucket.getIamConfiguration().getBucketPolicyOnly().getEnabled());
assertFalse(bucket.getIamConfiguration().isBucketPolicyOnlyEnabled());
}
}

0 comments on commit 01ee6b7

Please sign in to comment.