Merge pull request #198 from pracucci/fix-aws-config-from-url

Fixed aws.ConfigFromURL() when URL contains @ but no user/pass

Author: bboreham

aws/config.go

@@ -40,9 +40,13 @@ func ConfigFromURL(awsURL *url.URL) (*aws.Config, error) {
 		})
 
 	if awsURL.User != nil {
+		username := awsURL.User.Username()
 		password, _ := awsURL.User.Password()
-		creds := credentials.NewStaticCredentials(awsURL.User.Username(), password, "")
-		config = config.WithCredentials(creds)
+
+		// We request at least the username or password being set to enable the static credentials.
+		if username != "" || password != "" {
+			config = config.WithCredentials(credentials.NewStaticCredentials(username, password, ""))
+		}
 	}
 
 	if strings.Contains(awsURL.Host, ".") {

aws/config_test.go

@@ -24,6 +24,13 @@ func TestAWSConfigFromURL(t *testing.T) {
 			"dummy",
 			"http://s3.default.svc.cluster.local:4569",
 		},
+		{
+			"s3://@us-east-1/test-bucket",
+			"",
+			"",
+			"us-east-1",
+			"",
+		},
 		{
 			"dynamodb://user:[email protected]:8000/cortex",
 			"user",
@@ -54,10 +61,10 @@ func TestAWSConfigFromURL(t *testing.T) {
 			cfg, err := ConfigFromURL(parsedURL)
 			require.NoError(t, err)
 
-			if cfg.Credentials == nil {
-				assert.Equal(t, "", tc.expectedKey)
-				assert.Equal(t, "", tc.expectedSecret)
+			if tc.expectedKey == "" && tc.expectedSecret == "" {
+				assert.Nil(t, cfg.Credentials)
 			} else {
+				require.NotNil(t, cfg.Credentials)
 				val, err := cfg.Credentials.Get()
 				require.NoError(t, err)
 				assert.Equal(t, tc.expectedKey, val.AccessKeyID)
@@ -70,6 +77,8 @@ func TestAWSConfigFromURL(t *testing.T) {
 			if tc.expectedEp != "" {
 				require.NotNil(t, cfg.Endpoint)
 				assert.Equal(t, tc.expectedEp, *cfg.Endpoint)
+			} else {
+				assert.Nil(t, cfg.Endpoint)
 			}
 		})
 	}