Skip to content

Requester pays: expose userProject #2554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreamlin merged 7 commits into from
Oct 31, 2017
Merged

Requester pays: expose userProject #2554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
756c8a8
adding userProject param to BucketListOption
andreamlin Oct 24, 2017
8b42e03
Merge branch 'master' of github.com:GoogleCloudPlatform/google-cloud-…
andreamlin Oct 25, 2017
a10ba2b
update google-api-services-storage dependency to latest version to ex…
andreamlin Oct 25, 2017
d0179f9
draft test and list buckets with userProject
andreamlin Oct 25, 2017
2b5ba46
added a list bucket with user project test
andreamlin Oct 26, 2017
992f69e
use latest version of oauth-client and http-client dependencies
andreamlin Oct 26, 2017
a84ea08
fix bad bug
andreamlin Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-cloud-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storage</artifactId>
<version>v1-rev108-1.22.0</version>
<version>v1-rev114-1.23.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down
9 changes: 9 additions & 0 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,15 @@ public static BucketListOption prefix(String prefix) {
return new BucketListOption(StorageRpc.Option.PREFIX, prefix);
}

/**
* Returns an option for bucket's billing user project. This option is only used by the buckets with
* 'requester_pays' flag.
*/
@GcpLaunchStage.Alpha
public static BucketListOption userProject(String userProject) {
return new BucketListOption(StorageRpc.Option.USER_PROJECT, userProject);
}

/**
* Returns an option to specify the bucket's fields to be returned by the RPC call. If this
* option is not provided all bucket's fields are returned. {@code BucketListOption.fields}) can
Expand Down
1 change: 1 addition & 0 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ public Tuple<String, Iterable<Bucket>> list(Map<Option, ?> options) {
.setMaxResults(Option.MAX_RESULTS.getLong(options))
.setPageToken(Option.PAGE_TOKEN.getString(options))
.setFields(Option.FIELDS.getString(options))
.setUserProject(Option.USER_PROJECT.getString(options))
.execute();
return Tuple.<String, Iterable<Bucket>>of(buckets.getNextPageToken(), buckets.getItems());
} catch (IOException ex) {
Expand Down
18 changes: 18 additions & 0 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,4 +1519,22 @@ public void testUpdateBucketRequesterPays() {
assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
assertTrue(remoteBlob.delete());
}

@Test
public void testListBucketRequesterPaysFails() throws InterruptedException {
String projectId = remoteStorageHelper.getOptions().getProjectId();
Iterator<Bucket> bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
Storage.BucketListOption.fields(), Storage.BucketListOption.userProject(projectId)).iterateAll().iterator();
while (!bucketIterator.hasNext()) {
Thread.sleep(500);
bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
Storage.BucketListOption.fields()).iterateAll().iterator();
}
while (bucketIterator.hasNext()) {
Bucket remoteBucket = bucketIterator.next();
assertTrue(remoteBucket.getName().startsWith(BUCKET));
assertNull(remoteBucket.getCreateTime());
assertNull(remoteBucket.getSelfLink());
}
}
}
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud</site.installationModule>

<api-client.version>1.22.0</api-client.version>
<api-client.version>1.23.0</api-client.version>

<api-common.version>1.1.0</api-common.version>
<gax.version>1.9.1</gax.version>
Expand All @@ -147,7 +147,7 @@
<grpc.version>1.7.0</grpc.version>
<nettyssl.version>2.0.6.Final</nettyssl.version>
<guava.version>20.0</guava.version>
<http-client.version>1.22.0</http-client.version>
<http-client.version>1.23.0</http-client.version>
<protobuf.version>3.4.0</protobuf.version>

<easymock.version>3.4</easymock.version>
Expand Down Expand Up @@ -772,7 +772,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.22.0</version>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand Down