Don't require secret id in user if already given in jdbc url

README.md

@@ -89,3 +89,5 @@ The secret being used should be in the JSON format we use for our rotation lambd
 	...
 }
 ```
+
+Alternatively, you can pass the secret ID as the jdbc uri and omit user. The JDBC connection details such as host, port, dbname will be obtained from your secrets manager secret.

src/main/java/com/amazonaws/secretsmanager/sql/AWSSecretsManagerDriver.java

@@ -354,16 +354,29 @@ public Connection connect(String url, Properties info) throws SQLException {
             return null;
         }
 
-        String unwrappedUrl = "";
         if (url.startsWith(SCHEME)) { // If this is a URL in the correct scheme, unwrap it
-            unwrappedUrl = unwrapUrl(url);
+            String unwrappedUrl = unwrapUrl(url);
+
+            if (info != null && info.getProperty("user") != null) {
+                String credentialsSecretId = info.getProperty("user");
+                try {
+                    return connectWithSecret(unwrappedUrl, info, credentialsSecretId);
+                } catch (InterruptedException e) {
+                    // User driven exception. Throw a runtime exception.
+                    throw new RuntimeException(e);
+                }
+            } else {
+                return getWrappedDriver().connect(unwrappedUrl, info);
+            }
+
         } else { // Else, assume this is a secret ID and try to retrieve it
             String secretString = secretCache.getSecretString(url);
             if (StringUtils.isNullOrEmpty(secretString)) {
                 throw new IllegalArgumentException("URL " + url + " is not a valid URL starting with scheme " +
                         SCHEME + " or a valid retrievable secret ID ");
             }
 
+            String unwrappedUrl = "";
             try {
                 JsonNode jsonObject = mapper.readTree(secretString);
                 String endpoint = jsonObject.get("host").asText();
@@ -376,18 +389,14 @@ public Connection connect(String url, Properties info) throws SQLException {
                 // Most likely to occur in the event that the data is not JSON. This is more of a user error.
                 throw new RuntimeException(INVALID_SECRET_STRING_JSON);
             }
-        }
 
-        if (info != null && info.getProperty("user") != null) {
-            String credentialsSecretId = info.getProperty("user");
             try {
-                return connectWithSecret(unwrappedUrl, info, credentialsSecretId);
+                return connectWithSecret(unwrappedUrl, info, url);
             } catch (InterruptedException e) {
                 // User driven exception. Throw a runtime exception.
                 throw new RuntimeException(e);
             }
-        } else {
-            return getWrappedDriver().connect(unwrappedUrl, info);
+
         }
     }
 

src/test/java/com/amazonaws/secretsmanager/sql/AWSSecretsManagerDriverTest.java

@@ -231,9 +231,8 @@ public void test_connect_jdbc_returnsNull() throws SQLException {
     }
 
     @Test
-    public void test_connect_works_secretId() {
+    public void test_connect_works_secretId_in_url() {
         Properties props = new Properties();
-        props.setProperty("user", "user");
         assertNotThrows(() -> sut.connect("someSecretId", props));
         assertEquals(1, DummyDriver.connectCallCount);
     }