Merge pull request #107 from gitfool/renovate/minor

gitfool · Aug 14, 2023 · cd3927c · cd3927c
2 parents 712c9c8 + d901af1
commit cd3927c
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 122 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.0.0",
+      "version": "3.1.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,30 +19,30 @@ jobs:
     container: dockfool/cake-docker:latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
           submodules: recursive
 
       - name: Cache packages
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v3.3.1
         with:
           path: ${{ env.NUGET_PACKAGES }}
           key: ${{ runner.os }}-nuget-${{ hashFiles('.config/dotnet-tools.json', '**/packages.lock.json') }}
           restore-keys: ${{ runner.os }}-nuget-
 
       - name: Docker login
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Setup buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Export runtime
-        uses: crazy-max/ghaction-github-runtime@v2.1.0
+        uses: crazy-max/ghaction-github-runtime@v2.2.0
 
       - name: Cake build
         run: dotnet tool restore && dotnet cake --verbosity=verbose --publish=true
diff --git a/Aws/Aws.csproj b/Aws/Aws.csproj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IPNetwork2" Version="2.6.508" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="IPNetwork2" Version="2.6.601" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Pulumi" Version="3.38.0" />
     <PackageReference Include="Pulumi.Aws" Version="5.11.0" />
     <PackageReference Include="Pulumi.Tls" Version="4.6.0" />

diff --git a/Aws/packages.lock.json b/Aws/packages.lock.json
@@ -4,15 +4,15 @@
     "net7.0": {
       "IPNetwork2": {
         "type": "Direct",
-        "requested": "[2.6.508, )",
-        "resolved": "2.6.508",
-        "contentHash": "gbD4m/i7VtBUaoGil1XWHO7LdJuT51bWAqdktZtPAPNawKmJrnWLsBui8QMzwBmq2LxX+Vv9/ryUCd/R0sXkWA=="
+        "requested": "[2.6.601, )",
+        "resolved": "2.6.601",
+        "contentHash": "PwC++T7I0Hm+579BcuCConvxz8QDaCop6a7bCoUHIjEt+bwUMN+cvulqu4Ga9SZsSOn2RBXMJBuqFwru8fSbXQ=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Direct",
-        "requested": "[7.0.0, )",
-        "resolved": "7.0.0",
-        "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
+        "requested": "[7.0.1, )",
+        "resolved": "7.0.1",
+        "contentHash": "pZRDYdN1FpepOIfHU62QoBQ6zdAoTvnjxFfqAzEd9Jhb2dfhA5i6jeTdgGgcgTWFRC7oT0+3XrbQu4LjvgX1Nw==",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
           "Microsoft.Extensions.Primitives": "7.0.0"
@@ -72,8 +72,8 @@
       },
       "FluentValidation": {
         "type": "Transitive",
-        "resolved": "11.3.0",
-        "contentHash": "AlsfUkdIzSMA2v091K0gT1YjEwc7YR5pIA5yq7PnZivhoH3YETMhZbUySzsLbJKhj/E3ei6nEgtqdm00AVHXeg=="
+        "resolved": "11.7.1",
+        "contentHash": "w9Al4gls6iVGFbTd/NPOPlwzqDTghH+ntL4c4FYUatc+LeybpIwhYArLykZJP/VjF2n3ihj3ws+1yd7KR5lQlg=="
       },
       "Flurl": {
         "type": "Transitive",
@@ -142,8 +142,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "7.0.0",
-        "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
+        "resolved": "7.0.1",
+        "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA=="
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
@@ -172,8 +172,8 @@
       },
       "Polly": {
         "type": "Transitive",
-        "resolved": "7.2.3",
-        "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
+        "resolved": "7.2.4",
+        "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
       },
       "Pulumi.Kubernetes": {
         "type": "Transitive",
@@ -199,8 +199,8 @@
       },
       "Scriban": {
         "type": "Transitive",
-        "resolved": "5.5.1",
-        "contentHash": "ZGCDgKwyx0pPp5p8lsqBDLlOQR5qTVhD/hgVmdL1K8ReyCDdPxhvUUmzdFhBsPxGEqyDwG8dIEQ8BynzR3trpw=="
+        "resolved": "5.7.0",
+        "contentHash": "sSjmrKmvin85FDVb2W63IDkUK5BgKY+ZnuCuwF8KRfcREB9f3dJZA58TgV052vzYxadlro4kAZv4jBP1tonaaQ=="
       },
       "Semver": {
         "type": "Transitive",
@@ -263,8 +263,8 @@
         "dependencies": {
           "Flurl.Http": "[3.2.4, )",
           "Library": "[1.0.0, )",
-          "Microsoft.Extensions.Options": "[7.0.0, )",
-          "Polly": "[7.2.3, )",
+          "Microsoft.Extensions.Options": "[7.0.1, )",
+          "Polly": "[7.2.4, )",
           "Pulumi": "[3.38.0, )",
           "Pulumi.Aws": "[5.11.0, )",
           "Pulumi.Kubernetes": "[3.20.5, )",
@@ -274,13 +274,13 @@
       "library": {
         "type": "Project",
         "dependencies": {
-          "FluentValidation": "[11.3.0, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Microsoft.Extensions.Options": "[7.0.0, )",
+          "FluentValidation": "[11.7.1, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[7.0.1, )",
+          "Microsoft.Extensions.Options": "[7.0.1, )",
           "Pulumi": "[3.38.0, )",
           "Pulumi.Aws": "[5.11.0, )",
           "Pulumi.Kubernetes": "[3.20.5, )",
-          "Scriban": "[5.5.1, )",
+          "Scriban": "[5.7.0, )",
           "YamlDotNet": "[13.1.1, )"
         }
       }

diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj
@@ -29,18 +29,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Json.More.Net" Version="1.7.0" />
-    <PackageReference Include="JsonPath.Net" Version="0.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Json.More.Net" Version="1.8.0" />
+    <PackageReference Include="JsonPath.Net" Version="0.6.4" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
     <PackageReference Include="Pulumi.Automation" Version="3.38.0" />
     <PackageReference Include="Serilog" Version="3.0.1" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Cli/DeployCommand.cs b/Cli/DeployCommand.cs
@@ -144,7 +144,7 @@ async Task UnprotectResources()
                     var exportState = await stack.ExportStackAsync();
                     var json = await RepairStackAsync(exportState.Json.GetRawText());
                     var importState = StackDeployment.FromJsonString(json);
-                    var jsonPath = JsonPath.Parse("$.deployment.pending_operations[*].resource.urn").Evaluate(importState.Json);
+                    var jsonPath = JsonPath.Parse("$.deployment.pending_operations[*].resource.urn").Evaluate(importState.Json.AsNode());
                     if (importState.Json.IsEquivalentTo(exportState.Json))
                     {
                         Logger.LogWarning("Repaired stack resources ignored (equivalent)");
@@ -158,7 +158,7 @@ async Task UnprotectResources()
                         Logger.LogWarning("Repaired stack resources ignored (pending resources):");
                         foreach (var match in jsonPath.Matches)
                         {
-                            Logger.LogWarning(match.Value.ToString());
+                            Logger.LogWarning(match.Value!.ToString());
                         }
                     }
                     else

diff --git a/Cli/Dockerfile b/Cli/Dockerfile
@@ -16,7 +16,7 @@ EOF
 # renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?<version>.+)$
 RUN <<EOF
     set -ex
-    version=1.25.4
+    version=1.27.4
     curl -fsSL https://storage.googleapis.com/kubernetes-release/release/v$version/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl
     chmod +x /usr/local/bin/kubectl
     kubectl completion bash > /etc/bash_completion.d/kubectl
@@ -27,7 +27,7 @@ EOF
 # renovate: datasource=github-releases depName=aws-iam-authenticator packageName=kubernetes-sigs/aws-iam-authenticator
 RUN <<EOF
     set -ex
-    version=0.5.11
+    version=0.6.11
     curl -fsSL https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v$version/aws-iam-authenticator_${version}_linux_amd64 -o /usr/local/bin/aws-iam-authenticator
     chmod +x /usr/local/bin/aws-iam-authenticator
     aws-iam-authenticator version
@@ -37,7 +37,7 @@ EOF
 # renovate: datasource=github-releases depName=helm packageName=helm/helm
 RUN <<EOF
     set -ex
-    version=3.10.2
+    version=3.12.3
     curl -fsSL https://get.helm.sh/helm-v$version-linux-amd64.tar.gz -o helm.tar.gz
     tar -xzf helm.tar.gz --directory /usr/local/bin --no-same-owner --strip=1 linux-amd64/helm
     rm -f helm.tar.gz

diff --git 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.28.4
+      FluentBitImageTag: 2.31.12
 
   Pulumi:
     Color: always