Skip to content

Commit 96b6330

Browse files
BenWhiteheadBenWhitehead
authored
feat: add skeleton implementation of GrpcStorageImpl#getServiceAccount (#1384)
* Add conversion for com.google.storage.v2.ServiceAccount * Add property test to ensure round trip decode -> endode -> decode succeeds * Add ServiceAccountArbitraryProvider
1 parent a2e9b88 commit 96b6330

5 files changed

Lines changed: 109 additions & 5 deletions

File tree

‎google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcConversions.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ final class GrpcConversions {
3333
private final Codec<?, ?> bucketAclCodec = Codec.of(Utils::todo, Utils::todo);
3434
private final Codec<?, ?> hmacKeyMetadataCodec = Codec.of(Utils::todo, Utils::todo);
3535
private final Codec<?, ?> hmacKeyCodec = Codec.of(Utils::todo, Utils::todo);
36-
private final Codec<?, ?> serviceAccountCodec = Codec.of(Utils::todo, Utils::todo);
36+
private final Codec<ServiceAccount, com.google.storage.v2.ServiceAccount> serviceAccountCodec =
37+
Codec.of(this::serviceAccountEncode, this::serviceAccountDecode);
3738
private final Codec<?, ?> corsCodec = Codec.of(Utils::todo, Utils::todo);
3839
private final Codec<?, ?> loggingCodec = Codec.of(Utils::todo, Utils::todo);
3940
private final Codec<?, ?> iamConfigurationCodec = Codec.of(Utils::todo, Utils::todo);
@@ -68,8 +69,8 @@ private GrpcConversions() {}
6869
return todo();
6970
}
7071

71-
Codec<?, ?> serviceAccount() {
72-
return todo();
72+
Codec<ServiceAccount, com.google.storage.v2.ServiceAccount> serviceAccount() {
73+
return serviceAccountCodec;
7374
}
7475

7576
Codec<?, ?> cors() {
@@ -147,4 +148,14 @@ private BucketInfo bucketInfoDecode(Bucket from) {
147148
// TODO(frnakyn): Add DefaultObjectAcl decoder support
148149
return to.build();
149150
}
151+
152+
private com.google.storage.v2.ServiceAccount serviceAccountEncode(ServiceAccount from) {
153+
return com.google.storage.v2.ServiceAccount.newBuilder()
154+
.setEmailAddress(from.getEmail())
155+
.build();
156+
}
157+
158+
private ServiceAccount serviceAccountDecode(com.google.storage.v2.ServiceAccount from) {
159+
return ServiceAccount.of(from.getEmailAddress());
160+
}
150161
}

‎google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.google.cloud.storage.PostPolicyV4.PostFieldsV4;
3333
import com.google.cloud.storage.spi.v1.StorageRpc;
3434
import com.google.storage.v2.GetBucketRequest;
35+
import com.google.storage.v2.GetServiceAccountRequest;
3536
import com.google.storage.v2.stub.GrpcStorageStub;
3637
import java.io.IOException;
3738
import java.io.InputStream;
@@ -460,7 +461,11 @@ public List<Boolean> testIamPermissions(
460461

461462
@Override
462463
public ServiceAccount getServiceAccount(String projectId) {
463-
return todo();
464+
GetServiceAccountRequest req =
465+
GetServiceAccountRequest.newBuilder().setProject(projectId).build();
466+
com.google.storage.v2.ServiceAccount resp =
467+
grpcStorageStub.getServiceAccountCallable().call(req);
468+
return codecs.serviceAccount().decode(resp);
464469
}
465470

466471
@Override

‎google-cloud-storage/src/test/java/com/google/cloud/storage/ServiceAccountPropertyTest.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.storage;
18+
19+
import static com.google.cloud.storage.JqwikTest.report;
20+
import static com.google.common.truth.Truth.assertThat;
21+
import static net.jqwik.api.providers.TypeUsage.of;
22+
23+
import com.google.cloud.storage.Conversions.Codec;
24+
import net.jqwik.api.Example;
25+
import net.jqwik.api.ForAll;
26+
import net.jqwik.api.Property;
27+
28+
final class ServiceAccountPropertyTest {
29+
30+
@Example
31+
void edgeCases() {
32+
report(of(com.google.storage.v2.ServiceAccount.class));
33+
}
34+
35+
@Property
36+
void codecCanRoundTrip(@ForAll com.google.storage.v2.ServiceAccount sa) {
37+
Codec<ServiceAccount, com.google.storage.v2.ServiceAccount> codec =
38+
Conversions.grpc().serviceAccount();
39+
ServiceAccount decode = codec.decode(sa);
40+
41+
assertThat(decode.getEmail()).isEqualTo(sa.getEmailAddress());
42+
43+
com.google.storage.v2.ServiceAccount encode = codec.encode(decode);
44+
assertThat(encode).isEqualTo(sa);
45+
}
46+
}

‎google-cloud-storage/src/test/java/com/google/cloud/storage/jqwik/ServiceAccountArbitraryProvider.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.storage.jqwik;
18+
19+
import com.google.storage.v2.ServiceAccount;
20+
import java.util.Collections;
21+
import java.util.Set;
22+
import net.jqwik.api.Arbitrary;
23+
import net.jqwik.api.providers.ArbitraryProvider;
24+
import net.jqwik.api.providers.TypeUsage;
25+
import net.jqwik.web.api.EmailArbitrary;
26+
import net.jqwik.web.api.Web;
27+
28+
public final class ServiceAccountArbitraryProvider implements ArbitraryProvider {
29+
30+
@Override
31+
public boolean canProvideFor(TypeUsage targetType) {
32+
return targetType.isOfType(ServiceAccount.class);
33+
}
34+
35+
@Override
36+
public Set<Arbitrary<?>> provideFor(TypeUsage targetType, SubtypeProvider subtypeProvider) {
37+
EmailArbitrary emails = Web.emails();
38+
return Collections.singleton(
39+
emails.map(e -> ServiceAccount.newBuilder().setEmailAddress(e).build()));
40+
}
41+
}

‎google-cloud-storage/src/test/resources/META-INF/services/net.jqwik.api.providers.ArbitraryProvider‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
#
1616

1717
com.google.cloud.storage.jqwik.ObjectArbitraryProvider
18-
com.google.cloud.storage.jqwik.BucketArbitraryProvider
18+
com.google.cloud.storage.jqwik.BucketArbitraryProvider
19+
com.google.cloud.storage.jqwik.ServiceAccountArbitraryProvider

0 commit comments

Comments
 (0)