Skip to content

Commit cd3927c

Browse files
gitfoolgitfool
authored
Merge pull request #107 from gitfool/renovate/minor
2 parents 712c9c8 + d901af1 commit cd3927c

13 files changed

+120
-122
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "3.0.0",
6+
"version": "3.1.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎.github/workflows/ci.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ jobs:
1919
container: dockfool/cake-docker:latest
2020
steps:
2121
- name: Checkout source
22-
uses: actions/checkout@v3.1.0
22+
uses: actions/checkout@v3.5.3
2323
with:
2424
fetch-depth: 0
2525
submodules: recursive
2626

2727
- name: Cache packages
28-
uses: actions/cache@v3.0.11
28+
uses: actions/cache@v3.3.1
2929
with:
3030
path: ${{ env.NUGET_PACKAGES }}
3131
key: ${{ runner.os }}-nuget-${{ hashFiles('.config/dotnet-tools.json', '**/packages.lock.json') }}
3232
restore-keys: ${{ runner.os }}-nuget-
3333

3434
- name: Docker login
3535
if: github.event_name != 'pull_request'
36-
uses: docker/login-action@v2.1.0
36+
uses: docker/login-action@v2.2.0
3737
with:
3838
username: ${{ secrets.DOCKER_USERNAME }}
3939
password: ${{ secrets.DOCKER_TOKEN }}
4040

4141
- name: Setup buildx
42-
uses: docker/setup-buildx-action@v2.2.1
42+
uses: docker/setup-buildx-action@v2.9.1
4343

4444
- name: Export runtime
45-
uses: crazy-max/ghaction-github-runtime@v2.1.0
45+
uses: crazy-max/ghaction-github-runtime@v2.2.0
4646

4747
- name: Cake build
4848
run: dotnet tool restore && dotnet cake --verbosity=verbose --publish=true

‎Aws/Aws.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="IPNetwork2" Version="2.6.508" />
14-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
13+
<PackageReference Include="IPNetwork2" Version="2.6.601" />
14+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
1515
<PackageReference Include="Pulumi" Version="3.38.0" />
1616
<PackageReference Include="Pulumi.Aws" Version="5.11.0" />
1717
<PackageReference Include="Pulumi.Tls" Version="4.6.0" />

‎Aws/packages.lock.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"net7.0": {
55
"IPNetwork2": {
66
"type": "Direct",
7-
"requested": "[2.6.508, )",
8-
"resolved": "2.6.508",
9-
"contentHash": "gbD4m/i7VtBUaoGil1XWHO7LdJuT51bWAqdktZtPAPNawKmJrnWLsBui8QMzwBmq2LxX+Vv9/ryUCd/R0sXkWA=="
7+
"requested": "[2.6.601, )",
8+
"resolved": "2.6.601",
9+
"contentHash": "PwC++T7I0Hm+579BcuCConvxz8QDaCop6a7bCoUHIjEt+bwUMN+cvulqu4Ga9SZsSOn2RBXMJBuqFwru8fSbXQ=="
1010
},
1111
"Microsoft.Extensions.Options": {
1212
"type": "Direct",
13-
"requested": "[7.0.0, )",
14-
"resolved": "7.0.0",
15-
"contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==",
13+
"requested": "[7.0.1, )",
14+
"resolved": "7.0.1",
15+
"contentHash": "pZRDYdN1FpepOIfHU62QoBQ6zdAoTvnjxFfqAzEd9Jhb2dfhA5i6jeTdgGgcgTWFRC7oT0+3XrbQu4LjvgX1Nw==",
1616
"dependencies": {
1717
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
1818
"Microsoft.Extensions.Primitives": "7.0.0"
@@ -72,8 +72,8 @@
7272
},
7373
"FluentValidation": {
7474
"type": "Transitive",
75-
"resolved": "11.3.0",
76-
"contentHash": "AlsfUkdIzSMA2v091K0gT1YjEwc7YR5pIA5yq7PnZivhoH3YETMhZbUySzsLbJKhj/E3ei6nEgtqdm00AVHXeg=="
75+
"resolved": "11.7.1",
76+
"contentHash": "w9Al4gls6iVGFbTd/NPOPlwzqDTghH+ntL4c4FYUatc+LeybpIwhYArLykZJP/VjF2n3ihj3ws+1yd7KR5lQlg=="
7777
},
7878
"Flurl": {
7979
"type": "Transitive",
@@ -142,8 +142,8 @@
142142
},
143143
"Microsoft.Extensions.Logging.Abstractions": {
144144
"type": "Transitive",
145-
"resolved": "7.0.0",
146-
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
145+
"resolved": "7.0.1",
146+
"contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA=="
147147
},
148148
"Microsoft.Extensions.Primitives": {
149149
"type": "Transitive",
@@ -172,8 +172,8 @@
172172
},
173173
"Polly": {
174174
"type": "Transitive",
175-
"resolved": "7.2.3",
176-
"contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ=="
175+
"resolved": "7.2.4",
176+
"contentHash": "bw00Ck5sh6ekduDE3mnCo1ohzuad946uslCDEENu3091+6UKnBuKLo4e+yaNcCzXxOZCXWY2gV4a35+K1d4LDA=="
177177
},
178178
"Pulumi.Kubernetes": {
179179
"type": "Transitive",
@@ -199,8 +199,8 @@
199199
},
200200
"Scriban": {
201201
"type": "Transitive",
202-
"resolved": "5.5.1",
203-
"contentHash": "ZGCDgKwyx0pPp5p8lsqBDLlOQR5qTVhD/hgVmdL1K8ReyCDdPxhvUUmzdFhBsPxGEqyDwG8dIEQ8BynzR3trpw=="
202+
"resolved": "5.7.0",
203+
"contentHash": "sSjmrKmvin85FDVb2W63IDkUK5BgKY+ZnuCuwF8KRfcREB9f3dJZA58TgV052vzYxadlro4kAZv4jBP1tonaaQ=="
204204
},
205205
"Semver": {
206206
"type": "Transitive",
@@ -263,8 +263,8 @@
263263
"dependencies": {
264264
"Flurl.Http": "[3.2.4, )",
265265
"Library": "[1.0.0, )",
266-
"Microsoft.Extensions.Options": "[7.0.0, )",
267-
"Polly": "[7.2.3, )",
266+
"Microsoft.Extensions.Options": "[7.0.1, )",
267+
"Polly": "[7.2.4, )",
268268
"Pulumi": "[3.38.0, )",
269269
"Pulumi.Aws": "[5.11.0, )",
270270
"Pulumi.Kubernetes": "[3.20.5, )",
@@ -274,13 +274,13 @@
274274
"library": {
275275
"type": "Project",
276276
"dependencies": {
277-
"FluentValidation": "[11.3.0, )",
278-
"Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
279-
"Microsoft.Extensions.Options": "[7.0.0, )",
277+
"FluentValidation": "[11.7.1, )",
278+
"Microsoft.Extensions.Logging.Abstractions": "[7.0.1, )",
279+
"Microsoft.Extensions.Options": "[7.0.1, )",
280280
"Pulumi": "[3.38.0, )",
281281
"Pulumi.Aws": "[5.11.0, )",
282282
"Pulumi.Kubernetes": "[3.20.5, )",
283-
"Scriban": "[5.5.1, )",
283+
"Scriban": "[5.7.0, )",
284284
"YamlDotNet": "[13.1.1, )"
285285
}
286286
}

‎Cli/Cli.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Json.More.Net" Version="1.7.0" />
33-
<PackageReference Include="JsonPath.Net" Version="0.2.1" />
34-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
32+
<PackageReference Include="Json.More.Net" Version="1.8.0" />
33+
<PackageReference Include="JsonPath.Net" Version="0.6.4" />
34+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
35+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
3636
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
3737
<PackageReference Include="Pulumi.Automation" Version="3.38.0" />
3838
<PackageReference Include="Serilog" Version="3.0.1" />
3939
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
4040
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
4141
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
4242
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
43-
<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
43+
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
4444
</ItemGroup>
4545

4646
<ItemGroup>

‎Cli/DeployCommand.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ async Task UnprotectResources()
144144
var exportState = await stack.ExportStackAsync();
145145
var json = await RepairStackAsync(exportState.Json.GetRawText());
146146
var importState = StackDeployment.FromJsonString(json);
147-
var jsonPath = JsonPath.Parse("$.deployment.pending_operations[*].resource.urn").Evaluate(importState.Json);
147+
var jsonPath = JsonPath.Parse("$.deployment.pending_operations[*].resource.urn").Evaluate(importState.Json.AsNode());
148148
if (importState.Json.IsEquivalentTo(exportState.Json))
149149
{
150150
Logger.LogWarning("Repaired stack resources ignored (equivalent)");
@@ -158,7 +158,7 @@ async Task UnprotectResources()
158158
Logger.LogWarning("Repaired stack resources ignored (pending resources):");
159159
foreach (var match in jsonPath.Matches)
160160
{
161-
Logger.LogWarning(match.Value.ToString());
161+
Logger.LogWarning(match.Value!.ToString());
162162
}
163163
}
164164
else

‎Cli/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EOF
1616
# renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?<version>.+)$
1717
RUN <<EOF
1818
set -ex
19-
version=1.25.4
19+
version=1.27.4
2020
curl -fsSL https://storage.googleapis.com/kubernetes-release/release/v$version/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl
2121
chmod +x /usr/local/bin/kubectl
2222
kubectl completion bash > /etc/bash_completion.d/kubectl
@@ -27,7 +27,7 @@ EOF
2727
# renovate: datasource=github-releases depName=aws-iam-authenticator packageName=kubernetes-sigs/aws-iam-authenticator
2828
RUN <<EOF
2929
set -ex
30-
version=0.5.11
30+
version=0.6.11
3131
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
3232
chmod +x /usr/local/bin/aws-iam-authenticator
3333
aws-iam-authenticator version
@@ -37,7 +37,7 @@ EOF
3737
# renovate: datasource=github-releases depName=helm packageName=helm/helm
3838
RUN <<EOF
3939
set -ex
40-
version=3.10.2
40+
version=3.12.3
4141
curl -fsSL https://get.helm.sh/helm-v$version-linux-amd64.tar.gz -o helm.tar.gz
4242
tar -xzf helm.tar.gz --directory /usr/local/bin --no-same-owner --strip=1 linux-amd64/helm
4343
rm -f helm.tar.gz

‎Cli/config/_default.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Dungeon:
7070
FluentBitImageRepository: public.ecr.aws/aws-observability/aws-for-fluent-bit
7171
# renovate: # datasource=docker depName=aws-for-fluent-bit packageName=public.ecr.aws/aws-observability/aws-for-fluent-bit
7272
# renovate: datasource=github-releases depName=aws-for-fluent-bit packageName=aws/aws-for-fluent-bit
73-
FluentBitImageTag: 2.28.4
73+
FluentBitImageTag: 2.31.12
7474

7575
Pulumi:
7676
Color: always

0 commit comments

Comments
 (0)