diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 6e997c4..817094a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
- "version": "0.30.1",
+ "version": "0.30.3",
"commands": ["dotnet-csharpier"]
}
}
diff --git a/Dockerfile b/Dockerfile
index 15c0e19..10ca75e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.100-noble@sha256:3bdd7f7fd595373d049c724f3a05ec8a8d9e27da05ba9cbe3ca6e0f3cc001e50 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.101-noble@sha256:991fd7c9c41fc12b47313bd2e1fb292c39e50fb50453ac11287b2877d3623d55 AS build
WORKDIR /build
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/compose.yaml b/compose.yaml
index c5969c6..4cd59e3 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,6 +1,6 @@
services:
minio:
- image: docker.io/bitnami/minio:2024.11.7-debian-12-r1@sha256:9f2d9c45006a2ada1bc485e1393291ce7d54ae1a46260dd491381a4eb8b2fd47
+ image: docker.io/bitnami/minio:2024.12.18-debian-12-r0@sha256:cce234b4381a169d80836584d966bb5c82365e5f7f0becfcf2d1cf8c57be754b
environment:
MINIO_ROOT_USER: "admin"
# kics-scan ignore-line
@@ -13,7 +13,7 @@ services:
- "127.0.0.1:9001:9001"
wait-for-minio:
- image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
restart: "no"
environment:
MINIO_ENDPOINT_URL: http://minio:9000
@@ -29,7 +29,7 @@ services:
condition: service_started
minio-client:
- image: docker.io/bitnami/minio-client:2024.11.17-debian-12-r0@sha256:60f0ebd9dbcec327909fd8832503fa269445c499548a8999ad957046a9ebbea8
+ image: docker.io/bitnami/minio-client:2024.11.21-debian-12-r1@sha256:77c4ebf868a5043006baffb1cb952572c198df1be60973849e19c9307c6dcda0
environment:
MINIO_SERVER_ACCESS_KEY: admin
# kics-scan ignore-line
@@ -88,7 +88,7 @@ services:
condition: service_completed_successfully
wait-for-pathling:
- image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba
+ image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
restart: "no"
environment:
PATHLING_URL: http://pathling:8080
diff --git a/src/PathlingS3Import.Tests.E2E/PathlingS3Import.Tests.E2E.csproj b/src/PathlingS3Import.Tests.E2E/PathlingS3Import.Tests.E2E.csproj
index e000b09..52ae993 100644
--- a/src/PathlingS3Import.Tests.E2E/PathlingS3Import.Tests.E2E.csproj
+++ b/src/PathlingS3Import.Tests.E2E/PathlingS3Import.Tests.E2E.csproj
@@ -8,9 +8,9 @@
-
+
-
+
diff --git a/src/PathlingS3Import.Tests.E2E/packages.lock.json b/src/PathlingS3Import.Tests.E2E/packages.lock.json
index 7b376d4..4ebbfd4 100644
--- a/src/PathlingS3Import.Tests.E2E/packages.lock.json
+++ b/src/PathlingS3Import.Tests.E2E/packages.lock.json
@@ -19,11 +19,11 @@
},
"Hl7.Fhir.R4": {
"type": "Direct",
- "requested": "[5.11.0, )",
- "resolved": "5.11.0",
- "contentHash": "KBDULQZARiYOyewonZX/5oJoGUcw7bkkWdRPhp63b3EH/Yr+RpZ/UnO6yZpx0s+YLU5buo/r1XjmKuyc81XIpw==",
+ "requested": "[5.11.1, )",
+ "resolved": "5.11.1",
+ "contentHash": "69zJSBnJvatxEl0w9XrFzwzWjqpGFunK1jmIUQgsnIV8WSPRwj0F0tOwYE4XY890dPCWLhKYQjL+Jx4AsudVbA==",
"dependencies": {
- "Hl7.Fhir.Conformance": "5.11.0"
+ "Hl7.Fhir.Conformance": "5.11.1"
}
},
"Microsoft.NET.Test.Sdk": {
@@ -38,14 +38,14 @@
},
"Testcontainers": {
"type": "Direct",
- "requested": "[4.0.0, )",
- "resolved": "4.0.0",
- "contentHash": "wLG4Ls/A4jNB7b2ZrhtCUCHFBinDXohgvZ54fJB+kLVkxrqSuyQHdKwlIwPLgLSVGfPaMIAkZOEFVDSoEa1VxA==",
- "dependencies": {
- "Docker.DotNet": "3.125.15",
- "Docker.DotNet.X509": "3.125.15",
- "Microsoft.Extensions.Logging.Abstractions": "6.0.4",
- "SSH.NET": "2023.0.0",
+ "requested": "[4.1.0, )",
+ "resolved": "4.1.0",
+ "contentHash": "5oudr81h9084amKZrjVIWdVWycR2YhqT9ePnN/ID7xinwx3ZLAI4EhYiyurfrDMvWcHJp5+c9x+qPRxOcq1IXQ==",
+ "dependencies": {
+ "Docker.DotNet.Enhanced": "3.126.1",
+ "Docker.DotNet.Enhanced.X509": "3.126.1",
+ "Microsoft.Extensions.Logging.Abstractions": "8.0.2",
+ "SSH.NET": "2024.1.0",
"SharpZipLib": "1.4.2"
}
},
@@ -66,22 +66,17 @@
"resolved": "2.8.2",
"contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ=="
},
- "Docker.DotNet": {
+ "Docker.DotNet.Enhanced": {
"type": "Transitive",
- "resolved": "3.125.15",
- "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==",
- "dependencies": {
- "Newtonsoft.Json": "13.0.1",
- "System.Buffers": "4.5.1",
- "System.Threading.Tasks.Extensions": "4.5.4"
- }
+ "resolved": "3.126.1",
+ "contentHash": "UPyLBLBaVE3s7OCWM0h5g9w6mUOag5sOIP5CldFQekIWo/gHixgZR+o5fG7eCFH4ZdKlvBGM4ALFuOyPoKoJ3A=="
},
- "Docker.DotNet.X509": {
+ "Docker.DotNet.Enhanced.X509": {
"type": "Transitive",
- "resolved": "3.125.15",
- "contentHash": "ONQN7ImrL3tHStUUCCPHwrFFQVpIpE+7L6jaDAMwSF+yTEmeWBmRARQZDRuvfj/+WtB8RR0oTW0tT3qQMSyHOw==",
+ "resolved": "3.126.1",
+ "contentHash": "XFHMC/iWHbloQgg9apZrxu010DmSamaAggu8nomCqTeotGyUGkv2Tt/aqk1ljC/4tjtTrb9LtFQwYpwZbMbiKg==",
"dependencies": {
- "Docker.DotNet": "3.125.15"
+ "Docker.DotNet.Enhanced": "3.126.1"
}
},
"Fhir.Metrics": {
@@ -91,8 +86,8 @@
},
"Hl7.Fhir.Base": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "LxPB+K7UT2jfGckOtKvKb3nmNXrXKAofSkB1sPC+OcAwkaNelnxv2GNEnYHhWHuX88zjHOqH/yqQACoyzj5nwQ==",
+ "resolved": "5.11.1",
+ "contentHash": "7YVZic2XeBllSmhccmF6tc2dggzBQmq/i1lIpTXYSZgA5qiw/C+SLBOytzB22GS4Xk1BKaNUksK0iDZTQH6dqQ==",
"dependencies": {
"Fhir.Metrics": "1.3.0",
"Newtonsoft.Json": "13.0.3",
@@ -102,10 +97,10 @@
},
"Hl7.Fhir.Conformance": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "OJSpL+/1qIlBKAMPJm26pXT6SDeHRAkMhXgVEWHMVsHRMR9e/fdt3VyNZy0vh2kwbZhWB/e42zYROw3DMGccuA==",
+ "resolved": "5.11.1",
+ "contentHash": "fOIfkaC5304LdhRh4TvdmV/L2dKnMyggGAjvZDN6dfnuckd4lKu7dZQe1W6dsmFj1IBhsCdJWET8f/uAH4deHQ==",
"dependencies": {
- "Hl7.Fhir.Base": "5.11.0"
+ "Hl7.Fhir.Base": "5.11.1"
}
},
"Microsoft.CodeCoverage": {
@@ -113,10 +108,18 @@
"resolved": "17.12.0",
"contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA=="
},
+ "Microsoft.Extensions.DependencyInjection.Abstractions": {
+ "type": "Transitive",
+ "resolved": "8.0.2",
+ "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg=="
+ },
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
- "resolved": "6.0.4",
- "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
+ "resolved": "8.0.2",
+ "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==",
+ "dependencies": {
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2"
+ }
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
@@ -147,21 +150,8 @@
},
"SSH.NET": {
"type": "Transitive",
- "resolved": "2023.0.0",
- "contentHash": "g+3VDUrYhm0sqSxmlQFgRFrmBxhQvVh4pfn4pqjkX7WXE3tTjt1tIsOtjuz3mz/5s8gFFQVRydwCJ7Ohs54sJA==",
- "dependencies": {
- "SshNet.Security.Cryptography": "[1.3.0]"
- }
- },
- "SshNet.Security.Cryptography": {
- "type": "Transitive",
- "resolved": "1.3.0",
- "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q=="
- },
- "System.Buffers": {
- "type": "Transitive",
- "resolved": "4.5.1",
- "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
+ "resolved": "2024.1.0",
+ "contentHash": "pyOea9czgC+OwMoetuWtMuwRebOyskKkqTZtODgyEZ5K6JwV+Hh/GFiyYubl93YnEvmvNZeuyWyUDsb3LvBDYA=="
},
"System.ComponentModel.Annotations": {
"type": "Transitive",
@@ -191,11 +181,6 @@
"resolved": "4.4.0",
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
},
- "System.Threading.Tasks.Extensions": {
- "type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
- },
"xunit.abstractions": {
"type": "Transitive",
"resolved": "2.0.3",
diff --git a/src/PathlingS3Import/PathlingS3Import.csproj b/src/PathlingS3Import/PathlingS3Import.csproj
index dd50b20..039a6b6 100644
--- a/src/PathlingS3Import/PathlingS3Import.csproj
+++ b/src/PathlingS3Import/PathlingS3Import.csproj
@@ -6,12 +6,12 @@
-
+
-
+
diff --git a/src/PathlingS3Import/packages.lock.json b/src/PathlingS3Import/packages.lock.json
index 9e2bcf2..8626275 100644
--- a/src/PathlingS3Import/packages.lock.json
+++ b/src/PathlingS3Import/packages.lock.json
@@ -10,11 +10,11 @@
},
"Hl7.Fhir.R4": {
"type": "Direct",
- "requested": "[5.11.0, )",
- "resolved": "5.11.0",
- "contentHash": "KBDULQZARiYOyewonZX/5oJoGUcw7bkkWdRPhp63b3EH/Yr+RpZ/UnO6yZpx0s+YLU5buo/r1XjmKuyc81XIpw==",
+ "requested": "[5.11.1, )",
+ "resolved": "5.11.1",
+ "contentHash": "69zJSBnJvatxEl0w9XrFzwzWjqpGFunK1jmIUQgsnIV8WSPRwj0F0tOwYE4XY890dPCWLhKYQjL+Jx4AsudVbA==",
"dependencies": {
- "Hl7.Fhir.Conformance": "5.11.0"
+ "Hl7.Fhir.Conformance": "5.11.1"
}
},
"Microsoft.Extensions.DependencyInjection": {
@@ -60,11 +60,11 @@
},
"Prometheus.Client.MetricPusher": {
"type": "Direct",
- "requested": "[3.1.0, )",
- "resolved": "3.1.0",
- "contentHash": "A43R2x1XKTD2NebcR2E1OmKDpww2CR7okmMwFS0HiMWG5OLruwPLSGMw6JuGlSu1tOlF55tIV7XX6mjb+gAzIw==",
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "DWUdr8OEiT/Ug6nFkB+i3i59yiq+HSkWUS+t9uTMs1G+jSsUUdSXFYQ5UnGhlcoHx28SA2kYPM6GDCTeT5e0Ng==",
"dependencies": {
- "Prometheus.Client": "[5.2.0, 6.0.0)"
+ "Prometheus.Client": "5.2.0"
}
},
"System.Linq.Async": {
@@ -88,8 +88,8 @@
},
"Hl7.Fhir.Base": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "LxPB+K7UT2jfGckOtKvKb3nmNXrXKAofSkB1sPC+OcAwkaNelnxv2GNEnYHhWHuX88zjHOqH/yqQACoyzj5nwQ==",
+ "resolved": "5.11.1",
+ "contentHash": "7YVZic2XeBllSmhccmF6tc2dggzBQmq/i1lIpTXYSZgA5qiw/C+SLBOytzB22GS4Xk1BKaNUksK0iDZTQH6dqQ==",
"dependencies": {
"Fhir.Metrics": "1.3.0",
"Newtonsoft.Json": "13.0.3",
@@ -99,10 +99,10 @@
},
"Hl7.Fhir.Conformance": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "OJSpL+/1qIlBKAMPJm26pXT6SDeHRAkMhXgVEWHMVsHRMR9e/fdt3VyNZy0vh2kwbZhWB/e42zYROw3DMGccuA==",
+ "resolved": "5.11.1",
+ "contentHash": "fOIfkaC5304LdhRh4TvdmV/L2dKnMyggGAjvZDN6dfnuckd4lKu7dZQe1W6dsmFj1IBhsCdJWET8f/uAH4deHQ==",
"dependencies": {
- "Hl7.Fhir.Base": "5.11.0"
+ "Hl7.Fhir.Base": "5.11.1"
}
},
"Microsoft.Bcl.AsyncInterfaces": {