Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@codyoss
codyoss committed Nov 7, 2019
1 parent 4724ea1 commit f7640df
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 48 deletions.
48 changes: 24 additions & 24 deletions google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java
View file
Expand Up @@ -40,7 +40,7 @@
* <pre>
* <code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
* ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
* osLoginServiceClient.deletePosixAccount(name);
* }
* </code>
Expand Down Expand Up @@ -158,7 +158,7 @@ public OsLoginServiceStub getStub() {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
* ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
* osLoginServiceClient.deletePosixAccount(name);
* }
* </code></pre>
Expand All @@ -168,7 +168,7 @@ public OsLoginServiceStub getStub() {
* `users/{user}/projects/{project}`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final void deletePosixAccount(PosixAccountName name) {
public final void deletePosixAccount(ProjectName name) {

DeletePosixAccountRequest request =
DeletePosixAccountRequest.newBuilder()
Expand All @@ -185,7 +185,7 @@ public final void deletePosixAccount(PosixAccountName name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
* ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
* osLoginServiceClient.deletePosixAccount(name.toString());
* }
* </code></pre>
Expand All @@ -210,7 +210,7 @@ public final void deletePosixAccount(String name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
* ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
* DeletePosixAccountRequest request = DeletePosixAccountRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -233,7 +233,7 @@ public final void deletePosixAccount(DeletePosixAccountRequest request) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
* ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
* DeletePosixAccountRequest request = DeletePosixAccountRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -255,7 +255,7 @@ public final UnaryCallable<DeletePosixAccountRequest, Empty> deletePosixAccountC
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* osLoginServiceClient.deleteSshPublicKey(name);
* }
* </code></pre>
Expand All @@ -265,7 +265,7 @@ public final UnaryCallable<DeletePosixAccountRequest, Empty> deletePosixAccountC
* `users/{user}/sshPublicKeys/{fingerprint}`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final void deleteSshPublicKey(SshPublicKeyName name) {
public final void deleteSshPublicKey(FingerprintName name) {

DeleteSshPublicKeyRequest request =
DeleteSshPublicKeyRequest.newBuilder()
Expand All @@ -282,7 +282,7 @@ public final void deleteSshPublicKey(SshPublicKeyName name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* osLoginServiceClient.deleteSshPublicKey(name.toString());
* }
* </code></pre>
Expand All @@ -307,7 +307,7 @@ public final void deleteSshPublicKey(String name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* DeleteSshPublicKeyRequest request = DeleteSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -330,7 +330,7 @@ public final void deleteSshPublicKey(DeleteSshPublicKeyRequest request) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* DeleteSshPublicKeyRequest request = DeleteSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down Expand Up @@ -446,7 +446,7 @@ public final UnaryCallable<GetLoginProfileRequest, LoginProfile> getLoginProfile
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey response = osLoginServiceClient.getSshPublicKey(name);
* }
* </code></pre>
Expand All @@ -456,7 +456,7 @@ public final UnaryCallable<GetLoginProfileRequest, LoginProfile> getLoginProfile
* `users/{user}/sshPublicKeys/{fingerprint}`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final SshPublicKey getSshPublicKey(SshPublicKeyName name) {
public final SshPublicKey getSshPublicKey(FingerprintName name) {

GetSshPublicKeyRequest request =
GetSshPublicKeyRequest.newBuilder().setName(name == null ? null : name.toString()).build();
Expand All @@ -471,7 +471,7 @@ public final SshPublicKey getSshPublicKey(SshPublicKeyName name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey response = osLoginServiceClient.getSshPublicKey(name.toString());
* }
* </code></pre>
Expand All @@ -495,7 +495,7 @@ public final SshPublicKey getSshPublicKey(String name) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* GetSshPublicKeyRequest request = GetSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -518,7 +518,7 @@ public final SshPublicKey getSshPublicKey(GetSshPublicKeyRequest request) {
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* GetSshPublicKeyRequest request = GetSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down Expand Up @@ -715,7 +715,7 @@ public final ImportSshPublicKeyResponse importSshPublicKey(ImportSshPublicKeyReq
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* SshPublicKey response = osLoginServiceClient.updateSshPublicKey(name, sshPublicKey);
* }
Expand All @@ -727,7 +727,7 @@ public final ImportSshPublicKeyResponse importSshPublicKey(ImportSshPublicKeyReq
* @param sshPublicKey Required. The SSH public key and expiration time.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final SshPublicKey updateSshPublicKey(SshPublicKeyName name, SshPublicKey sshPublicKey) {
public final SshPublicKey updateSshPublicKey(FingerprintName name, SshPublicKey sshPublicKey) {

UpdateSshPublicKeyRequest request =
UpdateSshPublicKeyRequest.newBuilder()
Expand All @@ -746,7 +746,7 @@ public final SshPublicKey updateSshPublicKey(SshPublicKeyName name, SshPublicKey
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* SshPublicKey response = osLoginServiceClient.updateSshPublicKey(name.toString(), sshPublicKey);
* }
Expand Down Expand Up @@ -774,7 +774,7 @@ public final SshPublicKey updateSshPublicKey(String name, SshPublicKey sshPublic
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* FieldMask updateMask = FieldMask.newBuilder().build();
* SshPublicKey response = osLoginServiceClient.updateSshPublicKey(name, sshPublicKey, updateMask);
Expand All @@ -789,7 +789,7 @@ public final SshPublicKey updateSshPublicKey(String name, SshPublicKey sshPublic
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final SshPublicKey updateSshPublicKey(
SshPublicKeyName name, SshPublicKey sshPublicKey, FieldMask updateMask) {
FingerprintName name, SshPublicKey sshPublicKey, FieldMask updateMask) {

UpdateSshPublicKeyRequest request =
UpdateSshPublicKeyRequest.newBuilder()
Expand All @@ -809,7 +809,7 @@ public final SshPublicKey updateSshPublicKey(
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* FieldMask updateMask = FieldMask.newBuilder().build();
* SshPublicKey response = osLoginServiceClient.updateSshPublicKey(name.toString(), sshPublicKey, updateMask);
Expand Down Expand Up @@ -844,7 +844,7 @@ public final SshPublicKey updateSshPublicKey(
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* UpdateSshPublicKeyRequest request = UpdateSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
Expand All @@ -870,7 +870,7 @@ public final SshPublicKey updateSshPublicKey(UpdateSshPublicKeyRequest request)
*
* <pre><code>
* try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
* SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
* FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
* SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
* UpdateSshPublicKeyRequest request = UpdateSshPublicKeyRequest.newBuilder()
* .setName(name.toString())
Expand Down
42 changes: 21 additions & 21 deletions ...le-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
View file
Expand Up @@ -81,15 +81,15 @@ public void deletePosixAccountTest() {
Empty expectedResponse = Empty.newBuilder().build();
mockOsLoginService.addResponse(expectedResponse);

PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
ProjectName name = ProjectName.of("[USER]", "[PROJECT]");

client.deletePosixAccount(name);

List<AbstractMessage> actualRequests = mockOsLoginService.getRequests();
Assert.assertEquals(1, actualRequests.size());
DeletePosixAccountRequest actualRequest = (DeletePosixAccountRequest) actualRequests.get(0);

Assert.assertEquals(name, PosixAccountName.parse(actualRequest.getName()));
Assert.assertEquals(name, ProjectName.parse(actualRequest.getName()));
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -103,7 +103,7 @@ public void deletePosixAccountExceptionTest() throws Exception {
mockOsLoginService.addException(exception);

try {
PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
ProjectName name = ProjectName.of("[USER]", "[PROJECT]");

client.deletePosixAccount(name);
Assert.fail("No exception raised");
Expand All @@ -118,15 +118,15 @@ public void deleteSshPublicKeyTest() {
Empty expectedResponse = Empty.newBuilder().build();
mockOsLoginService.addResponse(expectedResponse);

SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");

client.deleteSshPublicKey(name);

List<AbstractMessage> actualRequests = mockOsLoginService.getRequests();
Assert.assertEquals(1, actualRequests.size());
DeleteSshPublicKeyRequest actualRequest = (DeleteSshPublicKeyRequest) actualRequests.get(0);

Assert.assertEquals(name, SshPublicKeyName.parse(actualRequest.getName()));
Assert.assertEquals(name, FingerprintName.parse(actualRequest.getName()));
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -140,7 +140,7 @@ public void deleteSshPublicKeyExceptionTest() throws Exception {
mockOsLoginService.addException(exception);

try {
SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");

client.deleteSshPublicKey(name);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -194,8 +194,8 @@ public void getSshPublicKeyTest() {
String key = "key106079";
long expirationTimeUsec = 2058878882L;
String fingerprint = "fingerprint-1375934236";
com.google.cloud.oslogin.common.SshPublicKeyName name2 =
com.google.cloud.oslogin.common.SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
com.google.cloud.oslogin.common.FingerprintName name2 =
com.google.cloud.oslogin.common.FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey expectedResponse =
SshPublicKey.newBuilder()
.setKey(key)
Expand All @@ -205,7 +205,7 @@ public void getSshPublicKeyTest() {
.build();
mockOsLoginService.addResponse(expectedResponse);

SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");

SshPublicKey actualResponse = client.getSshPublicKey(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -214,7 +214,7 @@ public void getSshPublicKeyTest() {
Assert.assertEquals(1, actualRequests.size());
GetSshPublicKeyRequest actualRequest = (GetSshPublicKeyRequest) actualRequests.get(0);

Assert.assertEquals(name, SshPublicKeyName.parse(actualRequest.getName()));
Assert.assertEquals(name, FingerprintName.parse(actualRequest.getName()));
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -228,7 +228,7 @@ public void getSshPublicKeyExceptionTest() throws Exception {
mockOsLoginService.addException(exception);

try {
SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");

client.getSshPublicKey(name);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -329,8 +329,8 @@ public void updateSshPublicKeyTest() {
String key = "key106079";
long expirationTimeUsec = 2058878882L;
String fingerprint = "fingerprint-1375934236";
com.google.cloud.oslogin.common.SshPublicKeyName name2 =
com.google.cloud.oslogin.common.SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
com.google.cloud.oslogin.common.FingerprintName name2 =
com.google.cloud.oslogin.common.FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey expectedResponse =
SshPublicKey.newBuilder()
.setKey(key)
Expand All @@ -340,7 +340,7 @@ public void updateSshPublicKeyTest() {
.build();
mockOsLoginService.addResponse(expectedResponse);

SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();

SshPublicKey actualResponse = client.updateSshPublicKey(name, sshPublicKey);
Expand All @@ -350,7 +350,7 @@ public void updateSshPublicKeyTest() {
Assert.assertEquals(1, actualRequests.size());
UpdateSshPublicKeyRequest actualRequest = (UpdateSshPublicKeyRequest) actualRequests.get(0);

Assert.assertEquals(name, SshPublicKeyName.parse(actualRequest.getName()));
Assert.assertEquals(name, FingerprintName.parse(actualRequest.getName()));
Assert.assertEquals(sshPublicKey, actualRequest.getSshPublicKey());
Assert.assertTrue(
channelProvider.isHeaderSent(
Expand All @@ -365,7 +365,7 @@ public void updateSshPublicKeyExceptionTest() throws Exception {
mockOsLoginService.addException(exception);

try {
SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();

client.updateSshPublicKey(name, sshPublicKey);
Expand All @@ -381,8 +381,8 @@ public void updateSshPublicKeyTest2() {
String key = "key106079";
long expirationTimeUsec = 2058878882L;
String fingerprint = "fingerprint-1375934236";
com.google.cloud.oslogin.common.SshPublicKeyName name2 =
com.google.cloud.oslogin.common.SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
com.google.cloud.oslogin.common.FingerprintName name2 =
com.google.cloud.oslogin.common.FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey expectedResponse =
SshPublicKey.newBuilder()
.setKey(key)
Expand All @@ -392,7 +392,7 @@ public void updateSshPublicKeyTest2() {
.build();
mockOsLoginService.addResponse(expectedResponse);

SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
FieldMask updateMask = FieldMask.newBuilder().build();

Expand All @@ -403,7 +403,7 @@ public void updateSshPublicKeyTest2() {
Assert.assertEquals(1, actualRequests.size());
UpdateSshPublicKeyRequest actualRequest = (UpdateSshPublicKeyRequest) actualRequests.get(0);

Assert.assertEquals(name, SshPublicKeyName.parse(actualRequest.getName()));
Assert.assertEquals(name, FingerprintName.parse(actualRequest.getName()));
Assert.assertEquals(sshPublicKey, actualRequest.getSshPublicKey());
Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
Assert.assertTrue(
Expand All @@ -419,7 +419,7 @@ public void updateSshPublicKeyExceptionTest2() throws Exception {
mockOsLoginService.addException(exception);

try {
SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
SshPublicKey sshPublicKey = SshPublicKey.newBuilder().build();
FieldMask updateMask = FieldMask.newBuilder().build();

Expand Down
4 changes: 4 additions & 0 deletions grpc-google-cloud-os-login-v1/pom.xml
View file
Expand Up @@ -37,6 +37,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
</dependency>
</dependencies>

<profiles>
Expand Down

0 comments on commit f7640df

Please sign in to comment.