diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java b/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java index c914b58778ba..9d901bef30ae 100644 --- a/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java +++ b/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java @@ -18,7 +18,6 @@ import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; -import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStub; import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStubSettings; import com.google.protobuf.ByteString; @@ -45,7 +44,7 @@ *
  * 
  * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
- *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+ *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
  *   List<String> delegates = new ArrayList<>();
  *   List<String> scope = new ArrayList<>();
  *   Duration lifetime = Duration.newBuilder().build();
@@ -110,34 +109,6 @@ public class IamCredentialsClient implements BackgroundResource {
   private final IamCredentialsSettings settings;
   private final IamCredentialsStub stub;
 
-  private static final PathTemplate SERVICE_ACCOUNT_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/serviceAccounts/{service_account}");
-
-  /**
-   * Formats a string containing the fully-qualified path to represent a service_account resource.
-   */
-  public static final String formatServiceAccountName(String project, String serviceAccount) {
-    return SERVICE_ACCOUNT_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "service_account", serviceAccount);
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a service_account
-   * resource.
-   */
-  public static final String parseProjectFromServiceAccountName(String serviceAccountName) {
-    return SERVICE_ACCOUNT_PATH_TEMPLATE.parse(serviceAccountName).get("project");
-  }
-
-  /**
-   * Parses the service_account from the given fully-qualified path which represents a
-   * service_account resource.
-   */
-  public static final String parseServiceAccountFromServiceAccountName(String serviceAccountName) {
-    return SERVICE_ACCOUNT_PATH_TEMPLATE.parse(serviceAccountName).get("service_account");
-  }
-
   /** Constructs an instance of IamCredentialsClient with default settings. */
   public static final IamCredentialsClient create() throws IOException {
     return create(IamCredentialsSettings.newBuilder().build());
@@ -194,7 +165,7 @@ public IamCredentialsStub getStub() {
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> delegates = new ArrayList<>();
    *   List<String> scope = new ArrayList<>();
    *   Duration lifetime = Duration.newBuilder().build();
@@ -221,7 +192,7 @@ public IamCredentialsStub getStub() {
    */
   public final GenerateAccessTokenResponse generateAccessToken(
       String name, List delegates, List scope, Duration lifetime) {
-    SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateAccessToken");
+
     GenerateAccessTokenRequest request =
         GenerateAccessTokenRequest.newBuilder()
             .setName(name)
@@ -240,7 +211,7 @@ public final GenerateAccessTokenResponse generateAccessToken(
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> scope = new ArrayList<>();
    *   GenerateAccessTokenRequest request = GenerateAccessTokenRequest.newBuilder()
    *     .setName(formattedName)
@@ -265,7 +236,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> scope = new ArrayList<>();
    *   GenerateAccessTokenRequest request = GenerateAccessTokenRequest.newBuilder()
    *     .setName(formattedName)
@@ -290,7 +261,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> delegates = new ArrayList<>();
    *   String audience = "";
    *   boolean includeEmail = false;
@@ -315,7 +286,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
    */
   public final GenerateIdTokenResponse generateIdToken(
       String name, List delegates, String audience, boolean includeEmail) {
-    SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateIdToken");
+
     GenerateIdTokenRequest request =
         GenerateIdTokenRequest.newBuilder()
             .setName(name)
@@ -334,7 +305,7 @@ public final GenerateIdTokenResponse generateIdToken(
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   String audience = "";
    *   GenerateIdTokenRequest request = GenerateIdTokenRequest.newBuilder()
    *     .setName(formattedName)
@@ -359,7 +330,7 @@ public final GenerateIdTokenResponse generateIdToken(GenerateIdTokenRequest requ
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   String audience = "";
    *   GenerateIdTokenRequest request = GenerateIdTokenRequest.newBuilder()
    *     .setName(formattedName)
@@ -384,7 +355,7 @@ public final GenerateIdTokenResponse generateIdToken(GenerateIdTokenRequest requ
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> delegates = new ArrayList<>();
    *   ByteString payload = ByteString.copyFromUtf8("");
    *   SignBlobResponse response = iamCredentialsClient.signBlob(formattedName, delegates, payload);
@@ -404,7 +375,7 @@ public final GenerateIdTokenResponse generateIdToken(GenerateIdTokenRequest requ
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final SignBlobResponse signBlob(String name, List delegates, ByteString payload) {
-    SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "signBlob");
+
     SignBlobRequest request =
         SignBlobRequest.newBuilder()
             .setName(name)
@@ -422,7 +393,7 @@ public final SignBlobResponse signBlob(String name, List delegates, Byte
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   ByteString payload = ByteString.copyFromUtf8("");
    *   SignBlobRequest request = SignBlobRequest.newBuilder()
    *     .setName(formattedName)
@@ -447,7 +418,7 @@ public final SignBlobResponse signBlob(SignBlobRequest request) {
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   ByteString payload = ByteString.copyFromUtf8("");
    *   SignBlobRequest request = SignBlobRequest.newBuilder()
    *     .setName(formattedName)
@@ -471,7 +442,7 @@ public final UnaryCallable signBlobCallable()
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> delegates = new ArrayList<>();
    *   String payload = "";
    *   SignJwtResponse response = iamCredentialsClient.signJwt(formattedName, delegates, payload);
@@ -491,7 +462,7 @@ public final UnaryCallable signBlobCallable()
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final SignJwtResponse signJwt(String name, List delegates, String payload) {
-    SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "signJwt");
+
     SignJwtRequest request =
         SignJwtRequest.newBuilder()
             .setName(name)
@@ -509,7 +480,7 @@ public final SignJwtResponse signJwt(String name, List delegates, String
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   String payload = "";
    *   SignJwtRequest request = SignJwtRequest.newBuilder()
    *     .setName(formattedName)
@@ -534,7 +505,7 @@ public final SignJwtResponse signJwt(SignJwtRequest request) {
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   String payload = "";
    *   SignJwtRequest request = SignJwtRequest.newBuilder()
    *     .setName(formattedName)
@@ -558,7 +529,7 @@ public final UnaryCallable signJwtCallable() {
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> scope = new ArrayList<>();
    *   String jwt = "";
    *   GenerateIdentityBindingAccessTokenResponse response = iamCredentialsClient.generateIdentityBindingAccessToken(formattedName, scope, jwt);
@@ -596,7 +567,7 @@ public final UnaryCallable signJwtCallable() {
    */
   public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingAccessToken(
       String name, List scope, String jwt) {
-    SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateIdentityBindingAccessToken");
+
     GenerateIdentityBindingAccessTokenRequest request =
         GenerateIdentityBindingAccessTokenRequest.newBuilder()
             .setName(name)
@@ -614,7 +585,7 @@ public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingA
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> scope = new ArrayList<>();
    *   String jwt = "";
    *   GenerateIdentityBindingAccessTokenRequest request = GenerateIdentityBindingAccessTokenRequest.newBuilder()
@@ -642,7 +613,7 @@ public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingA
    *
    * 

    * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
-   *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+   *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
    *   List<String> scope = new ArrayList<>();
    *   String jwt = "";
    *   GenerateIdentityBindingAccessTokenRequest request = GenerateIdentityBindingAccessTokenRequest.newBuilder()
diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/package-info.java b/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/package-info.java
index 61f2ddfa4165..2613c14a18f0 100644
--- a/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/package-info.java
+++ b/google-cloud-clients/google-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/package-info.java
@@ -35,7 +35,7 @@
  * 
  * 
  * try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
- *   String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+ *   String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
  *   List<String> delegates = new ArrayList<>();
  *   List<String> scope = new ArrayList<>();
  *   Duration lifetime = Duration.newBuilder().build();
diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java
index c84bf6668005..f8d34a9884cb 100644
--- a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java
+++ b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java
@@ -83,8 +83,7 @@ public void generateAccessTokenTest() {
         GenerateAccessTokenResponse.newBuilder().setAccessToken(accessToken).build();
     mockIAMCredentials.addResponse(expectedResponse);
 
-    String formattedName =
-        IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+    String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
     List delegates = new ArrayList<>();
     List scope = new ArrayList<>();
     Duration lifetime = Duration.newBuilder().build();
@@ -114,8 +113,7 @@ public void generateAccessTokenExceptionTest() throws Exception {
     mockIAMCredentials.addException(exception);
 
     try {
-      String formattedName =
-          IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+      String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
       List delegates = new ArrayList<>();
       List scope = new ArrayList<>();
       Duration lifetime = Duration.newBuilder().build();
@@ -135,8 +133,7 @@ public void generateIdTokenTest() {
         GenerateIdTokenResponse.newBuilder().setToken(token).build();
     mockIAMCredentials.addResponse(expectedResponse);
 
-    String formattedName =
-        IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+    String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
     List delegates = new ArrayList<>();
     String audience = "audience975628804";
     boolean includeEmail = false;
@@ -166,8 +163,7 @@ public void generateIdTokenExceptionTest() throws Exception {
     mockIAMCredentials.addException(exception);
 
     try {
-      String formattedName =
-          IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+      String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
       List delegates = new ArrayList<>();
       String audience = "audience975628804";
       boolean includeEmail = false;
@@ -188,8 +184,7 @@ public void signBlobTest() {
         SignBlobResponse.newBuilder().setKeyId(keyId).setSignedBlob(signedBlob).build();
     mockIAMCredentials.addResponse(expectedResponse);
 
-    String formattedName =
-        IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+    String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
     List delegates = new ArrayList<>();
     ByteString payload = ByteString.copyFromUtf8("-114");
 
@@ -216,8 +211,7 @@ public void signBlobExceptionTest() throws Exception {
     mockIAMCredentials.addException(exception);
 
     try {
-      String formattedName =
-          IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+      String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
       List delegates = new ArrayList<>();
       ByteString payload = ByteString.copyFromUtf8("-114");
 
@@ -237,8 +231,7 @@ public void signJwtTest() {
         SignJwtResponse.newBuilder().setKeyId(keyId).setSignedJwt(signedJwt).build();
     mockIAMCredentials.addResponse(expectedResponse);
 
-    String formattedName =
-        IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+    String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
     List delegates = new ArrayList<>();
     String payload = "-114";
 
@@ -265,8 +258,7 @@ public void signJwtExceptionTest() throws Exception {
     mockIAMCredentials.addException(exception);
 
     try {
-      String formattedName =
-          IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+      String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
       List delegates = new ArrayList<>();
       String payload = "-114";
 
@@ -285,8 +277,7 @@ public void generateIdentityBindingAccessTokenTest() {
         GenerateIdentityBindingAccessTokenResponse.newBuilder().setAccessToken(accessToken).build();
     mockIAMCredentials.addResponse(expectedResponse);
 
-    String formattedName =
-        IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+    String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
     List scope = new ArrayList<>();
     String jwt = "jwt105671";
 
@@ -315,8 +306,7 @@ public void generateIdentityBindingAccessTokenExceptionTest() throws Exception {
     mockIAMCredentials.addException(exception);
 
     try {
-      String formattedName =
-          IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
+      String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
       List scope = new ArrayList<>();
       String jwt = "jwt105671";
 
diff --git a/google-cloud-clients/google-cloud-iamcredentials/synth.metadata b/google-cloud-clients/google-cloud-iamcredentials/synth.metadata
index 4310fc59431b..39fe4e2bc92d 100644
--- a/google-cloud-clients/google-cloud-iamcredentials/synth.metadata
+++ b/google-cloud-clients/google-cloud-iamcredentials/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-01-17T08:44:16.541917Z",
+  "updateTime": "2019-02-02T08:40:56.425507Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.16.6",
-        "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e"
+        "version": "0.16.8",
+        "dockerImage": "googleapis/artman@sha256:75bc07ef34a1de9895c18af54dc503ed3b3f3b52e85062e3360a979d2a0741e7"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05",
-        "internalRef": "229626798"
+        "sha": "bce093dab3e65c40eb9a37efbdc960f34df6037a",
+        "internalRef": "231974277"
       }
     }
   ],