Skip to content

Commit c78065c

Browse files
authored
update documentation for acceptable MDS token parmeter combinations. (#1704)
1 parent 102c171 commit c78065c

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,9 @@ public class ComputeEngineCredentials extends GoogleCredentials
118118
*
119119
* <p>Behavior of setting {@link GoogleAuthTransport} / {@link BindingEnforcement}:
120120
*
121-
* <p>MTLS-bound token where binding enforcement depends on IAM policy: MTLS / {}, {} /
122-
* IAM_POLICY, MTLS / IAM_POLICY
121+
* <p>MTLS-bound token where binding enforcement depends on IAM policy: MTLS / IAM_POLICY
123122
*
124-
* <p>MTLS-bound token where bindings are always enforced: {} / ON, MTLS / ON
123+
* <p>MTLS-bound token where bindings are always enforced: MTLS / ON
125124
*
126125
* <p>DirectPath bound token: ALTS / {}
127126
*/

oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ public void buildTokenUrl_nullTransport() {
200200
.setGoogleAuthTransport(null)
201201
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.ON)
202202
.build();
203-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
203+
String tokenUrl = credentials.createTokenUrlWithScopes();
204204

205-
assertEquals(TOKEN_URL + "?binding-enforcement=on", softBoundTokenUrl);
205+
assertEquals(TOKEN_URL + "?binding-enforcement=on", tokenUrl);
206206
}
207207

208208
@Test
@@ -212,9 +212,9 @@ public void buildTokenUrl_nullBindingEnforcement() {
212212
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
213213
.setBindingEnforcement(null)
214214
.build();
215-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
215+
String tokenUrl = credentials.createTokenUrlWithScopes();
216216

217-
assertEquals(TOKEN_URL + "?transport=mtls", softBoundTokenUrl);
217+
assertEquals(TOKEN_URL + "?transport=mtls", tokenUrl);
218218
}
219219

220220
@Test
@@ -230,25 +230,25 @@ public void buildTokenUrl_nullTransport_nullBindingEnforcement() {
230230
}
231231

232232
@Test
233-
public void buildTokenUrlSoftMtlsBound_mtls_transport() {
233+
public void buildTokenUrl_mtls_transport() {
234234
ComputeEngineCredentials credentials =
235235
ComputeEngineCredentials.newBuilder()
236236
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
237237
.build();
238-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
238+
String tokenUrl = credentials.createTokenUrlWithScopes();
239239

240-
assertEquals(TOKEN_URL + "?transport=mtls", softBoundTokenUrl);
240+
assertEquals(TOKEN_URL + "?transport=mtls", tokenUrl);
241241
}
242242

243243
@Test
244-
public void buildTokenUrlSoftMtlsBound_iam_enforcement() {
244+
public void buildTokenUrl_iam_enforcement() {
245245
ComputeEngineCredentials credentials =
246246
ComputeEngineCredentials.newBuilder()
247247
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.IAM_POLICY)
248248
.build();
249-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
249+
String tokenUrl = credentials.createTokenUrlWithScopes();
250250

251-
assertEquals(TOKEN_URL + "?binding-enforcement=iam-policy", softBoundTokenUrl);
251+
assertEquals(TOKEN_URL + "?binding-enforcement=iam-policy", tokenUrl);
252252
}
253253

254254
@Test
@@ -264,14 +264,14 @@ public void buildTokenUrlSoftMtlsBound_mtls_transport_iam_enforcement() {
264264
}
265265

266266
@Test
267-
public void buildTokenUrlHardMtlsBound_always_enforced() {
267+
public void buildTokenUrl_always_enforced() {
268268
ComputeEngineCredentials credentials =
269269
ComputeEngineCredentials.newBuilder()
270270
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.ON)
271271
.build();
272-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
272+
String tokenUrl = credentials.createTokenUrlWithScopes();
273273

274-
assertEquals(TOKEN_URL + "?binding-enforcement=on", softBoundTokenUrl);
274+
assertEquals(TOKEN_URL + "?binding-enforcement=on", tokenUrl);
275275
}
276276

277277
@Test
@@ -281,9 +281,9 @@ public void buildTokenUrlHardMtlsBound_mtls_transport_always_enforced() {
281281
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
282282
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.ON)
283283
.build();
284-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
284+
String hardBoundTokenUrl = credentials.createTokenUrlWithScopes();
285285

286-
assertEquals(TOKEN_URL + "?transport=mtls&binding-enforcement=on", softBoundTokenUrl);
286+
assertEquals(TOKEN_URL + "?transport=mtls&binding-enforcement=on", hardBoundTokenUrl);
287287
}
288288

289289
@Test
@@ -292,9 +292,9 @@ public void buildTokenUrlHardDirectPathBound_alts_transport() {
292292
ComputeEngineCredentials.newBuilder()
293293
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.ALTS)
294294
.build();
295-
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
295+
String hardBoundTokenUrl = credentials.createTokenUrlWithScopes();
296296

297-
assertEquals(TOKEN_URL + "?transport=alts", softBoundTokenUrl);
297+
assertEquals(TOKEN_URL + "?transport=alts", hardBoundTokenUrl);
298298
}
299299

300300
@Test

0 commit comments

Comments
 (0)