Fix for AssumeRole credential insertion (#948)

Author: biglittlebigben

pkg/config/storage.go

@@ -58,18 +58,18 @@ func (p *PipelineConfig) getStorageConfig(req egress.UploadRequest) (*StorageCon
 			sc.S3.MaxRetries = p.StorageConfig.S3.MaxRetries
 			sc.S3.MaxRetryDelay = p.StorageConfig.S3.MaxRetryDelay
 			sc.S3.MinRetryDelay = p.StorageConfig.S3.MinRetryDelay
-
-			if sc.S3.AssumeRoleArn != "" && sc.S3.AccessKey == "" {
-				if p.S3AssumeRoleKey != "" {
-					// If an AssummedRole is set but not any AccessKey, default to using the one from conf. This is usefull for uploading to S3
-					// using an external account.
-					sc.S3.AccessKey = p.S3AssumeRoleKey
-					sc.S3.Secret = p.S3AssumeRoleSecret
-				} else {
-					return nil, errors.ErrFeatureDisabled("S3 upload using AssumeRole")
-				}
+		}
+		if sc.S3.AssumeRoleArn != "" && sc.S3.AccessKey == "" {
+			if p.S3AssumeRoleKey != "" {
+				// If an AssummedRole is set but not any AccessKey, default to using the one from conf. This is usefull for uploading to S3
+				// using an external account.
+				sc.S3.AccessKey = p.S3AssumeRoleKey
+				sc.S3.Secret = p.S3AssumeRoleSecret
+			} else {
+				return nil, errors.ErrFeatureDisabled("S3 upload using AssumeRole")
 			}
 		}
+
 		if s3.Proxy != nil {
 			sc.S3.ProxyConfig = &storage.ProxyConfig{
 				Url:      s3.Proxy.Url,