diff --git a/Dockerfile b/Dockerfile index 3406606..1ef63c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV ASPNETCORE_ENVIRONMENT="Production" \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ ASPNETCORE_URLS="http://*:8080" -FROM mcr.microsoft.com/dotnet/sdk:8.0.301-noble@sha256:daeec618239ba57630b19d572bbd55b4af66940fa564058355550fc93d86153f AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0.302-noble@sha256:bd836d1c4a19860ee61d1202b82561f0c750edb7a635443cb001042b71d79569 AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /build COPY src/Directory.Build.props . @@ -57,7 +57,7 @@ WORKDIR /opt/fhir-pseudonymizer-stress # https://github.com/hadolint/hadolint/pull/815 isn't yet in mega-linter # hadolint ignore=DL3022 -COPY --from=docker.io/bitnami/kubectl:1.30.1@sha256:cdca6c19721eaaaf3bbacb33da88d340c94b358f503621a5c2063342294d8960 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl +COPY --from=docker.io/bitnami/kubectl:1.30.2@sha256:3f6d4783cf84b56cb5aa33d0b404b5270aafaa6dcd5afe844b3cd55558383fa2 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl COPY tests/chaos/chaos.yaml /tmp/ COPY --from=build-stress-test /build/publish . diff --git a/compose.dev.yaml b/compose.dev.yaml index 470b14c..eb806ad 100644 --- a/compose.dev.yaml +++ b/compose.dev.yaml @@ -1,6 +1,6 @@ services: jaeger: - image: docker.io/jaegertracing/all-in-one:1.57@sha256:8f165334f418ca53691ce358c19b4244226ed35c5d18408c5acf305af2065fb9 + image: docker.io/jaegertracing/all-in-one:1.58@sha256:f015fb34e6742bb46b87c42cf83abfacfdd5dc39864a859a4ba942eb21c4b29c restart: unless-stopped deploy: resources: diff --git a/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj b/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj index edfed55..7619718 100644 --- a/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj +++ b/src/FhirPseudonymizer.StressTests/FhirPseudonymizer.StressTests.csproj @@ -14,7 +14,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj b/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj index 319415c..f9b0038 100644 --- a/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj +++ b/src/FhirPseudonymizer.Tests/FhirPseudonymizer.Tests.csproj @@ -7,11 +7,11 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/FhirPseudonymizer/FhirPseudonymizer.csproj b/src/FhirPseudonymizer/FhirPseudonymizer.csproj index 7740cfd..7896c81 100644 --- a/src/FhirPseudonymizer/FhirPseudonymizer.csproj +++ b/src/FhirPseudonymizer/FhirPseudonymizer.csproj @@ -10,7 +10,7 @@ - + @@ -29,14 +29,14 @@ - + - - + + - - - + + + diff --git a/src/FhirPseudonymizer/packages.lock.json b/src/FhirPseudonymizer/packages.lock.json index 8372c0e..d3d874a 100644 --- a/src/FhirPseudonymizer/packages.lock.json +++ b/src/FhirPseudonymizer/packages.lock.json @@ -37,9 +37,9 @@ }, "Google.Protobuf": { "type": "Direct", - "requested": "[3.27.0, )", - "resolved": "3.27.0", - "contentHash": "tEaKpc+SP7I3gYW9AHozESyKkrCg8Xe7huI3Q3iUt5t8Dn29r2k1u8jyrGrD16maj/0UsQBM0MDViWEj0iynOA==" + "requested": "[3.27.2, )", + "resolved": "3.27.2", + "contentHash": "0wdgA3LO9mBS477jieBFs4pU1sWhVtwv/P+i9nAEiFDQyUA7PPHDBbJL1CeqYtV18jLiq9og4n7wSVCO171OBg==" }, "Grpc.Net.Client": { "type": "Direct", @@ -113,13 +113,13 @@ }, "OpenTelemetry": { "type": "Direct", - "requested": "[1.8.1, )", - "resolved": "1.8.1", - "contentHash": "70pb4YyPJnoV3vZOxpusEzBqgY6NyLwyruhas5d3bUO10GnldRWGE8DF4UusbinxnTLOpSmNzsaOb5R1v+Mt0g==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "7scS6BUhwYeSXEDGhCxMSezmvyCoDU5kFQbmfyW9iVvVTcWhec+1KIN33/LOCdBXRkzt2y7+g03mkdAB0XZ9Fw==", "dependencies": { "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", "Microsoft.Extensions.Logging.Configuration": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.1" + "OpenTelemetry.Api.ProviderBuilderExtensions": "1.9.0" } }, "OpenTelemetry.Exporter.Jaeger": { @@ -134,33 +134,33 @@ }, "OpenTelemetry.Exporter.OpenTelemetryProtocol": { "type": "Direct", - "requested": "[1.8.1, )", - "resolved": "1.8.1", - "contentHash": "kAn7VgAh/ZS2K+NCoJcQvxYJa/nLQazleyYcpLoXmkJzfJlcimJsnozQyZaROeaLYC0oTRgbONCcLi6j+cpZjg==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "qzFOP3V2eYIVbug3U4BJzzidHe9JhAJ42WZ/H8pUp/45Ry3MQQg/+e/ZieClJcxKnpbkXi7dUq1rpvuNp+yBYA==", "dependencies": { "Google.Protobuf": "[3.22.5, 4.0.0)", "Grpc.Net.Client": "[2.52.0, 3.0.0)", "Microsoft.Extensions.Configuration.Binder": "8.0.1", - "OpenTelemetry": "1.8.1" + "OpenTelemetry": "1.9.0" } }, "OpenTelemetry.Extensions.Hosting": { "type": "Direct", - "requested": "[1.8.1, )", - "resolved": "1.8.1", - "contentHash": "vAiiKFPGDUkCUu+edSZf95n33AC7VdynDG+wF+KolTQL+8YphlvQ5wn06PDegD0CJVqk8imwqN+LCb/JjsGxKA==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "QBQPrKDVCXxTBE+r8tgjmFNKKHi4sKyczmip2XGUcjy8kk3quUNhttnjiMqC4sU50Hemmn4i5752Co26pnKe3A==", "dependencies": { "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", - "OpenTelemetry": "1.8.1" + "OpenTelemetry": "1.9.0" } }, "OpenTelemetry.Instrumentation.AspNetCore": { "type": "Direct", - "requested": "[1.8.1, )", - "resolved": "1.8.1", - "contentHash": "dRb1LEXSH95LGEubk96kYyBmGuny9/qycH9KqL8FXcOv446Xi53EW56TVE4wTMv4HPfn+rL3B9pPQ5RX7zD4Yw==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "x4HuWBw1rbWZUh5j8/GpXz3xa7JnrTuKne+ACmBqvcoO/rNGkG7HayRruwoQ7gf52xpMtRGr4gxlhLW8eU0EiQ==", "dependencies": { - "OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.0" + "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)" } }, "OpenTelemetry.Instrumentation.GrpcNetClient": { @@ -174,13 +174,13 @@ }, "OpenTelemetry.Instrumentation.Http": { "type": "Direct", - "requested": "[1.8.1, )", - "resolved": "1.8.1", - "contentHash": "l1KaO1U+v11X/kfZ8tcONc5l1qoP6nPk6yPrXBJNH0Wb6NEBTdEgI1dtJBbqOnjOrI2XS09le0ZGooh9ZVkZ3Q==", + "requested": "[1.9.0, )", + "resolved": "1.9.0", + "contentHash": "+ZXppf8Qxz3OdC803T8fB6i8iSscc8PsxMnM/JizSOYmkz+8vGiScEiaBBBFNZtMh2KpA0q+qxwnSwQUkbvzog==", "dependencies": { "Microsoft.Extensions.Configuration": "8.0.0", "Microsoft.Extensions.Options": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "1.8.0" + "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)" } }, "prometheus-net": { @@ -245,9 +245,9 @@ }, "YamlDotNet": { "type": "Direct", - "requested": "[15.1.6, )", - "resolved": "15.1.6", - "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA==" + "requested": "[15.3.0, )", + "resolved": "15.3.0", + "contentHash": "F93japYa9YrJ59AZGhgdaUGHN7ITJ55FBBg/D/8C0BDgahv/rQD6MOSwHxOJJpon1kYyslVbeBrQ2wcJhox01w==" }, "Fhir.Metrics": { "type": "Transitive", @@ -508,19 +508,19 @@ }, "OpenTelemetry.Api": { "type": "Transitive", - "resolved": "1.8.1", - "contentHash": "QCwCJp/ndXzlTBiTJjcpkpi4tntv1qSRJMXv0YNKcptE/FRMufiIA7IWTegS7C1/r3YQQwGiwdHARcZcS41JMw==", + "resolved": "1.9.0", + "contentHash": "Xz8ZvM1Lm0m7BbtGBnw2JlPo++YKyMp08zMK5p0mf+cIi5jeMt2+QsYu9X6YEAbjCxBQYwEak5Z8sY6Ig2WcwQ==", "dependencies": { "System.Diagnostics.DiagnosticSource": "8.0.0" } }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", - "resolved": "1.8.1", - "contentHash": "/M1vkPg2i2UpnHMlV8kFS4ct9O2cg3C+KVgPI/6G/tp99AzwGIvZZv0NswnjKBqis/Lr9Lv2eeF1yvG1KpBP/w==", + "resolved": "1.9.0", + "contentHash": "L0D4LBR5JFmwLun5MCWVGapsJLV0ANZ+XXu9NEI3JE/HRKkRuUO+J2MuHD5DBwiU//QMYYM4B22oev1hVLoHDQ==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "OpenTelemetry.Api": "1.8.1" + "OpenTelemetry.Api": "1.9.0" } }, "Polly": {