Skip to content

Commit 29578eb

Browse files
waldekmastykarzwaldekmastykarz
authored
Merge branch 'main' into reload-twice
2 parents 6b67c58 + 6b7f87b commit 29578eb

38 files changed

+403
-218
lines changed

‎.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL
56-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
56+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
5757
with:
5858
languages: ${{ matrix.language }}
5959
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,4 +81,4 @@ jobs:
8181
run: dotnet build --no-restore -c Release
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
84+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16

‎.github/workflows/create-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
contents: write
201201
steps:
202202
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
203-
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
203+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
204204
with:
205205
path: output
206206
- name: Release
@@ -259,7 +259,7 @@ jobs:
259259
- name: Build and push Docker image
260260
if: "!contains(github.ref_name, '-beta')"
261261
id: push
262-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
262+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
263263
with:
264264
context: .
265265
push: true
@@ -272,7 +272,7 @@ jobs:
272272
- name: Build and push beta Docker image
273273
if: contains(github.ref_name, '-beta')
274274
id: push_beta
275-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
275+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
276276
with:
277277
context: .
278278
file: ./Dockerfile_beta

‎dev-proxy-plugins/dev-proxy-plugins.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Private>false</Private>
4343
<ExcludeAssets>runtime</ExcludeAssets>
4444
</PackageReference>
45-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.8.0">
45+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0">
4646
<Private>false</Private>
4747
<ExcludeAssets>runtime</ExcludeAssets>
4848
</PackageReference>

‎dev-proxy-plugins/packages.lock.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
},
7272
"System.IdentityModel.Tokens.Jwt": {
7373
"type": "Direct",
74-
"requested": "[8.8.0, )",
75-
"resolved": "8.8.0",
76-
"contentHash": "/oIQ5jhVxpzutFOPYIxmvkVMCLLDwpN0CLcXjyxPflVRQGZRYi5x2IqHeJw+xJ2k2HUPmeTaM18La5wDbhJcQA==",
74+
"requested": "[8.9.0, )",
75+
"resolved": "8.9.0",
76+
"contentHash": "7Pu9UjF1+so0s8zgzcIxSxbRQoiM2DMdwazVGmNptX3O6gDfMyeWZBd/Zn6VueDteN0ZTHw2acsf6+mAe8UpMw==",
7777
"dependencies": {
78-
"Microsoft.IdentityModel.JsonWebTokens": "8.8.0",
79-
"Microsoft.IdentityModel.Tokens": "8.8.0"
78+
"Microsoft.IdentityModel.JsonWebTokens": "8.9.0",
79+
"Microsoft.IdentityModel.Tokens": "8.9.0"
8080
}
8181
},
8282
"Unobtanium.Web.Proxy": {
@@ -322,23 +322,23 @@
322322
},
323323
"Microsoft.IdentityModel.Abstractions": {
324324
"type": "Transitive",
325-
"resolved": "8.8.0",
326-
"contentHash": "0lKw+f3vkmV9t3PLe6sY3xPrYrHYiMRFxuOse5CMkKPxhQYiabpfJsuk6wX2RrVQ86Dn+t/8poHpH0nbp6sFvA=="
325+
"resolved": "8.9.0",
326+
"contentHash": "b/87S+lb86U7Ns7xgTKnqql6XGNr8hBE+k0rj5sRWwXeJe6uA+3mSjvpZ9GoQo3cB9zlwzcbGBU8KM44qX0t1g=="
327327
},
328328
"Microsoft.IdentityModel.JsonWebTokens": {
329329
"type": "Transitive",
330-
"resolved": "8.8.0",
331-
"contentHash": "lepOkZZTMfJCPSnWITXxV+4Wxb54g+9oIybs9YovlOzZWuR1i2DOpzaDgSe+piDJaGtnSrcUlcB9fZ5Swur7Uw==",
330+
"resolved": "8.9.0",
331+
"contentHash": "QcNC57hJLc6LIcy2PTYlD8iRBQBm6bqPKbCjsRYWlp7QTyJisF0ImUWaa3mx6wWaS1upwYneYVPiIiNSlAy16g==",
332332
"dependencies": {
333-
"Microsoft.IdentityModel.Tokens": "8.8.0"
333+
"Microsoft.IdentityModel.Tokens": "8.9.0"
334334
}
335335
},
336336
"Microsoft.IdentityModel.Logging": {
337337
"type": "Transitive",
338-
"resolved": "8.8.0",
339-
"contentHash": "sUyoxzg/WBZobbFLJK8loT9IILKtS9ePmWu5B11ogQqhSHppE6SRZKw0fhI6Fd16X6ey52cbbWc2rvMBC98EQA==",
338+
"resolved": "8.9.0",
339+
"contentHash": "rswvH4ZANbFsJYEn+PGEOj7nkkBRjnsb7LcYGAS16VUJpSeKULLeYSy/7SK6jLO1WTT12xqdeL4mj3dYT7GdoQ==",
340340
"dependencies": {
341-
"Microsoft.IdentityModel.Abstractions": "8.8.0"
341+
"Microsoft.IdentityModel.Abstractions": "8.9.0"
342342
}
343343
},
344344
"Microsoft.IdentityModel.Protocols": {
@@ -351,11 +351,11 @@
351351
},
352352
"Microsoft.IdentityModel.Tokens": {
353353
"type": "Transitive",
354-
"resolved": "8.8.0",
355-
"contentHash": "09hnbUJh/18gUmu5nCVFMvyzAFC4l1qyc4bwSJaKzUBqHN7aNDwmSx8dE3/MMJImbvnKq9rEtkkgnrS/OUBtjA==",
354+
"resolved": "8.9.0",
355+
"contentHash": "qK6kW5qZvDj7E5RLWQ9gzJxQe5GUz7+7bXrLQQydSDF9hTf5Ip2qHuAQW3Fg9GND6jkjTr7IXAZFmBHadNQi4Q==",
356356
"dependencies": {
357357
"Microsoft.Extensions.Logging.Abstractions": "8.0.2",
358-
"Microsoft.IdentityModel.Logging": "8.8.0"
358+
"Microsoft.IdentityModel.Logging": "8.9.0"
359359
}
360360
},
361361
"Microsoft.OpenApi.Readers": {

‎dev-proxy/dev-proxy.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
4343
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
4444
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
45-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.8.0" />
45+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0" />
4646
<PackageReference Include="Unobtanium.Web.Proxy" Version="0.1.5" />
4747
</ItemGroup>
4848

‎dev-proxy/packages.lock.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@
132132
},
133133
"System.IdentityModel.Tokens.Jwt": {
134134
"type": "Direct",
135-
"requested": "[8.8.0, )",
136-
"resolved": "8.8.0",
137-
"contentHash": "/oIQ5jhVxpzutFOPYIxmvkVMCLLDwpN0CLcXjyxPflVRQGZRYi5x2IqHeJw+xJ2k2HUPmeTaM18La5wDbhJcQA==",
135+
"requested": "[8.9.0, )",
136+
"resolved": "8.9.0",
137+
"contentHash": "7Pu9UjF1+so0s8zgzcIxSxbRQoiM2DMdwazVGmNptX3O6gDfMyeWZBd/Zn6VueDteN0ZTHw2acsf6+mAe8UpMw==",
138138
"dependencies": {
139-
"Microsoft.IdentityModel.JsonWebTokens": "8.8.0",
140-
"Microsoft.IdentityModel.Tokens": "8.8.0"
139+
"Microsoft.IdentityModel.JsonWebTokens": "8.9.0",
140+
"Microsoft.IdentityModel.Tokens": "8.9.0"
141141
}
142142
},
143143
"Unobtanium.Web.Proxy": {
@@ -396,23 +396,23 @@
396396
},
397397
"Microsoft.IdentityModel.Abstractions": {
398398
"type": "Transitive",
399-
"resolved": "8.8.0",
400-
"contentHash": "0lKw+f3vkmV9t3PLe6sY3xPrYrHYiMRFxuOse5CMkKPxhQYiabpfJsuk6wX2RrVQ86Dn+t/8poHpH0nbp6sFvA=="
399+
"resolved": "8.9.0",
400+
"contentHash": "b/87S+lb86U7Ns7xgTKnqql6XGNr8hBE+k0rj5sRWwXeJe6uA+3mSjvpZ9GoQo3cB9zlwzcbGBU8KM44qX0t1g=="
401401
},
402402
"Microsoft.IdentityModel.JsonWebTokens": {
403403
"type": "Transitive",
404-
"resolved": "8.8.0",
405-
"contentHash": "lepOkZZTMfJCPSnWITXxV+4Wxb54g+9oIybs9YovlOzZWuR1i2DOpzaDgSe+piDJaGtnSrcUlcB9fZ5Swur7Uw==",
404+
"resolved": "8.9.0",
405+
"contentHash": "QcNC57hJLc6LIcy2PTYlD8iRBQBm6bqPKbCjsRYWlp7QTyJisF0ImUWaa3mx6wWaS1upwYneYVPiIiNSlAy16g==",
406406
"dependencies": {
407-
"Microsoft.IdentityModel.Tokens": "8.8.0"
407+
"Microsoft.IdentityModel.Tokens": "8.9.0"
408408
}
409409
},
410410
"Microsoft.IdentityModel.Logging": {
411411
"type": "Transitive",
412-
"resolved": "8.8.0",
413-
"contentHash": "sUyoxzg/WBZobbFLJK8loT9IILKtS9ePmWu5B11ogQqhSHppE6SRZKw0fhI6Fd16X6ey52cbbWc2rvMBC98EQA==",
412+
"resolved": "8.9.0",
413+
"contentHash": "rswvH4ZANbFsJYEn+PGEOj7nkkBRjnsb7LcYGAS16VUJpSeKULLeYSy/7SK6jLO1WTT12xqdeL4mj3dYT7GdoQ==",
414414
"dependencies": {
415-
"Microsoft.IdentityModel.Abstractions": "8.8.0"
415+
"Microsoft.IdentityModel.Abstractions": "8.9.0"
416416
}
417417
},
418418
"Microsoft.IdentityModel.Protocols": {
@@ -425,11 +425,11 @@
425425
},
426426
"Microsoft.IdentityModel.Tokens": {
427427
"type": "Transitive",
428-
"resolved": "8.8.0",
429-
"contentHash": "09hnbUJh/18gUmu5nCVFMvyzAFC4l1qyc4bwSJaKzUBqHN7aNDwmSx8dE3/MMJImbvnKq9rEtkkgnrS/OUBtjA==",
428+
"resolved": "8.9.0",
429+
"contentHash": "qK6kW5qZvDj7E5RLWQ9gzJxQe5GUz7+7bXrLQQydSDF9hTf5Ip2qHuAQW3Fg9GND6jkjTr7IXAZFmBHadNQi4Q==",
430430
"dependencies": {
431431
"Microsoft.Extensions.Logging.Abstractions": "8.0.2",
432-
"Microsoft.IdentityModel.Logging": "8.8.0"
432+
"Microsoft.IdentityModel.Logging": "8.9.0"
433433
}
434434
},
435435
"Microsoft.OpenApi": {

‎schemas/v0.27.0/apicenterminimalpermissionsplugin.schema.json

+11-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@
44
"type": "object",
55
"properties": {
66
"$schema": {
7-
"type": "string"
7+
"type": "string",
8+
"description": "The JSON schema reference for validation."
89
},
910
"resourceGroupName": {
10-
"type": "string"
11+
"type": "string",
12+
"description": "Name of the resource group where the Azure API Center is located."
1113
},
1214
"serviceName": {
13-
"type": "string"
15+
"type": "string",
16+
"description": "Name of the Azure API Center instance that Dev Proxy should use to check if the APIs used in the app are registered."
1417
},
1518
"subscriptionId": {
16-
"type": "string"
19+
"type": "string",
20+
"description": "ID of the Azure subscription where the Azure API Center instance is located."
1721
},
1822
"workspace": {
19-
"type": "string"
23+
"type": "string",
24+
"description": "Name of the Azure API Center workspace to use. Default is 'default'.",
25+
"default": "default"
2026
}
2127
},
2228
"required": [

‎schemas/v0.27.0/apicenteronboardingplugin.schema.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@
44
"type": "object",
55
"properties": {
66
"$schema": {
7-
"type": "string"
7+
"type": "string",
8+
"description": "The JSON schema reference for validation."
89
},
910
"createApicEntryForNewApis": {
10-
"type": "boolean"
11+
"type": "boolean",
12+
"description": "Set to true to have Dev Proxy create new API entries for APIs detected but not yet registered in API Center. When false, Dev Proxy only lists unregistered APIs. Default is true."
1113
},
1214
"resourceGroupName": {
13-
"type": "string"
15+
"type": "string",
16+
"description": "Name of the resource group where the Azure API Center is located."
1417
},
1518
"serviceName": {
16-
"type": "string"
19+
"type": "string",
20+
"description": "Name of the Azure API Center instance that Dev Proxy should use to check if the APIs used in the app are registered."
1721
},
1822
"subscriptionId": {
19-
"type": "string"
23+
"type": "string",
24+
"description": "ID of the Azure subscription where the Azure API Center instance is located."
2025
},
2126
"workspace": {
22-
"type": "string"
27+
"type": "string",
28+
"description": "Name of the Azure API Center workspace to use. Default is 'default'."
2329
}
2430
},
2531
"required": [

‎schemas/v0.27.0/apicenterproductionversionplugin.schema.json

+10-5
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,24 @@
44
"type": "object",
55
"properties": {
66
"$schema": {
7-
"type": "string"
7+
"type": "string",
8+
"description": "The JSON schema reference for validation."
89
},
910
"resourceGroupName": {
10-
"type": "string"
11+
"type": "string",
12+
"description": "Name of the resource group where the Azure API Center is located."
1113
},
1214
"serviceName": {
13-
"type": "string"
15+
"type": "string",
16+
"description": "Name of the Azure API Center instance that Dev Proxy should use to check if the APIs used in the app are registered."
1417
},
1518
"subscriptionId": {
16-
"type": "string"
19+
"type": "string",
20+
"description": "ID of the Azure subscription where the Azure API Center instance is located."
1721
},
1822
"workspace": {
19-
"type": "string"
23+
"type": "string",
24+
"description": "Name of the Azure API Center workspace to use. Default is 'default'."
2025
}
2126
},
2227
"required": [

0 commit comments

Comments
 (0)