From 1f8b467fde4457046b775d27e6df5d6f1b3afa0e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 03:58:49 +0000 Subject: [PATCH 1/2] Bump dependencies --- .config/dotnet-tools.json | 2 +- .github/workflows/ci.yaml | 10 ++-- Aws/Aws.csproj | 4 +- Aws/packages.lock.json | 40 ++++++++-------- Cli/Cli.csproj | 10 ++-- Cli/Dockerfile | 6 +-- Cli/config/_default.yaml | 2 +- Cli/packages.lock.json | 96 +++++++++++++++++++------------------- K8s/K8s.csproj | 4 +- K8s/packages.lock.json | 32 ++++++------- Library/Library.csproj | 8 ++-- Library/packages.lock.json | 24 +++++----- 12 files changed, 118 insertions(+), 120 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 831d039b..8f3a4382 100644 --- 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 index adf91a35..4f88cc08 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,13 +19,13 @@ 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') }} @@ -33,16 +33,16 @@ jobs: - 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 index 52e11776..b856a5e6 100644 --- a/Aws/Aws.csproj +++ b/Aws/Aws.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/Aws/packages.lock.json b/Aws/packages.lock.json index 42de7719..e7772784 100644 --- 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 index e54cec0f..0fda54d9 100644 --- a/Cli/Cli.csproj +++ b/Cli/Cli.csproj @@ -29,10 +29,10 @@ - - - - + + + + @@ -40,7 +40,7 @@ - + diff --git a/Cli/Dockerfile b/Cli/Dockerfile index 3baebd10..e17424a0 100644 --- a/Cli/Dockerfile +++ b/Cli/Dockerfile @@ -16,7 +16,7 @@ EOF # renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?.+)$ RUN < /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 < - - + + diff --git a/K8s/packages.lock.json b/K8s/packages.lock.json index f11c4f55..f6599008 100644 --- a/K8s/packages.lock.json +++ b/K8s/packages.lock.json @@ -15,9 +15,9 @@ }, "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" @@ -35,9 +35,9 @@ }, "Polly": { "type": "Direct", - "requested": "[7.2.3, )", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + "requested": "[7.2.4, )", + "resolved": "7.2.4", + "contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA==" }, "Pulumi": { "type": "Direct", @@ -93,8 +93,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", @@ -153,8 +153,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", @@ -188,8 +188,8 @@ }, "Scriban": { "type": "Transitive", - "resolved": "5.5.1", - "contentHash": "ZGCDgKwyx0pPp5p8lsqBDLlOQR5qTVhD/hgVmdL1K8ReyCDdPxhvUUmzdFhBsPxGEqyDwG8dIEQ8BynzR3trpw==" + "resolved": "5.7.0", + "contentHash": "sSjmrKmvin85FDVb2W63IDkUK5BgKY+ZnuCuwF8KRfcREB9f3dJZA58TgV052vzYxadlro4kAZv4jBP1tonaaQ==" }, "Semver": { "type": "Transitive", @@ -250,13 +250,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/Library/Library.csproj b/Library/Library.csproj index 3ce6f6d4..ddd2f54c 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 ef5e4a30..cc8e8985 100644 --- a/Library/packages.lock.json +++ b/Library/packages.lock.json @@ -4,21 +4,21 @@ "net7.0": { "FluentValidation": { "type": "Direct", - "requested": "[11.3.0, )", - "resolved": "11.3.0", - "contentHash": "AlsfUkdIzSMA2v091K0gT1YjEwc7YR5pIA5yq7PnZivhoH3YETMhZbUySzsLbJKhj/E3ei6nEgtqdm00AVHXeg==" + "requested": "[11.7.1, )", + "resolved": "11.7.1", + "contentHash": "w9Al4gls6iVGFbTd/NPOPlwzqDTghH+ntL4c4FYUatc+LeybpIwhYArLykZJP/VjF2n3ihj3ws+1yd7KR5lQlg==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==" + "requested": "[7.0.1, )", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==" }, "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" @@ -71,9 +71,9 @@ }, "Scriban": { "type": "Direct", - "requested": "[5.5.1, )", - "resolved": "5.5.1", - "contentHash": "ZGCDgKwyx0pPp5p8lsqBDLlOQR5qTVhD/hgVmdL1K8ReyCDdPxhvUUmzdFhBsPxGEqyDwG8dIEQ8BynzR3trpw==" + "requested": "[5.7.0, )", + "resolved": "5.7.0", + "contentHash": "sSjmrKmvin85FDVb2W63IDkUK5BgKY+ZnuCuwF8KRfcREB9f3dJZA58TgV052vzYxadlro4kAZv4jBP1tonaaQ==" }, "YamlDotNet": { "type": "Direct", From d901af176a42a1f464316bb656b436b26a56bf09 Mon Sep 17 00:00:00 2001 From: Sean Fausett Date: Mon, 14 Aug 2023 14:55:58 +1200 Subject: [PATCH 2/2] Fix json path evaluate --- Cli/DeployCommand.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cli/DeployCommand.cs b/Cli/DeployCommand.cs index 0e88b35b..59f72532 100644 --- 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