From 215eb24d0b659df4ea04fb48bbac018bc0d5b9f8 Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Thu, 25 May 2017 15:03:42 -0400 Subject: [PATCH 1/6] Update AwsCodeCommitCredentialProvider.java --- .../config/server/support/AwsCodeCommitCredentialProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java index 7425067e..08236135 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java @@ -326,7 +326,7 @@ public class AwsCodeCommitCredentialProvider extends CredentialsProvider { } try { - URI u = new URI(uri.toLowerCase()); + URI u = new URI(URLEncoder.encode(uri.toLowerCase(),"UTF-8")); if (u.getScheme().equals("https")) { String host = u.getHost(); if (host.endsWith(".amazonaws.com") && host.startsWith("git-codecommit.")) { From cf38dedd1479e24f49c3f5b4b2eac500797eda3a Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Fri, 26 May 2017 16:43:27 -0400 Subject: [PATCH 2/6] Update AwsCodeCommitCredentialProvider.java --- .../server/support/AwsCodeCommitCredentialProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java index 08236135..b1cf3dd7 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java @@ -19,6 +19,7 @@ package org.springframework.cloud.config.server.support; import static org.springframework.util.StringUtils.hasText; import java.net.URI; +import java.net.URL; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; @@ -326,7 +327,8 @@ public class AwsCodeCommitCredentialProvider extends CredentialsProvider { } try { - URI u = new URI(URLEncoder.encode(uri.toLowerCase(),"UTF-8")); + URL url = new URL(uri); + URI u = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef()); if (u.getScheme().equals("https")) { String host = u.getHost(); if (host.endsWith(".amazonaws.com") && host.startsWith("git-codecommit.")) { From 389da6b20ffe66e3688d5aee4915c13dc48b52cb Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Fri, 26 May 2017 16:51:14 -0400 Subject: [PATCH 3/6] Update AwsCodeCommitCredentialsProviderTests.java --- ...AwsCodeCommitCredentialsProviderTests.java | 214 +++++++++--------- 1 file changed, 112 insertions(+), 102 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java index 634d1bfd..d62ecd06 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java @@ -44,111 +44,121 @@ import static org.junit.Assert.fail; * */ public class AwsCodeCommitCredentialsProviderTests { - private static final String PASSWORD = "secret"; - private static final String USER = "test"; - private static final String AWS_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/test"; - private static final String BAD_REPO = "https://amazonaws.com/v1/repos/test"; + private static final String PASSWORD = "secret"; + private static final String USER = "test"; + private static final String AWS_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/test"; + private static final String BAD_REPO = "https://amazonaws.com/v1/repos/test"; + private static final String CURLY_BRACES_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/{application}"; - private AwsCodeCommitCredentialProvider provider; - - @Before - public void init() { - GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); - provider = (AwsCodeCommitCredentialProvider) - factory.createFor(AWS_REPO, USER, PASSWORD, null); - } - - @Test - public void basics() { - assertNotNull(provider); - assertEquals(USER, provider.getUsername()); - assertEquals(PASSWORD, provider.getPassword()); - assertFalse(provider.isInteractive()); - } + private AwsCodeCommitCredentialProvider provider; + + @Before + public void init() { + GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); + provider = (AwsCodeCommitCredentialProvider) + factory.createFor(AWS_REPO, USER, PASSWORD, null); + } + + @Test + public void basics() { + assertNotNull(provider); + assertEquals(USER, provider.getUsername()); + assertEquals(PASSWORD, provider.getPassword()); + assertFalse(provider.isInteractive()); + } - @Test - public void testSupportsUsernamePassword() { - assertTrue(provider.supports(new CredentialItem[] { - new CredentialItem.Username(), - new CredentialItem.Password() - })); - } + @Test + public void testSupportsUsernamePassword() { + assertTrue(provider.supports(new CredentialItem[] { + new CredentialItem.Username(), + new CredentialItem.Password() + })); + } - @Test - public void testNotSupportsOther() { - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.YesNoType("OK To Login?") // this is not ok - })); - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.StringType("OK To Login?", true) // this is not ok - })); - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.Username(), // this is ok - new CredentialItem.Password(), // this is ok - new CredentialItem.StringType("OK To Login?", true) // this is not ok - })); - } - - @Test - public void testAwsCredentialsProviderIsNullInitially() { - AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); - assertNull(awsProvider); - } + @Test + public void testNotSupportsOther() { + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.YesNoType("OK To Login?") // this is not ok + })); + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.StringType("OK To Login?", true) // this is not ok + })); + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.Username(), // this is ok + new CredentialItem.Password(), // this is ok + new CredentialItem.StringType("OK To Login?", true) // this is not ok + })); + } + + @Test + public void testAwsCredentialsProviderIsNullInitially() { + AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); + assertNull(awsProvider); + } - @Test - public void testAwsCredentialsProviderIsDefinedAfterGet() throws URISyntaxException { - AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); - assertNull(awsProvider); - assertTrue(provider.get(new URIish(AWS_REPO), makeCredentialItems())); - awsProvider = provider.getAwsCredentialProvider(); - assertNotNull(awsProvider); - assertTrue(awsProvider instanceof AwsCodeCommitCredentialProvider.AWSStaticCredentialsProvider); - } - - @Test - public void testBadUriReturnsFalse() throws UnsupportedCredentialItem, URISyntaxException { - CredentialItem[] credentialItems = makeCredentialItems(); - assertFalse(provider.get(new URIish(BAD_REPO), credentialItems)); - } - - @Test - public void testThrowsUnsupportedCredentialException() throws URISyntaxException { - CredentialItem[] goodCredentialItems = makeCredentialItems(); - CredentialItem[] badCredentialItems = new CredentialItem[] { - goodCredentialItems[0], - goodCredentialItems[1], - new CredentialItem.YesNoType("OK?") - }; - try { - provider.get(new URIish(AWS_REPO), badCredentialItems); - fail("Expected UnsupportedCredentialItem exception"); - } catch (UnsupportedCredentialItem e) { - assertNotNull(e.getMessage()); - } - } - - @Test - public void testReturnsCredentials() throws URISyntaxException { - CredentialItem[] credentialItems = makeCredentialItems(); - assertTrue(provider.get(new URIish(AWS_REPO), credentialItems)); - - String theUsername = ((CredentialItem.Username) credentialItems[0]).getValue(); - char[] thePassword = ((CredentialItem.Password) credentialItems[1]).getValue(); - - assertEquals(USER, theUsername); - assertNotNull(thePassword); - - // The password will always begin with a timestamp like - // 20161113T121314Z - assertTrue(thePassword.length > 16); - assertEquals('T', thePassword[8]); - assertEquals('Z', thePassword[15]); - } + @Test + public void testAwsCredentialsProviderIsDefinedAfterGet() throws URISyntaxException { + AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); + assertNull(awsProvider); + assertTrue(provider.get(new URIish(AWS_REPO), makeCredentialItems())); + awsProvider = provider.getAwsCredentialProvider(); + assertNotNull(awsProvider); + assertTrue(awsProvider instanceof AwsCodeCommitCredentialProvider.AWSStaticCredentialsProvider); + } + + @Test + public void testBadUriReturnsFalse() throws UnsupportedCredentialItem, URISyntaxException { + CredentialItem[] credentialItems = makeCredentialItems(); + assertFalse(provider.get(new URIish(BAD_REPO), credentialItems)); + } + + @Test + public void testUriWithCurlyBracesReturnsTrue() throws UnsupportedCredentialItem, URISyntaxException { + GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); + provider = (AwsCodeCommitCredentialProvider) + factory.createFor(CURLY_BRACES_REPO, USER, PASSWORD, null); + CredentialItem[] credentialItems = makeCredentialItems(); + assertTrue(provider.get(new URIish(CURLY_BRACES_REPO), credentialItems)); + } + + @Test + public void testThrowsUnsupportedCredentialException() throws URISyntaxException { + CredentialItem[] goodCredentialItems = makeCredentialItems(); + CredentialItem[] badCredentialItems = new CredentialItem[] { + goodCredentialItems[0], + goodCredentialItems[1], + new CredentialItem.YesNoType("OK?") + }; + try { + provider.get(new URIish(AWS_REPO), badCredentialItems); + fail("Expected UnsupportedCredentialItem exception"); + } catch (UnsupportedCredentialItem e) { + assertNotNull(e.getMessage()); + } + } + + @Test + public void testReturnsCredentials() throws URISyntaxException { + CredentialItem[] credentialItems = makeCredentialItems(); + assertTrue(provider.get(new URIish(AWS_REPO), credentialItems)); + + String theUsername = ((CredentialItem.Username) credentialItems[0]).getValue(); + char[] thePassword = ((CredentialItem.Password) credentialItems[1]).getValue(); + + assertEquals(USER, theUsername); + assertNotNull(thePassword); + + // The password will always begin with a timestamp like + // 20161113T121314Z + assertTrue(thePassword.length > 16); + assertEquals('T', thePassword[8]); + assertEquals('Z', thePassword[15]); + } - private CredentialItem[] makeCredentialItems() { - CredentialItem[] credentialItems = new CredentialItem[2]; - credentialItems[0] = new CredentialItem.Username(); - credentialItems[1] = new CredentialItem.Password(); - return credentialItems; - } + private CredentialItem[] makeCredentialItems() { + CredentialItem[] credentialItems = new CredentialItem[2]; + credentialItems[0] = new CredentialItem.Username(); + credentialItems[1] = new CredentialItem.Password(); + return credentialItems; + } } From 2611b0a229a69e4ce94da022a8240de4d83cd482 Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Fri, 26 May 2017 16:53:58 -0400 Subject: [PATCH 4/6] Update AwsCodeCommitCredentialsProviderTests.java --- ...AwsCodeCommitCredentialsProviderTests.java | 204 +++++++++--------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java index d62ecd06..220ed439 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java @@ -44,74 +44,74 @@ import static org.junit.Assert.fail; * */ public class AwsCodeCommitCredentialsProviderTests { - private static final String PASSWORD = "secret"; - private static final String USER = "test"; - private static final String AWS_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/test"; - private static final String BAD_REPO = "https://amazonaws.com/v1/repos/test"; + private static final String PASSWORD = "secret"; + private static final String USER = "test"; + private static final String AWS_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/test"; + private static final String BAD_REPO = "https://amazonaws.com/v1/repos/test"; private static final String CURLY_BRACES_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/{application}"; - private AwsCodeCommitCredentialProvider provider; - - @Before - public void init() { - GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); - provider = (AwsCodeCommitCredentialProvider) - factory.createFor(AWS_REPO, USER, PASSWORD, null); - } - - @Test - public void basics() { - assertNotNull(provider); - assertEquals(USER, provider.getUsername()); - assertEquals(PASSWORD, provider.getPassword()); - assertFalse(provider.isInteractive()); - } + private AwsCodeCommitCredentialProvider provider; + + @Before + public void init() { + GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); + provider = (AwsCodeCommitCredentialProvider) + factory.createFor(AWS_REPO, USER, PASSWORD, null); + } + + @Test + public void basics() { + assertNotNull(provider); + assertEquals(USER, provider.getUsername()); + assertEquals(PASSWORD, provider.getPassword()); + assertFalse(provider.isInteractive()); + } - @Test - public void testSupportsUsernamePassword() { - assertTrue(provider.supports(new CredentialItem[] { - new CredentialItem.Username(), - new CredentialItem.Password() - })); - } + @Test + public void testSupportsUsernamePassword() { + assertTrue(provider.supports(new CredentialItem[] { + new CredentialItem.Username(), + new CredentialItem.Password() + })); + } - @Test - public void testNotSupportsOther() { - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.YesNoType("OK To Login?") // this is not ok - })); - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.StringType("OK To Login?", true) // this is not ok - })); - assertFalse(provider.supports(new CredentialItem[] { - new CredentialItem.Username(), // this is ok - new CredentialItem.Password(), // this is ok - new CredentialItem.StringType("OK To Login?", true) // this is not ok - })); - } - - @Test - public void testAwsCredentialsProviderIsNullInitially() { - AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); - assertNull(awsProvider); - } + @Test + public void testNotSupportsOther() { + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.YesNoType("OK To Login?") // this is not ok + })); + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.StringType("OK To Login?", true) // this is not ok + })); + assertFalse(provider.supports(new CredentialItem[] { + new CredentialItem.Username(), // this is ok + new CredentialItem.Password(), // this is ok + new CredentialItem.StringType("OK To Login?", true) // this is not ok + })); + } + + @Test + public void testAwsCredentialsProviderIsNullInitially() { + AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); + assertNull(awsProvider); + } - @Test - public void testAwsCredentialsProviderIsDefinedAfterGet() throws URISyntaxException { - AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); - assertNull(awsProvider); - assertTrue(provider.get(new URIish(AWS_REPO), makeCredentialItems())); - awsProvider = provider.getAwsCredentialProvider(); - assertNotNull(awsProvider); - assertTrue(awsProvider instanceof AwsCodeCommitCredentialProvider.AWSStaticCredentialsProvider); - } - - @Test - public void testBadUriReturnsFalse() throws UnsupportedCredentialItem, URISyntaxException { - CredentialItem[] credentialItems = makeCredentialItems(); - assertFalse(provider.get(new URIish(BAD_REPO), credentialItems)); - } - + @Test + public void testAwsCredentialsProviderIsDefinedAfterGet() throws URISyntaxException { + AWSCredentialsProvider awsProvider = provider.getAwsCredentialProvider(); + assertNull(awsProvider); + assertTrue(provider.get(new URIish(AWS_REPO), makeCredentialItems())); + awsProvider = provider.getAwsCredentialProvider(); + assertNotNull(awsProvider); + assertTrue(awsProvider instanceof AwsCodeCommitCredentialProvider.AWSStaticCredentialsProvider); + } + + @Test + public void testBadUriReturnsFalse() throws UnsupportedCredentialItem, URISyntaxException { + CredentialItem[] credentialItems = makeCredentialItems(); + assertFalse(provider.get(new URIish(BAD_REPO), credentialItems)); + } + @Test public void testUriWithCurlyBracesReturnsTrue() throws UnsupportedCredentialItem, URISyntaxException { GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); @@ -121,44 +121,44 @@ public class AwsCodeCommitCredentialsProviderTests { assertTrue(provider.get(new URIish(CURLY_BRACES_REPO), credentialItems)); } - @Test - public void testThrowsUnsupportedCredentialException() throws URISyntaxException { - CredentialItem[] goodCredentialItems = makeCredentialItems(); - CredentialItem[] badCredentialItems = new CredentialItem[] { - goodCredentialItems[0], - goodCredentialItems[1], - new CredentialItem.YesNoType("OK?") - }; - try { - provider.get(new URIish(AWS_REPO), badCredentialItems); - fail("Expected UnsupportedCredentialItem exception"); - } catch (UnsupportedCredentialItem e) { - assertNotNull(e.getMessage()); - } - } - - @Test - public void testReturnsCredentials() throws URISyntaxException { - CredentialItem[] credentialItems = makeCredentialItems(); - assertTrue(provider.get(new URIish(AWS_REPO), credentialItems)); - - String theUsername = ((CredentialItem.Username) credentialItems[0]).getValue(); - char[] thePassword = ((CredentialItem.Password) credentialItems[1]).getValue(); - - assertEquals(USER, theUsername); - assertNotNull(thePassword); - - // The password will always begin with a timestamp like - // 20161113T121314Z - assertTrue(thePassword.length > 16); - assertEquals('T', thePassword[8]); - assertEquals('Z', thePassword[15]); - } + @Test + public void testThrowsUnsupportedCredentialException() throws URISyntaxException { + CredentialItem[] goodCredentialItems = makeCredentialItems(); + CredentialItem[] badCredentialItems = new CredentialItem[] { + goodCredentialItems[0], + goodCredentialItems[1], + new CredentialItem.YesNoType("OK?") + }; + try { + provider.get(new URIish(AWS_REPO), badCredentialItems); + fail("Expected UnsupportedCredentialItem exception"); + } catch (UnsupportedCredentialItem e) { + assertNotNull(e.getMessage()); + } + } + + @Test + public void testReturnsCredentials() throws URISyntaxException { + CredentialItem[] credentialItems = makeCredentialItems(); + assertTrue(provider.get(new URIish(AWS_REPO), credentialItems)); + + String theUsername = ((CredentialItem.Username) credentialItems[0]).getValue(); + char[] thePassword = ((CredentialItem.Password) credentialItems[1]).getValue(); + + assertEquals(USER, theUsername); + assertNotNull(thePassword); + + // The password will always begin with a timestamp like + // 20161113T121314Z + assertTrue(thePassword.length > 16); + assertEquals('T', thePassword[8]); + assertEquals('Z', thePassword[15]); + } - private CredentialItem[] makeCredentialItems() { - CredentialItem[] credentialItems = new CredentialItem[2]; - credentialItems[0] = new CredentialItem.Username(); - credentialItems[1] = new CredentialItem.Password(); - return credentialItems; - } + private CredentialItem[] makeCredentialItems() { + CredentialItem[] credentialItems = new CredentialItem[2]; + credentialItems[0] = new CredentialItem.Username(); + credentialItems[1] = new CredentialItem.Password(); + return credentialItems; + } } From b83572ab475c524e14c6888cf6db5f91c6f34161 Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Tue, 30 May 2017 19:04:58 -0400 Subject: [PATCH 5/6] Update AwsCodeCommitCredentialProvider.java Fixed the spaces --- .../server/support/AwsCodeCommitCredentialProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java index b1cf3dd7..1653d72f 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java @@ -327,8 +327,8 @@ public class AwsCodeCommitCredentialProvider extends CredentialsProvider { } try { - URL url = new URL(uri); - URI u = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef()); + URL url = new URL(uri); + URI u = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef()); if (u.getScheme().equals("https")) { String host = u.getHost(); if (host.endsWith(".amazonaws.com") && host.startsWith("git-codecommit.")) { From b7ce3185968b22bdef3f52ccf92cc0e3e6765730 Mon Sep 17 00:00:00 2001 From: tapvirvirk Date: Tue, 30 May 2017 19:05:37 -0400 Subject: [PATCH 6/6] Update AwsCodeCommitCredentialsProviderTests.java Fixed the spaces --- .../AwsCodeCommitCredentialsProviderTests.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java index 220ed439..6eb6018f 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/AwsCodeCommitCredentialsProviderTests.java @@ -48,7 +48,7 @@ public class AwsCodeCommitCredentialsProviderTests { private static final String USER = "test"; private static final String AWS_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/test"; private static final String BAD_REPO = "https://amazonaws.com/v1/repos/test"; - private static final String CURLY_BRACES_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/{application}"; + private static final String CURLY_BRACES_REPO = "https://git-codecommit.us-east-1.amazonaws.com/v1/repos/{application}"; private AwsCodeCommitCredentialProvider provider; @@ -112,14 +112,14 @@ public class AwsCodeCommitCredentialsProviderTests { assertFalse(provider.get(new URIish(BAD_REPO), credentialItems)); } - @Test - public void testUriWithCurlyBracesReturnsTrue() throws UnsupportedCredentialItem, URISyntaxException { - GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); - provider = (AwsCodeCommitCredentialProvider) - factory.createFor(CURLY_BRACES_REPO, USER, PASSWORD, null); - CredentialItem[] credentialItems = makeCredentialItems(); - assertTrue(provider.get(new URIish(CURLY_BRACES_REPO), credentialItems)); - } + @Test + public void testUriWithCurlyBracesReturnsTrue() throws UnsupportedCredentialItem, URISyntaxException { + GitCredentialsProviderFactory factory = new GitCredentialsProviderFactory(); + provider = (AwsCodeCommitCredentialProvider) + factory.createFor(CURLY_BRACES_REPO, USER, PASSWORD, null); + CredentialItem[] credentialItems = makeCredentialItems(); + assertTrue(provider.get(new URIish(CURLY_BRACES_REPO), credentialItems)); + } @Test public void testThrowsUnsupportedCredentialException() throws URISyntaxException {