Skip to content

Commit a7e230a

Browse files
committed
Tell Jenkins the username is also secret.
1 parent 6be375d commit a7e230a

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

src/main/java/io/jenkins/plugins/credentials/secretsmanager/factory/username_password/AwsJsonUsernamePasswordCredentials.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@ public String getUsername() {
5555
return getFieldFromSecretJson(JSON_FIELDNAME_FOR_USERNAME);
5656
}
5757

58-
@Extension
58+
@Override
59+
public boolean isUsernameSecret() {
60+
return true;
61+
}
62+
63+
@Extension
5964
@SuppressWarnings("unused")
6065
public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
6166
@Override

src/test/java/io/jenkins/plugins/credentials/secretsmanager/factory/username_password/AwsJsonUsernamePasswordCredentialsTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,25 @@ public void getUsernameGivenValidJsonThenReturnsUsername() {
5454
assertThat(actual).isEqualTo(expected);
5555
}
5656

57+
@Test
58+
public void isUsernameSecretGivenAnythingThenReturnsTrue() {
59+
// Given
60+
final String id = "testId";
61+
final String description = "some test description";
62+
final boolean expected = true;
63+
final String usernamePasswordJson = mkUsernameAndPasswordJson("myUser", "mySecretPassword");
64+
final Secret stubSecret = Secret.fromString(usernamePasswordJson);
65+
final Supplier<Secret> stubSupplier = new StubSupplier<>(stubSecret);
66+
final AwsJsonUsernamePasswordCredentials instance = new AwsJsonUsernamePasswordCredentials(id, description,
67+
stubSupplier);
68+
69+
// When
70+
final boolean actual = instance.isUsernameSecret();
71+
72+
// Then
73+
assertThat(actual).isEqualTo(expected);
74+
}
75+
5776
@Test
5877
public void getUsernameGivenInvalidJsonThenReturnsThrows() {
5978
// Given

0 commit comments

Comments
 (0)