Skip to content

Regenerate iamcredentials client #4430

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

Closed
yoshi-automation wants to merge 1 commit into from
Closed

Regenerate iamcredentials client #4430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 21 additions & 50 deletions ...amcredentials/src/main/java/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -45,7 +44,7 @@
* <pre>
* <code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* Duration lifetime = Duration.newBuilder().build();
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -194,7 +165,7 @@ public IamCredentialsStub getStub() {
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* Duration lifetime = Duration.newBuilder().build();
Expand All @@ -221,7 +192,7 @@ public IamCredentialsStub getStub() {
*/
public final GenerateAccessTokenResponse generateAccessToken(
String name, List<String> delegates, List<String> scope, Duration lifetime) {
SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateAccessToken");

GenerateAccessTokenRequest request =
GenerateAccessTokenRequest.newBuilder()
.setName(name)
Expand All @@ -240,7 +211,7 @@ public final GenerateAccessTokenResponse generateAccessToken(
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* GenerateAccessTokenRequest request = GenerateAccessTokenRequest.newBuilder()
* .setName(formattedName)
Expand All @@ -265,7 +236,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* GenerateAccessTokenRequest request = GenerateAccessTokenRequest.newBuilder()
* .setName(formattedName)
Expand All @@ -290,7 +261,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* String audience = "";
* boolean includeEmail = false;
Expand All @@ -315,7 +286,7 @@ public final GenerateAccessTokenResponse generateAccessToken(GenerateAccessToken
*/
public final GenerateIdTokenResponse generateIdToken(
String name, List<String> delegates, String audience, boolean includeEmail) {
SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateIdToken");

GenerateIdTokenRequest request =
GenerateIdTokenRequest.newBuilder()
.setName(name)
Expand All @@ -334,7 +305,7 @@ public final GenerateIdTokenResponse generateIdToken(
*
* <pre><code>
* 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)
Expand All @@ -359,7 +330,7 @@ public final GenerateIdTokenResponse generateIdToken(GenerateIdTokenRequest requ
*
* <pre><code>
* 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)
Expand All @@ -384,7 +355,7 @@ public final GenerateIdTokenResponse generateIdToken(GenerateIdTokenRequest requ
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* ByteString payload = ByteString.copyFromUtf8("");
* SignBlobResponse response = iamCredentialsClient.signBlob(formattedName, delegates, payload);
Expand All @@ -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<String> delegates, ByteString payload) {
SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "signBlob");

SignBlobRequest request =
SignBlobRequest.newBuilder()
.setName(name)
Expand All @@ -422,7 +393,7 @@ public final SignBlobResponse signBlob(String name, List<String> delegates, Byte
*
* <pre><code>
* 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)
Expand All @@ -447,7 +418,7 @@ public final SignBlobResponse signBlob(SignBlobRequest request) {
*
* <pre><code>
* 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)
Expand All @@ -471,7 +442,7 @@ public final UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable()
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* String payload = "";
* SignJwtResponse response = iamCredentialsClient.signJwt(formattedName, delegates, payload);
Expand All @@ -491,7 +462,7 @@ public final UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable()
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final SignJwtResponse signJwt(String name, List<String> delegates, String payload) {
SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "signJwt");

SignJwtRequest request =
SignJwtRequest.newBuilder()
.setName(name)
Expand All @@ -509,7 +480,7 @@ public final SignJwtResponse signJwt(String name, List<String> delegates, String
*
* <pre><code>
* 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)
Expand All @@ -534,7 +505,7 @@ public final SignJwtResponse signJwt(SignJwtRequest request) {
*
* <pre><code>
* 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)
Expand All @@ -558,7 +529,7 @@ public final UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable() {
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* String jwt = "";
* GenerateIdentityBindingAccessTokenResponse response = iamCredentialsClient.generateIdentityBindingAccessToken(formattedName, scope, jwt);
Expand Down Expand Up @@ -596,7 +567,7 @@ public final UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable() {
*/
public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingAccessToken(
String name, List<String> scope, String jwt) {
SERVICE_ACCOUNT_PATH_TEMPLATE.validate(name, "generateIdentityBindingAccessToken");

GenerateIdentityBindingAccessTokenRequest request =
GenerateIdentityBindingAccessTokenRequest.newBuilder()
.setName(name)
Expand All @@ -614,7 +585,7 @@ public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingA
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* String jwt = "";
* GenerateIdentityBindingAccessTokenRequest request = GenerateIdentityBindingAccessTokenRequest.newBuilder()
Expand Down Expand Up @@ -642,7 +613,7 @@ public final GenerateIdentityBindingAccessTokenResponse generateIdentityBindingA
*
* <pre><code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* String jwt = "";
* GenerateIdentityBindingAccessTokenRequest request = GenerateIdentityBindingAccessTokenRequest.newBuilder()
Expand Down
2 changes: 1 addition & 1 deletion ...-cloud-iamcredentials/src/main/java/com/google/cloud/iam/credentials/v1/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* <pre>
* <code>
* try (IamCredentialsClient iamCredentialsClient = IamCredentialsClient.create()) {
* String formattedName = IamCredentialsClient.formatServiceAccountName("[PROJECT]", "[SERVICE_ACCOUNT]");
* String formattedName = ServiceAccountName.format("[PROJECT]", "[SERVICE_ACCOUNT]");
* List&lt;String&gt; delegates = new ArrayList&lt;&gt;();
* List&lt;String&gt; scope = new ArrayList&lt;&gt;();
* Duration lifetime = Duration.newBuilder().build();
Expand Down
30 changes: 10 additions & 20 deletions ...edentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> delegates = new ArrayList<>();
List<String> scope = new ArrayList<>();
Duration lifetime = Duration.newBuilder().build();
Expand Down Expand Up @@ -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<String> delegates = new ArrayList<>();
List<String> scope = new ArrayList<>();
Duration lifetime = Duration.newBuilder().build();
Expand All @@ -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<String> delegates = new ArrayList<>();
String audience = "audience975628804";
boolean includeEmail = false;
Expand Down Expand Up @@ -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<String> delegates = new ArrayList<>();
String audience = "audience975628804";
boolean includeEmail = false;
Expand All @@ -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<String> delegates = new ArrayList<>();
ByteString payload = ByteString.copyFromUtf8("-114");

Expand All @@ -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<String> delegates = new ArrayList<>();
ByteString payload = ByteString.copyFromUtf8("-114");

Expand All @@ -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<String> delegates = new ArrayList<>();
String payload = "-114";

Expand All @@ -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<String> delegates = new ArrayList<>();
String payload = "-114";

Expand All @@ -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<String> scope = new ArrayList<>();
String jwt = "jwt105671";

Expand Down Expand Up @@ -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<String> scope = new ArrayList<>();
String jwt = "jwt105671";

Expand Down
10 changes: 5 additions & 5 deletions google-cloud-clients/google-cloud-iamcredentials/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
],
Expand Down