From f7640df27ae88487dc558780fe0d7e8168f18f58 Mon Sep 17 00:00:00 2001 From: Cody Oss Date: Thu, 7 Nov 2019 11:44:14 -0700 Subject: [PATCH] fix --- .../oslogin/v1/OsLoginServiceClient.java | 48 +++++++++---------- .../oslogin/v1/OsLoginServiceClientTest.java | 42 ++++++++-------- grpc-google-cloud-os-login-v1/pom.xml | 4 ++ .../cloud/oslogin/v1/OsLoginServiceGrpc.java | 15 ++++++ pom.xml | 23 ++++++++- synth.py | 7 ++- 6 files changed, 91 insertions(+), 48 deletions(-) diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java b/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java index 77fece50..faa2c648 100644 --- a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java +++ b/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java @@ -40,7 +40,7 @@ * 
  * 
  * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
- *   PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
+ *   ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
  *   osLoginServiceClient.deletePosixAccount(name);
  * }
  * 
@@ -158,7 +158,7 @@ public OsLoginServiceStub getStub() {
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
+   *   ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
    *   osLoginServiceClient.deletePosixAccount(name);
    * }
    * 

@@ -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()
@@ -185,7 +185,7 @@ public final void deletePosixAccount(PosixAccountName name) {
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   PosixAccountName name = PosixAccountName.of("[USER]", "[PROJECT]");
+   *   ProjectName name = ProjectName.of("[USER]", "[PROJECT]");
    *   osLoginServiceClient.deletePosixAccount(name.toString());
    * }
    * 

@@ -210,7 +210,7 @@ public final void deletePosixAccount(String name) {
    *
    * 

    * 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();
@@ -233,7 +233,7 @@ public final void deletePosixAccount(DeletePosixAccountRequest request) {
    *
    * 

    * 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();
@@ -255,7 +255,7 @@ public final UnaryCallable deletePosixAccountC
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
+   *   FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
    *   osLoginServiceClient.deleteSshPublicKey(name);
    * }
    * 

@@ -265,7 +265,7 @@ public final UnaryCallable 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()
@@ -282,7 +282,7 @@ public final void deleteSshPublicKey(SshPublicKeyName name) {
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
+   *   FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
    *   osLoginServiceClient.deleteSshPublicKey(name.toString());
    * }
    * 

@@ -307,7 +307,7 @@ public final void deleteSshPublicKey(String name) {
    *
    * 

    * 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();
@@ -330,7 +330,7 @@ public final void deleteSshPublicKey(DeleteSshPublicKeyRequest request) {
    *
    * 

    * 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();
@@ -446,7 +446,7 @@ public final UnaryCallable getLoginProfile
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
+   *   FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
    *   SshPublicKey response = osLoginServiceClient.getSshPublicKey(name);
    * }
    * 

@@ -456,7 +456,7 @@ public final UnaryCallable 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();
@@ -471,7 +471,7 @@ public final SshPublicKey getSshPublicKey(SshPublicKeyName name) {
    *
    * 

    * try (OsLoginServiceClient osLoginServiceClient = OsLoginServiceClient.create()) {
-   *   SshPublicKeyName name = SshPublicKeyName.of("[USER]", "[FINGERPRINT]");
+   *   FingerprintName name = FingerprintName.of("[USER]", "[FINGERPRINT]");
    *   SshPublicKey response = osLoginServiceClient.getSshPublicKey(name.toString());
    * }
    * 

@@ -495,7 +495,7 @@ public final SshPublicKey getSshPublicKey(String name) {
    *
    * 

    * 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();
@@ -518,7 +518,7 @@ public final SshPublicKey getSshPublicKey(GetSshPublicKeyRequest request) {
    *
    * 

    * 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();
@@ -715,7 +715,7 @@ public final ImportSshPublicKeyResponse importSshPublicKey(ImportSshPublicKeyReq
    *
    * 

    * 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);
    * }
@@ -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()
@@ -746,7 +746,7 @@ public final SshPublicKey updateSshPublicKey(SshPublicKeyName name, SshPublicKey
    *
    * 

    * 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);
    * }
@@ -774,7 +774,7 @@ public final SshPublicKey updateSshPublicKey(String name, SshPublicKey sshPublic
    *
    * 

    * 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);
@@ -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()
@@ -809,7 +809,7 @@ public final SshPublicKey updateSshPublicKey(
    *
    * 

    * 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);
@@ -844,7 +844,7 @@ public final SshPublicKey updateSshPublicKey(
    *
    * 

    * 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())
@@ -870,7 +870,7 @@ public final SshPublicKey updateSshPublicKey(UpdateSshPublicKeyRequest request)
    *
    * 

    * 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())
diff --git a/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java b/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
index d8405fb9..3b4ef48b 100644
--- a/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
+++ b/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
@@ -81,7 +81,7 @@ 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);
 
@@ -89,7 +89,7 @@ public void deletePosixAccountTest() {
     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(),
@@ -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");
@@ -118,7 +118,7 @@ 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);
 
@@ -126,7 +126,7 @@ public void deleteSshPublicKeyTest() {
     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(),
@@ -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");
@@ -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)
@@ -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);
@@ -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(),
@@ -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");
@@ -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)
@@ -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);
@@ -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(
@@ -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);
@@ -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)
@@ -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();
 
@@ -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(
@@ -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();
 
diff --git a/grpc-google-cloud-os-login-v1/pom.xml b/grpc-google-cloud-os-login-v1/pom.xml
index c48ce680..435252b7 100644
--- a/grpc-google-cloud-os-login-v1/pom.xml
+++ b/grpc-google-cloud-os-login-v1/pom.xml
@@ -37,6 +37,10 @@
       com.google.guava
       guava
     
+    
+      com.google.cloud
+      google-cloud-core
+    
   
 
   
diff --git a/grpc-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceGrpc.java b/grpc-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceGrpc.java
index 9addfded..a909a645 100644
--- a/grpc-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceGrpc.java
+++ b/grpc-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.cloud.oslogin.v1;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
diff --git a/pom.xml b/pom.xml
index 15913390..efd640d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,8 @@
     1.91.1
     1.8.1
     1.17.0
-    1.49.0
-    1.24.0
+    1.50.0
+    1.24.1
     3.10.0
     4.12
     28.1-android
@@ -115,6 +115,13 @@
         pom
         import
       
+      
+        com.google.cloud
+        google-cloud-core-bom
+        1.91.3
+        pom
+        import
+      
 
       
         com.google.protobuf
@@ -146,6 +153,18 @@
         animal-sniffer-annotations
         ${animal-sniffer.version}
       
+      
+        com.google.code.gson
+        gson
+        2.8.6
+      
+
+      
+      
+        com.google.protobuf
+        protobuf-java-util
+        3.10.0
+      
 
       
         junit
diff --git a/synth.py b/synth.py
index ab7e27e5..6f048c75 100644
--- a/synth.py
+++ b/synth.py
@@ -31,7 +31,7 @@
       config_path=config_pattern.format(version=version),
       artman_output_name='')
 
-  package_name = f'com.google.cloud.{service}.{version}'
+  package_name = f'com.google.cloud.oslogin.{version}'
   java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}')
   java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name)
 
@@ -39,6 +39,11 @@
   s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src')
   s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
 
+  s.replace('**/OsLoginServiceClient.java', 'PosixAccountName', 'ProjectName')
+  s.replace('**/OsLoginServiceClient.java', 'SshPublicKeyName', 'FingerprintName')
+  s.replace('**/OsLoginServiceClientTest.java', 'PosixAccountName', 'ProjectName')
+  s.replace('**/OsLoginServiceClientTest.java', 'SshPublicKeyName', 'FingerprintName')
+
   java.format_code(f'google-cloud-{service}/src')
   java.format_code(f'grpc-google-cloud-{service}-{version}/src')
   java.format_code(f'proto-google-cloud-{service}-{version}/src')