Skip to content

Commit 5024a34

Browse files
mocsharpmocsharp
committed
Bug fixes (#63)
* Log temporary credential policy for debugging * Update policy to return distinct paths * Fix unit test * Enable concurrent calls to create MinIo clients Signed-off-by: Victor Chang <vicchang@nvidia.com>
1 parent c456480 commit 5024a34

File tree

5 files changed

+172
-173
lines changed

5 files changed

+172
-173
lines changed

‎doc/dependency_decisions.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
- :who: mocsharp
55
:why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt)
66
:versions:
7-
- 3.7.13.8
7+
- 3.7.100.1
88
:when: 2022-08-29 18:11:12.923214877 Z
99
- - :approve
1010
- AWSSDK.S3
1111
- :who: mocsharp
1212
:why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt)
1313
:versions:
14-
- 3.7.9.57
14+
- 3.7.101.1
1515
:when: 2022-08-29 18:11:13.354973002 Z
1616
- - :approve
1717
- AWSSDK.SecurityToken
1818
- :who: mocsharp
1919
:why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt)
2020
:versions:
21-
- 3.7.1.203
21+
- 3.7.100.1
2222
:when: 2022-08-16 18:11:13.781079769 Z
2323
- - :approve
2424
- Ardalis.GuardClauses
@@ -67,7 +67,7 @@
6767
- :who: mocsharp
6868
:why: MIT (https://github.com/microsoft/vstest/raw/v17.3.0/LICENSE)
6969
:versions:
70-
- 17.3.1
70+
- 17.3.2
7171
:when: 2022-08-16 18:11:17.245887971 Z
7272
- - :approve
7373
- Microsoft.Extensions.Configuration
@@ -144,14 +144,14 @@
144144
- :who: mocsharp
145145
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
146146
:versions:
147-
- 6.0.9
147+
- 6.0.10
148148
:when: 2022-08-29 18:11:22.090772006 Z
149149
- - :approve
150150
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
151151
- :who: mocsharp
152152
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
153153
:versions:
154-
- 6.0.9
154+
- 6.0.10
155155
:when: 2022-08-29 18:11:22.090772006 Z
156156
- - :approve
157157
- Microsoft.Extensions.FileProviders.Abstractions
@@ -263,7 +263,7 @@
263263
- :who: mocsharp
264264
:why: MIT (https://github.com/microsoft/vstest/raw/v17.3.0/LICENSE)
265265
:versions:
266-
- 17.3.1
266+
- 17.3.2
267267
:when: 2022-08-16 18:11:29.155295778 Z
268268
- - :approve
269269
- Microsoft.NETCore.Platforms
@@ -298,14 +298,14 @@
298298
- :who: mocsharp
299299
:why: MIT (https://github.com/microsoft/vstest/raw/v17.3.0/LICENSE)
300300
:versions:
301-
- 17.3.1
301+
- 17.3.2
302302
:when: 2022-08-16 18:11:32.293966383 Z
303303
- - :approve
304304
- Microsoft.TestPlatform.TestHost
305305
- :who: mocsharp
306306
:why: MIT (https://github.com/microsoft/vstest/raw/v17.3.0/LICENSE)
307307
:versions:
308-
- 17.3.1
308+
- 17.3.2
309309
:when: 2022-08-16 18:11:33.162650175 Z
310310
- - :approve
311311
- Microsoft.Win32.Primitives

‎src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,49 @@
1616

1717
<Project Sdk="Microsoft.NET.Sdk">
1818

19-
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
21-
<LangVersion>latest</LangVersion>
22-
<RootNamespace>Monai.Deploy.Storage.AWSS3</RootNamespace>
23-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
24-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
25-
</PropertyGroup>
19+
<PropertyGroup>
20+
<TargetFramework>net6.0</TargetFramework>
21+
<LangVersion>latest</LangVersion>
22+
<RootNamespace>Monai.Deploy.Storage.AWSS3</RootNamespace>
23+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
24+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
25+
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
29-
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
30-
</ItemGroup>
27+
<ItemGroup>
28+
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
29+
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
30+
</ItemGroup>
3131

32-
<PropertyGroup>
33-
<PackageId>Monai.Deploy.Storage.AWSS3</PackageId>
34-
<Version>0.1.0</Version>
35-
<Authors>MONAI Consortium</Authors>
36-
<Company>MONAI Consortium</Company>
37-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
38-
<Description>Amazon S3 plug-in for MONAI Deploy Storage Service.</Description>
39-
<Copyright>MONAI Consortium</Copyright>
40-
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
41-
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
42-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
43-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
44-
</PropertyGroup>
32+
<PropertyGroup>
33+
<PackageId>Monai.Deploy.Storage.AWSS3</PackageId>
34+
<Version>0.1.0</Version>
35+
<Authors>MONAI Consortium</Authors>
36+
<Company>MONAI Consortium</Company>
37+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
38+
<Description>Amazon S3 plug-in for MONAI Deploy Storage Service.</Description>
39+
<Copyright>MONAI Consortium</Copyright>
40+
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
41+
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
42+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
43+
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
44+
</PropertyGroup>
4545

46-
<ItemGroup>
47-
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
48-
</ItemGroup>
46+
<ItemGroup>
47+
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
48+
</ItemGroup>
4949

50-
<ItemGroup>
51-
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
52-
<PackageReference Include="AWSSDK.S3" Version="3.7.9.57" />
53-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.203" />
54-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
55-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
56-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
57-
</ItemGroup>
50+
<ItemGroup>
51+
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
52+
<PackageReference Include="AWSSDK.S3" Version="3.7.101.1" />
53+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.100.1" />
54+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
56+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
57+
</ItemGroup>
5858

59-
<ItemGroup>
60-
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
61-
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
62-
</ItemGroup>
59+
<ItemGroup>
60+
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
61+
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
62+
</ItemGroup>
6363

6464
</Project>

‎src/Plugins/MinIO/Monai.Deploy.Storage.MinIO.csproj‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
~ Copyright 2022 MONAI Consortium
33
~
44
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,57 +16,57 @@
1616

1717
<Project Sdk="Microsoft.NET.Sdk">
1818

19-
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
21-
<LangVersion>latest</LangVersion>
22-
<ImplicitUsings>enable</ImplicitUsings>
23-
<RootNamespace>Monai.Deploy.Storage.MinIO</RootNamespace>
24-
<Nullable>enable</Nullable>
25-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
27-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28-
</PropertyGroup>
19+
<PropertyGroup>
20+
<TargetFramework>net6.0</TargetFramework>
21+
<LangVersion>latest</LangVersion>
22+
<ImplicitUsings>enable</ImplicitUsings>
23+
<RootNamespace>Monai.Deploy.Storage.MinIO</RootNamespace>
24+
<Nullable>enable</Nullable>
25+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
27+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
</PropertyGroup>
2929

30-
<ItemGroup>
31-
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
32-
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
33-
</ItemGroup>
30+
<ItemGroup>
31+
<None Include="..\..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
32+
<None Include="..\..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
33+
</ItemGroup>
3434

35-
<PropertyGroup>
36-
<PackageId>Monai.Deploy.Storage.MinIO</PackageId>
37-
<Version>0.1.0</Version>
38-
<Authors>MONAI Consortium</Authors>
39-
<Company>MONAI Consortium</Company>
40-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
41-
<Description>MINIO plug-in for MONAI Deploy Storage Service.</Description>
42-
<Copyright>MONAI Consortium</Copyright>
43-
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
44-
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
45-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
46-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
47-
</PropertyGroup>
48-
49-
<ItemGroup>
50-
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
51-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.203" />
52-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
53-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
54-
<PackageReference Include="Minio" Version="4.0.5" />
55-
</ItemGroup>
35+
<PropertyGroup>
36+
<PackageId>Monai.Deploy.Storage.MinIO</PackageId>
37+
<Version>0.1.0</Version>
38+
<Authors>MONAI Consortium</Authors>
39+
<Company>MONAI Consortium</Company>
40+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
41+
<Description>MINIO plug-in for MONAI Deploy Storage Service.</Description>
42+
<Copyright>MONAI Consortium</Copyright>
43+
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
44+
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
45+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
46+
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
47+
</PropertyGroup>
5648

57-
<ItemGroup>
58-
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
59-
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
60-
</ItemGroup>
49+
<ItemGroup>
50+
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
51+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.100.1" />
52+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
54+
<PackageReference Include="Minio" Version="4.0.5" />
55+
</ItemGroup>
6156

62-
<ItemGroup>
63-
<Compile Remove="Tests\**" />
64-
<EmbeddedResource Remove="Tests\**" />
65-
<None Remove="Tests\**" />
66-
</ItemGroup>
57+
<ItemGroup>
58+
<ProjectReference Include="..\..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
59+
<ProjectReference Include="..\..\Storage\Monai.Deploy.Storage.csproj" />
60+
</ItemGroup>
6761

68-
<ItemGroup>
69-
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
70-
</ItemGroup>
62+
<ItemGroup>
63+
<Compile Remove="Tests\**" />
64+
<EmbeddedResource Remove="Tests\**" />
65+
<None Remove="Tests\**" />
66+
</ItemGroup>
67+
68+
<ItemGroup>
69+
<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
70+
</ItemGroup>
7171

7272
</Project>

‎src/Storage/Monai.Deploy.Storage.csproj‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,60 +16,60 @@
1616

1717

1818
<Project Sdk="Microsoft.NET.Sdk">
19-
<PropertyGroup>
20-
<TargetFramework>net6.0</TargetFramework>
21-
<LangVersion>latest</LangVersion>
22-
<ImplicitUsings>enable</ImplicitUsings>
23-
<RootNamespace>Monai.Deploy.Storage</RootNamespace>
24-
<Nullable>enable</Nullable>
25-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26-
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
27-
<CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-storagecsharp.ruleset</CodeAnalysisRuleSet>
28-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
29-
</PropertyGroup>
30-
<ItemGroup>
31-
<AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-storage\CSharp\SonarLint.xml" Link="SonarLint.xml" />
32-
</ItemGroup>
19+
<PropertyGroup>
20+
<TargetFramework>net6.0</TargetFramework>
21+
<LangVersion>latest</LangVersion>
22+
<ImplicitUsings>enable</ImplicitUsings>
23+
<RootNamespace>Monai.Deploy.Storage</RootNamespace>
24+
<Nullable>enable</Nullable>
25+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
26+
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
27+
<CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-storagecsharp.ruleset</CodeAnalysisRuleSet>
28+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
29+
</PropertyGroup>
30+
<ItemGroup>
31+
<AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-storage\CSharp\SonarLint.xml" Link="SonarLint.xml" />
32+
</ItemGroup>
3333

34-
<PropertyGroup>
35-
<PackageId>Monai.Deploy.Storage</PackageId>
36-
<Version>0.1.0</Version>
37-
<Authors>MONAI Consortium</Authors>
38-
<Company>MONAI Consortium</Company>
39-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
40-
<Description>Storage layer for MONAI Deploy clinical data pipelines system.</Description>
41-
<Copyright>MONAI Consortium</Copyright>
42-
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
43-
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
44-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
45-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
46-
</PropertyGroup>
34+
<PropertyGroup>
35+
<PackageId>Monai.Deploy.Storage</PackageId>
36+
<Version>0.1.0</Version>
37+
<Authors>MONAI Consortium</Authors>
38+
<Company>MONAI Consortium</Company>
39+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
40+
<Description>Storage layer for MONAI Deploy clinical data pipelines system.</Description>
41+
<Copyright>MONAI Consortium</Copyright>
42+
<PackageProjectUrl>https://github.com/Project-MONAI/monai-deploy-storage</PackageProjectUrl>
43+
<RepositoryUrl>https://github.com/Project-MONAI/monai-deploy-storage</RepositoryUrl>
44+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
45+
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
46+
</PropertyGroup>
4747

48-
<ItemGroup>
49-
<None Include="..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
50-
<None Include="..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
51-
</ItemGroup>
48+
<ItemGroup>
49+
<None Include="..\..\LICENSE" Link="LICENSE" PackagePath="" Pack="true" />
50+
<None Include="..\..\third-party-licenses.md" Link="third-party-licenses.md" PackagePath="" Pack="true" />
51+
</ItemGroup>
5252

53-
<ItemGroup>
54-
<Compile Remove="Tests\**" />
55-
<EmbeddedResource Remove="Tests\**" />
56-
<None Remove="Tests\**" />
57-
</ItemGroup>
53+
<ItemGroup>
54+
<Compile Remove="Tests\**" />
55+
<EmbeddedResource Remove="Tests\**" />
56+
<None Remove="Tests\**" />
57+
</ItemGroup>
5858

59-
<ItemGroup>
60-
<Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
61-
</ItemGroup>
59+
<ItemGroup>
60+
<Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
61+
</ItemGroup>
6262

63-
<ItemGroup>
64-
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
65-
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.203" />
66-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
67-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.9" />
68-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
69-
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
70-
</ItemGroup>
63+
<ItemGroup>
64+
<PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
65+
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.100.1" />
66+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
67+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.10" />
68+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
69+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
70+
</ItemGroup>
7171

72-
<ItemGroup>
73-
<ProjectReference Include="..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
74-
</ItemGroup>
72+
<ItemGroup>
73+
<ProjectReference Include="..\S3Policy\Monai.Deploy.Storage.S3Policy.csproj" />
74+
</ItemGroup>
7575
</Project>

0 commit comments

Comments
 (0)