Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: remove storage account name if present from azure path #4692

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: remove storage account name if present from azure path #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcd676f
feat: remove storage account name if present from azure path
endre-seqera Jan 26, 2024
4704d95
impr: only remove storage account name from the beginning of the path
endre-seqera Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions plugins/nf-azure/src/main/nextflow/cloud/azure/file/AzPathFactory.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class AzPathFactory extends FileSystemPathFactory {
if( uri.startsWith('az:///') )
throw new IllegalArgumentException("Invalid Azure path URI - make sure the schema prefix does not container more than two slash characters - offending value: $uri")

final storageAccountName = AzConfig.getConfig().storage().accountName
if (uri.startsWith("az://${storageAccountName}.") ) {
uri = uri.replace("az://${storageAccountName}.","az://")
}

final storageConfigEnv = AzConfig.getConfig().storage().getEnv()

final activeDirectoryConfigEnv = AzConfig.getConfig().activeDirectory().getEnv()
Expand Down
32 changes: 31 additions & 1 deletion plugins/nf-azure/src/test/nextflow/cloud/azure/file/AzPathFactoryTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,44 @@ class AzPathFactoryTest extends Specification {

cleanup:
Global.session = null

where:
AZ_URI | CONTAINER | BLOB
'az://my-data/foo/bar' | 'my-data' | 'foo/bar'
'az://my-data/data/*{1,2}.fq.gz'| 'my-data' | 'data/*{1,2}.fq.gz'
}


def 'should create az azure path and remove storage account from the beginning of the path, if present' () {
given:
def CONFIG = [azure: [
storage: [
accountKey: System.getenv('AZURE_STORAGE_ACCOUNT_KEY'),
accountName: System.getenv('AZURE_STORAGE_ACCOUNT_NAME'),
]
]]
Global.session = Mock(Session) { getConfig() >> CONFIG }
and:

when:
def path = AzPathFactory.parse(AZ_URI)
then:
path instanceof AzPath
(path as AzPath).containerName == CONTAINER
(path as AzPath).blobName() == BLOB

cleanup:
Global.session = null

where:
storageAccount | AZ_URI | CONTAINER | BLOB
System.getenv('AZURE_STORAGE_ACCOUNT_NAME') | "az://${storageAccount}.my-data/foo/bar" | 'my-data' | 'foo/bar'
System.getenv('AZURE_STORAGE_ACCOUNT_NAME') | "az://${storageAccount}.my-data/data/*{1,2}.fq.gz" | 'my-data' | 'data/*{1,2}.fq.gz'
System.getenv('AZURE_STORAGE_ACCOUNT_NAME') | "az://${storageAccount}.my-data/${storageAccount}.bar" | 'my-data' | "${storageAccount}.bar"
System.getenv('AZURE_STORAGE_ACCOUNT_NAME') | "az://${storageAccount}.${storageAccount}./foo/bar" | "${storageAccount}." | 'foo/bar'
System.getenv('AZURE_STORAGE_ACCOUNT_NAME') | "az://my-data/${storageAccount}.txt" | 'my-data' | "${storageAccount}.txt"

}

def 'should throw illegal path' () {
given:
Expand Down
Loading