Skip to content

Commit 6c595ea

Browse files
authored
Remove Az Fusion environment variable (#6143)
Signed-off-by: adamrtalbot <12817534+adamrtalbot@users.noreply.github.com>
1 parent 37981a5 commit 6c595ea

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import com.azure.compute.batch.models.ContainerConfiguration
5050
import com.azure.compute.batch.models.ContainerRegistryReference
5151
import com.azure.compute.batch.models.ContainerType
5252
import com.azure.compute.batch.models.ElevationLevel
53-
import com.azure.compute.batch.models.EnvironmentSetting
5453
import com.azure.compute.batch.models.MetadataItem
5554
import com.azure.compute.batch.models.MountConfiguration
5655
import com.azure.compute.batch.models.NetworkConfiguration
@@ -553,14 +552,6 @@ class AzBatchService implements Closeable {
553552
.setOutputFiles(outputFileUrls(task, sas))
554553
.setRequiredSlots(slots)
555554
.setConstraints(constraints)
556-
.setEnvironmentSettings(taskEnv(config.batch()))
557-
}
558-
559-
protected List<EnvironmentSetting> taskEnv(AzBatchOpts opts) {
560-
return opts.poolIdentityClientId
561-
? List.of(new EnvironmentSetting("FUSION_AZ_MSI_CLIENT_ID")
562-
.setValue(opts.poolIdentityClientId))
563-
: List.<EnvironmentSetting>of()
564555
}
565556

566557
/**

plugins/nf-azure/src/test/nextflow/cloud/azure/batch/AzBatchServiceTest.groovy

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,24 +1027,4 @@ class AzBatchServiceTest extends Specification {
10271027
]
10281028
}
10291029

1030-
@Unroll
1031-
def 'should create task env' () {
1032-
given:
1033-
def exec = Mock(AzBatchExecutor)
1034-
def service = new AzBatchService(exec)
1035-
List<EnvironmentSetting> env
1036-
1037-
when:
1038-
env = service.taskEnv(new AzBatchOpts([:]))
1039-
then:
1040-
env == []
1041-
1042-
when:
1043-
env = service.taskEnv(new AzBatchOpts([poolIdentityClientId:'12345']))
1044-
then:
1045-
env.size() == 1
1046-
env.first.name == 'FUSION_AZ_MSI_CLIENT_ID'
1047-
env.first.value == '12345'
1048-
}
1049-
10501030
}

0 commit comments

Comments
 (0)