diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c029d53b..80ea6b7a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,14 +19,14 @@ jobs: container: dockfool/cake-docker:latest steps: - name: Checkout source - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0 filter: tree:0 show-progress: false - name: Cache packages - uses: actions/cache@v4.0.1 + uses: actions/cache@v4.0.2 with: path: ${{ env.NUGET_PACKAGES }} key: ${{ runner.os }}-nuget-${{ hashFiles('.config/dotnet-tools.json', '**/packages.lock.json') }} @@ -34,13 +34,13 @@ jobs: - name: Docker login if: github.event_name != 'pull_request' - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - name: Setup buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Export runtime uses: crazy-max/ghaction-github-runtime@v3.0.0 diff --git a/Aws/packages.lock.json b/Aws/packages.lock.json index 80d9d87f..e95c265c 100644 --- a/Aws/packages.lock.json +++ b/Aws/packages.lock.json @@ -62,8 +62,8 @@ }, "FluentValidation": { "type": "Transitive", - "resolved": "11.9.0", - "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig==" + "resolved": "11.9.2", + "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg==" }, "Flurl": { "type": "Transitive", @@ -143,16 +143,16 @@ }, "Polly": { "type": "Transitive", - "resolved": "8.3.1", - "contentHash": "xN9AxOudus8u4a//Tfu6Wxd5Oj7S4pjh/651S6FfIiVrbxQ8TeM+ieZC8c0y7Qto70zKBM5g8rBTqbAJnbetOA==", + "resolved": "8.4.0", + "contentHash": "z2EeUutuy49jBQyZ5s2FUuTCGx3GCzJ0cJ2HbjWwks94TsC6bKTtAHKBkMZOa/DyYRl5yIX7MshvMTWl1J6RNg==", "dependencies": { - "Polly.Core": "8.3.1" + "Polly.Core": "8.4.0" } }, "Polly.Core": { "type": "Transitive", - "resolved": "8.3.1", - "contentHash": "b9mMAjqXuCXFCtf/RtRPwFUkAm/sz37s7G+taDvS5EqfkJsLiWfO2xO2cSISjIgIY+88oIZTGguP6UrRGRlqzg==" + "resolved": "8.4.0", + "contentHash": "3AZxuP//pxOeBo9tQs7/tz4Z5TTbu4BYfjpaXZD0JYKJo98ngN9TMUz1nybh4k0ykWkMBpGZALV/AmVIE3ew7A==" }, "Pulumi.Kubernetes": { "type": "Transitive", @@ -178,8 +178,8 @@ }, "Scriban": { "type": "Transitive", - "resolved": "5.9.1", - "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ==" + "resolved": "5.10.0", + "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q==" }, "Semver": { "type": "Transitive", @@ -220,8 +220,8 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "15.1.2", - "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA==" + "resolved": "15.1.6", + "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA==" }, "k8s": { "type": "Project", @@ -229,7 +229,7 @@ "Flurl.Http": "[4.0.2, )", "Library": "[1.0.0, )", "Microsoft.Extensions.Options": "[8.0.2, )", - "Polly": "[8.3.1, )", + "Polly": "[8.4.0, )", "Pulumi": "[3.38.0, )", "Pulumi.Aws": "[5.11.0, )", "Pulumi.Kubernetes": "[3.20.5, )", @@ -239,14 +239,14 @@ "library": { "type": "Project", "dependencies": { - "FluentValidation": "[11.9.0, )", + "FluentValidation": "[11.9.2, )", "Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )", "Microsoft.Extensions.Options": "[8.0.2, )", "Pulumi": "[3.38.0, )", "Pulumi.Aws": "[5.11.0, )", "Pulumi.Kubernetes": "[3.20.5, )", - "Scriban": "[5.9.1, )", - "YamlDotNet": "[15.1.2, )" + "Scriban": "[5.10.0, )", + "YamlDotNet": "[15.1.6, )" } } } diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj index b064d0c4..acbb6a41 100644 --- a/Cli/Cli.csproj +++ b/Cli/Cli.csproj @@ -29,8 +29,8 @@ - - + + @@ -39,8 +39,8 @@ - - + + diff --git a/Cli/Dockerfile b/Cli/Dockerfile index e4c78105..d78a75b3 100644 --- a/Cli/Dockerfile +++ b/Cli/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-jammy +FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-jammy LABEL org.opencontainers.image.source=https://github.com/gitfool/Pulumi.Dungeon @@ -16,7 +16,7 @@ EOF # renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?.+)$ RUN < /etc/bash_completion.d/kubectl @@ -37,7 +37,7 @@ EOF # renovate: datasource=github-releases depName=helm packageName=helm/helm RUN < RunCommandAsync(this IHostBuilder hostBuilder, str commandApp.Configure(config => { config.SetApplicationName(Constants.AppName); + config.UseAssemblyInformationalVersion(); config.AddCommand("config"); config.AddCommand("deploy"); //config.PropagateExceptions(); diff --git a/Cli/config/_default.yaml b/Cli/config/_default.yaml index b1d25cf8..305dd950 100644 --- a/Cli/config/_default.yaml +++ b/Cli/config/_default.yaml @@ -70,7 +70,7 @@ Dungeon: FluentBitImageRepository: public.ecr.aws/aws-observability/aws-for-fluent-bit # renovate: # datasource=docker depName=aws-for-fluent-bit packageName=public.ecr.aws/aws-observability/aws-for-fluent-bit # renovate: datasource=github-releases depName=aws-for-fluent-bit packageName=aws/aws-for-fluent-bit - FluentBitImageTag: 2.32.0 + FluentBitImageTag: 2.32.2 Pulumi: Color: always diff --git a/Cli/packages.lock.json b/Cli/packages.lock.json index 9aa6e567..ef305aee 100644 --- a/Cli/packages.lock.json +++ b/Cli/packages.lock.json @@ -4,17 +4,17 @@ "net8.0": { "Json.More.Net": { "type": "Direct", - "requested": "[2.0.1, )", - "resolved": "2.0.1", - "contentHash": "k4yLP8ZgEeiFKodcOdqt4qscXZU69F/My5pRNNBox97mBHQwdfUdJDG8jmsLM99GDhPgE25iSxj2/NvMnstUOw==" + "requested": "[2.0.1.2, )", + "resolved": "2.0.1.2", + "contentHash": "uF3QeiaXEfH92emz0/BWUiNtMSfxIIvgynuB0Bf1vF4s8eWTcZitBx9l+g/FDaJk5XxqBv9buQXizXKQcXFG1w==" }, "JsonPath.Net": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "Y2ur7pm9mHn2CzdhL3jg9UJHLnYWFmOy5RRwhwXZUcBwGrMBoi8YqoZCaBgFL2sQ90CUlYWV9o5/uJ4Ye26lnQ==", + "requested": "[1.1.0, )", + "resolved": "1.1.0", + "contentHash": "Njbt3xuyiJ41zkut0nrKbHL7Hpxb39siV/KchPnXKVNGnhnYqIUmiWh653EfRK4lG8H+ds08bNrw5/3jl9ZC3A==", "dependencies": { - "Json.More.Net": "2.0.0" + "Json.More.Net": "2.0.1.2" } }, "Microsoft.Extensions.Hosting": { @@ -121,22 +121,22 @@ }, "Serilog.Sinks.Seq": { "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "GEi6SZnlhFGpzsWu/xit883Bn67vAssUItXIFsVTmyxaRL7h7Xk2/BUswoM/iqwOBJzj5P9xU4IBf/IAoVklPg==", + "requested": "[7.0.1, )", + "resolved": "7.0.1", + "contentHash": "OPvIafia4twjLtuAwnb+tkDro/Trm490n6T+KWIAk+rgGTOSlHZOcn9SexPUoIzBmx7klCe5tZ29pznmGV9wPQ==", "dependencies": { "Serilog": "3.1.1", "Serilog.Sinks.File": "5.0.0", - "Serilog.Sinks.PeriodicBatching": "4.0.0" + "Serilog.Sinks.PeriodicBatching": "4.1.0" } }, "Spectre.Console.Cli": { "type": "Direct", - "requested": "[0.48.0, )", - "resolved": "0.48.0", - "contentHash": "HNoDxAOTODQ9h+4K5Cs2caW8kIicRKw5SS4vgEEkJtnTp7/4XR8OIGvCjVi09w3m+xn4lTlkS0ENy2ktGz4HRw==", + "requested": "[0.49.1, )", + "resolved": "0.49.1", + "contentHash": "wBZzyEbKqfPFFUPhV5E7/k4Kwy4UDO42IVzvzk0C4Pkjjw+NSd0EOBkIutYET4vJY4X81pD9ooQO9gfBGXj4+g==", "dependencies": { - "Spectre.Console": "0.48.0" + "Spectre.Console": "0.49.1" } }, "Ben.Demystifier": { @@ -154,8 +154,8 @@ }, "FluentValidation": { "type": "Transitive", - "resolved": "11.9.0", - "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig==" + "resolved": "11.9.2", + "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg==" }, "Flurl": { "type": "Transitive", @@ -473,16 +473,16 @@ }, "Polly": { "type": "Transitive", - "resolved": "8.3.1", - "contentHash": "xN9AxOudus8u4a//Tfu6Wxd5Oj7S4pjh/651S6FfIiVrbxQ8TeM+ieZC8c0y7Qto70zKBM5g8rBTqbAJnbetOA==", + "resolved": "8.4.0", + "contentHash": "z2EeUutuy49jBQyZ5s2FUuTCGx3GCzJ0cJ2HbjWwks94TsC6bKTtAHKBkMZOa/DyYRl5yIX7MshvMTWl1J6RNg==", "dependencies": { - "Polly.Core": "8.3.1" + "Polly.Core": "8.4.0" } }, "Polly.Core": { "type": "Transitive", - "resolved": "8.3.1", - "contentHash": "b9mMAjqXuCXFCtf/RtRPwFUkAm/sz37s7G+taDvS5EqfkJsLiWfO2xO2cSISjIgIY+88oIZTGguP6UrRGRlqzg==" + "resolved": "8.4.0", + "contentHash": "3AZxuP//pxOeBo9tQs7/tz4Z5TTbu4BYfjpaXZD0JYKJo98ngN9TMUz1nybh4k0ykWkMBpGZALV/AmVIE3ew7A==" }, "Pulumi": { "type": "Transitive", @@ -539,8 +539,8 @@ }, "Scriban": { "type": "Transitive", - "resolved": "5.9.1", - "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ==" + "resolved": "5.10.0", + "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q==" }, "Semver": { "type": "Transitive", @@ -574,8 +574,8 @@ }, "Serilog.Sinks.PeriodicBatching": { "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "kxg6QLNA1sDVqYEE7/6hCr/Ur3imS+qaoEqriQh07WTU1/b6jknnuVN1rWQpj67JpwAXXTmgI3Js9IGGktgumQ==", + "resolved": "4.1.0", + "contentHash": "Hc5OWQJ/eqceg54KaCEkFOxqvKj8xXM1JfBtOPzPaLbi4PnoYLQt+H6f+4sKOh1G1/trzJCgZnb3VEPCGuzXgQ==", "dependencies": { "Serilog": "3.1.1", "System.Threading.Channels": "8.0.0" @@ -583,11 +583,8 @@ }, "Spectre.Console": { "type": "Transitive", - "resolved": "0.48.0", - "contentHash": "4Mc1UT7Azgtyb8FyNwK5FZmoZbKuT5PmY7ZwaKUytjD5kGFMNBACpOZTwYtkuY377YkYtZYBeDDTJUwTW86QXw==", - "dependencies": { - "System.Memory": "4.5.5" - } + "resolved": "0.49.1", + "contentHash": "USV+pdu49OJ3nCjxNuw1K9Zw/c1HCBbwbjXZp0EOn6wM99tFdAtN34KEBZUMyRuJuXlUMDqhd8Yq9obW2MslYA==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", @@ -601,8 +598,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" }, "System.Reflection.Metadata": { "type": "Transitive", @@ -629,8 +626,8 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "15.1.2", - "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA==" + "resolved": "15.1.6", + "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA==" }, "aws": { "type": "Project", @@ -650,7 +647,7 @@ "Flurl.Http": "[4.0.2, )", "Library": "[1.0.0, )", "Microsoft.Extensions.Options": "[8.0.2, )", - "Polly": "[8.3.1, )", + "Polly": "[8.4.0, )", "Pulumi": "[3.38.0, )", "Pulumi.Aws": "[5.11.0, )", "Pulumi.Kubernetes": "[3.20.5, )", @@ -660,14 +657,14 @@ "library": { "type": "Project", "dependencies": { - "FluentValidation": "[11.9.0, )", + "FluentValidation": "[11.9.2, )", "Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )", "Microsoft.Extensions.Options": "[8.0.2, )", "Pulumi": "[3.38.0, )", "Pulumi.Aws": "[5.11.0, )", "Pulumi.Kubernetes": "[3.20.5, )", - "Scriban": "[5.9.1, )", - "YamlDotNet": "[15.1.2, )" + "Scriban": "[5.10.0, )", + "YamlDotNet": "[15.1.6, )" } } } diff --git a/K8s/K8s.csproj b/K8s/K8s.csproj index dedbec23..b3a92da6 100644 --- a/K8s/K8s.csproj +++ b/K8s/K8s.csproj @@ -11,7 +11,7 @@ - + diff --git a/K8s/packages.lock.json b/K8s/packages.lock.json index 3754aca7..21df4b80 100644 --- a/K8s/packages.lock.json +++ b/K8s/packages.lock.json @@ -23,11 +23,11 @@ }, "Polly": { "type": "Direct", - "requested": "[8.3.1, )", - "resolved": "8.3.1", - "contentHash": "xN9AxOudus8u4a//Tfu6Wxd5Oj7S4pjh/651S6FfIiVrbxQ8TeM+ieZC8c0y7Qto70zKBM5g8rBTqbAJnbetOA==", + "requested": "[8.4.0, )", + "resolved": "8.4.0", + "contentHash": "z2EeUutuy49jBQyZ5s2FUuTCGx3GCzJ0cJ2HbjWwks94TsC6bKTtAHKBkMZOa/DyYRl5yIX7MshvMTWl1J6RNg==", "dependencies": { - "Polly.Core": "8.3.1" + "Polly.Core": "8.4.0" } }, "Pulumi": { @@ -84,8 +84,8 @@ }, "FluentValidation": { "type": "Transitive", - "resolved": "11.9.0", - "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig==" + "resolved": "11.9.2", + "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg==" }, "Flurl": { "type": "Transitive", @@ -157,8 +157,8 @@ }, "Polly.Core": { "type": "Transitive", - "resolved": "8.3.1", - "contentHash": "b9mMAjqXuCXFCtf/RtRPwFUkAm/sz37s7G+taDvS5EqfkJsLiWfO2xO2cSISjIgIY+88oIZTGguP6UrRGRlqzg==" + "resolved": "8.4.0", + "contentHash": "3AZxuP//pxOeBo9tQs7/tz4Z5TTbu4BYfjpaXZD0JYKJo98ngN9TMUz1nybh4k0ykWkMBpGZALV/AmVIE3ew7A==" }, "Pulumi.Protobuf": { "type": "Transitive", @@ -167,8 +167,8 @@ }, "Scriban": { "type": "Transitive", - "resolved": "5.9.1", - "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ==" + "resolved": "5.10.0", + "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q==" }, "Semver": { "type": "Transitive", @@ -209,20 +209,20 @@ }, "YamlDotNet": { "type": "Transitive", - "resolved": "15.1.2", - "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA==" + "resolved": "15.1.6", + "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA==" }, "library": { "type": "Project", "dependencies": { - "FluentValidation": "[11.9.0, )", + "FluentValidation": "[11.9.2, )", "Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )", "Microsoft.Extensions.Options": "[8.0.2, )", "Pulumi": "[3.38.0, )", "Pulumi.Aws": "[5.11.0, )", "Pulumi.Kubernetes": "[3.20.5, )", - "Scriban": "[5.9.1, )", - "YamlDotNet": "[15.1.2, )" + "Scriban": "[5.10.0, )", + "YamlDotNet": "[15.1.6, )" } } } diff --git a/Library/Library.csproj b/Library/Library.csproj index b8c00426..ea284c28 100644 --- a/Library/Library.csproj +++ b/Library/Library.csproj @@ -4,13 +4,13 @@ - + - - + + diff --git a/Library/packages.lock.json b/Library/packages.lock.json index 19b77e9d..0228cc24 100644 --- a/Library/packages.lock.json +++ b/Library/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "FluentValidation": { "type": "Direct", - "requested": "[11.9.0, )", - "resolved": "11.9.0", - "contentHash": "VneVlTvwYDkfHV5av3QrQ0amALgrLX6LV94wlYyEsh0B/klJBW7C8y2eAtj5tOZ3jH6CAVpr4s1ZGgew/QWyig==" + "requested": "[11.9.2, )", + "resolved": "11.9.2", + "contentHash": "XeHp9LvFvu1fsQ/NvDCymV02GOCB1nz7ZUhfpI3uMhCcHTkV1K5bMkv+Nc/kuNYyAsX5+5bcmUanIEMd5QN+Eg==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", @@ -64,15 +64,15 @@ }, "Scriban": { "type": "Direct", - "requested": "[5.9.1, )", - "resolved": "5.9.1", - "contentHash": "Er0jZCXrHXtk+nnzmHVEnmz1pjfU+VL3GppO0UjtCMoZ0Se1plyPe1OLb6gM7ToSRA7nu/QIcdRFr29x8w8rQQ==" + "requested": "[5.10.0, )", + "resolved": "5.10.0", + "contentHash": "qk2W8wQpm7mykWrEi9fhjC7uVapT2bkweMuMqebrF7gaVMt0WjmZzyVVTpom5cUsc3ddMDpo95SkNcTWGo+L6Q==" }, "YamlDotNet": { "type": "Direct", - "requested": "[15.1.2, )", - "resolved": "15.1.2", - "contentHash": "qeX0XhzOIcQEvnI5JxnPaIwcINwyY4Qy/LXhSfsdHkFrl9F41AT52UFfy2nIE7kgrhMg+cP7xuS+GtPJhmHmTA==" + "requested": "[15.1.6, )", + "resolved": "15.1.6", + "contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA==" }, "Ben.Demystifier": { "type": "Transitive",