Skip to content

Commit 67ff0da

Browse files
Merge branch 'main' into auth/pm-27084/register-accepts-new-data-types
2 parents 015d2ed + 484a8e4 commit 67ff0da

File tree

251 files changed

+24358
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+24358
-1118
lines changed

.github/renovate.json5

Lines changed: 75 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,7 @@
1010
"nuget",
1111
],
1212
packageRules: [
13-
{
14-
groupName: "cargo minor",
15-
matchManagers: ["cargo"],
16-
matchUpdateTypes: ["minor"],
17-
},
18-
{
19-
groupName: "dockerfile minor",
20-
matchManagers: ["dockerfile"],
21-
matchUpdateTypes: ["minor"],
22-
},
23-
{
24-
groupName: "docker-compose minor",
25-
matchManagers: ["docker-compose"],
26-
matchUpdateTypes: ["minor"],
27-
},
28-
{
29-
groupName: "github-action minor",
30-
matchManagers: ["github-actions"],
31-
matchUpdateTypes: ["minor"],
32-
addLabels: ["hold"],
33-
},
34-
{
35-
// For any Microsoft.Extensions.* and Microsoft.AspNetCore.* packages, we want to create PRs for patch updates.
36-
// This overrides the default that ignores patch updates for nuget dependencies.
37-
matchPackageNames: [
38-
"/^Microsoft\\.Extensions\\./",
39-
"/^Microsoft\\.AspNetCore\\./",
40-
],
41-
matchUpdateTypes: ["patch"],
42-
dependencyDashboardApproval: false,
43-
},
44-
{
45-
matchPackageNames: ["https://github.com/bitwarden/sdk-internal.git"],
46-
groupName: "sdk-internal",
47-
dependencyDashboardApproval: true
48-
},
13+
// ==================== Team Ownership Rules ====================
4914
{
5015
matchManagers: ["dockerfile", "docker-compose"],
5116
commitMessagePrefix: "[deps] BRE:",
@@ -68,6 +33,7 @@
6833
"Fido2.AspNet",
6934
"Duende.IdentityServer",
7035
"Microsoft.AspNetCore.Authentication.JwtBearer",
36+
"Microsoft.Extensions.Caching.Cosmos",
7137
"Microsoft.Extensions.Identity.Stores",
7238
"Otp.NET",
7339
"Sustainsys.Saml2.AspNetCore2",
@@ -101,11 +67,6 @@
10167
commitMessagePrefix: "[deps] Billing:",
10268
reviewers: ["team:team-billing-dev"],
10369
},
104-
{
105-
matchPackageNames: ["/^Microsoft\\.EntityFrameworkCore\\./", "/^dotnet-ef/"],
106-
groupName: "EntityFrameworkCore",
107-
description: "Group EntityFrameworkCore to exclude them from the dotnet monorepo preset",
108-
},
10970
{
11071
matchPackageNames: [
11172
"Dapper",
@@ -153,7 +114,6 @@
153114
"Microsoft.Extensions.DependencyInjection",
154115
"Microsoft.Extensions.Logging",
155116
"Microsoft.Extensions.Logging.Console",
156-
"Microsoft.Extensions.Caching.Cosmos",
157117
"Microsoft.Extensions.Caching.SqlServer",
158118
"Microsoft.Extensions.Caching.StackExchangeRedis",
159119
"Quartz",
@@ -162,6 +122,12 @@
162122
commitMessagePrefix: "[deps] Platform:",
163123
reviewers: ["team:team-platform-dev"],
164124
},
125+
{
126+
matchUpdateTypes: ["lockFileMaintenance"],
127+
description: "Platform owns lock file maintenance",
128+
commitMessagePrefix: "[deps] Platform:",
129+
reviewers: ["team:team-platform-dev"],
130+
},
165131
{
166132
matchPackageNames: [
167133
"AutoMapper.Extensions.Microsoft.DependencyInjection",
@@ -191,6 +157,73 @@
191157
commitMessagePrefix: "[deps] Vault:",
192158
reviewers: ["team:team-vault-dev"],
193159
},
160+
161+
// ==================== Grouping Rules ====================
162+
// These come after any specific team assignment rules to ensure
163+
// that grouping is not overridden by subsequent rule definitions.
164+
{
165+
groupName: "cargo minor",
166+
matchManagers: ["cargo"],
167+
matchUpdateTypes: ["minor"],
168+
},
169+
{
170+
groupName: "dockerfile minor",
171+
matchManagers: ["dockerfile"],
172+
matchUpdateTypes: ["minor"],
173+
},
174+
{
175+
groupName: "docker-compose minor",
176+
matchManagers: ["docker-compose"],
177+
matchUpdateTypes: ["minor"],
178+
},
179+
{
180+
groupName: "github-action minor",
181+
matchManagers: ["github-actions"],
182+
matchUpdateTypes: ["minor"],
183+
addLabels: ["hold"],
184+
},
185+
{
186+
matchPackageNames: ["/^Microsoft\\.EntityFrameworkCore\\./", "/^dotnet-ef/"],
187+
groupName: "EntityFrameworkCore",
188+
description: "Group EntityFrameworkCore to exclude them from the dotnet monorepo preset",
189+
},
190+
{
191+
matchPackageNames: ["https://github.com/bitwarden/sdk-internal.git"],
192+
groupName: "sdk-internal",
193+
dependencyDashboardApproval: true
194+
},
195+
196+
// ==================== Dashboard Rules ====================
197+
{
198+
// For any Microsoft.Extensions.* and Microsoft.AspNetCore.* packages, we want to create PRs for patch updates.
199+
// This overrides the default that ignores patch updates for nuget dependencies.
200+
matchPackageNames: [
201+
"/^Microsoft\\.Extensions\\./",
202+
"/^Microsoft\\.AspNetCore\\./",
203+
],
204+
matchUpdateTypes: ["patch"],
205+
dependencyDashboardApproval: false,
206+
},
207+
{
208+
// For the Platform-owned dependencies below, we have decided we will only be creating PRs
209+
// for major updates, and sending minor (as well as patch, inherited from base config) to the dashboard.
210+
// This rule comes AFTER grouping rules so that groups are respected while still
211+
// sending minor/patch updates to the dependency dashboard for approval.
212+
matchPackageNames: [
213+
"AspNetCoreRateLimit",
214+
"AspNetCoreRateLimit.Redis",
215+
"Azure.Data.Tables",
216+
"Azure.Extensions.AspNetCore.DataProtection.Blobs",
217+
"Azure.Messaging.EventGrid",
218+
"Azure.Messaging.ServiceBus",
219+
"Azure.Storage.Blobs",
220+
"Azure.Storage.Queues",
221+
"LaunchDarkly.ServerSdk",
222+
"Quartz",
223+
],
224+
matchUpdateTypes: ["minor"],
225+
dependencyDashboardApproval: true,
226+
},
194227
],
195228
ignoreDeps: ["dotnet-sdk"],
196229
}

.github/workflows/build.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
124124

125125
- name: Set up Node
126-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
126+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
127127
with:
128128
cache: "npm"
129129
cache-dependency-path: "**/package-lock.json"
@@ -160,7 +160,7 @@ jobs:
160160
ls -atlh ../../../
161161
162162
- name: Upload project artifact
163-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
163+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
164164
if: ${{ matrix.dotnet }}
165165
with:
166166
name: ${{ matrix.project_name }}.zip
@@ -169,10 +169,10 @@ jobs:
169169

170170
########## Set up Docker ##########
171171
- name: Set up QEMU emulators
172-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
172+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
173173

174174
- name: Set up Docker Buildx
175-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
175+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
176176

177177
########## ACRs ##########
178178
- name: Log in to Azure
@@ -246,7 +246,7 @@ jobs:
246246

247247
- name: Install Cosign
248248
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
249-
uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
249+
uses: sigstore/cosign-installer@7e8b541eb2e61bf99390e1afd4be13a184e9ebc5 # v3.10.1
250250

251251
- name: Sign image with Cosign
252252
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
@@ -264,7 +264,7 @@ jobs:
264264
265265
- name: Scan Docker image
266266
id: container-scan
267-
uses: anchore/scan-action@f6601287cdb1efc985d6b765bbf99cb4c0ac29d8 # v7.0.0
267+
uses: anchore/scan-action@3c9a191a0fbab285ca6b8530b5de5a642cba332f # v7.2.2
268268
with:
269269
image: ${{ steps.image-tags.outputs.primary_tag }}
270270
fail-build: false
@@ -356,7 +356,7 @@ jobs:
356356
if: |
357357
github.event_name != 'pull_request'
358358
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc')
359-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
359+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
360360
with:
361361
name: docker-stub-US.zip
362362
path: docker-stub-US.zip
@@ -366,7 +366,7 @@ jobs:
366366
if: |
367367
github.event_name != 'pull_request'
368368
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc')
369-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
369+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
370370
with:
371371
name: docker-stub-EU.zip
372372
path: docker-stub-EU.zip
@@ -378,21 +378,21 @@ jobs:
378378
pwsh ./generate_openapi_files.ps1
379379
380380
- name: Upload Public API Swagger artifact
381-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
381+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
382382
with:
383383
name: swagger.json
384384
path: api.public.json
385385
if-no-files-found: error
386386

387387
- name: Upload Internal API Swagger artifact
388-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
388+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
389389
with:
390390
name: internal.json
391391
path: api.json
392392
if-no-files-found: error
393393

394394
- name: Upload Identity Swagger artifact
395-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
395+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
396396
with:
397397
name: identity.json
398398
path: identity.json
@@ -438,15 +438,15 @@ jobs:
438438
439439
- name: Upload project artifact for Windows
440440
if: ${{ contains(matrix.target, 'win') == true }}
441-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
441+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
442442
with:
443443
name: MsSqlMigratorUtility-${{ matrix.target }}
444444
path: util/MsSqlMigratorUtility/obj/build-output/publish/MsSqlMigratorUtility.exe
445445
if-no-files-found: error
446446

447447
- name: Upload project artifact
448448
if: ${{ contains(matrix.target, 'win') == false }}
449-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
449+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
450450
with:
451451
name: MsSqlMigratorUtility-${{ matrix.target }}
452452
path: util/MsSqlMigratorUtility/obj/build-output/publish/MsSqlMigratorUtility
@@ -481,7 +481,7 @@ jobs:
481481
uses: bitwarden/gh-actions/azure-logout@main
482482

483483
- name: Generate GH App token
484-
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
484+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
485485
id: app-token
486486
with:
487487
app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
@@ -531,7 +531,7 @@ jobs:
531531
uses: bitwarden/gh-actions/azure-logout@main
532532

533533
- name: Generate GH App token
534-
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
534+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
535535
id: app-token
536536
with:
537537
app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}

.github/workflows/code-references.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Collect
6161
id: collect
62-
uses: launchdarkly/find-code-references@e3e9da201b87ada54eb4c550c14fb783385c5c8a # v2.13.0
62+
uses: launchdarkly/find-code-references@89a7d362d1d4b3725fe0fe0ccd0dc69e3bdcba58 # v2.14.0
6363
with:
6464
accessToken: ${{ steps.get-kv-secrets.outputs.LD-ACCESS-TOKEN }}
6565
projKey: default

.github/workflows/load-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2 # v1.1.0
9696

9797
- name: Run k6 tests
98-
uses: grafana/run-k6-action@c6b79182b9b666aa4f630f4a6be9158ead62536e # v1.2.0
98+
uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d # v1.3.1
9999
continue-on-error: false
100100
env:
101101
K6_OTEL_METRIC_PREFIX: k6_

.github/workflows/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
- project_name: Nginx
9292
- project_name: Notifications
9393
- project_name: Scim
94-
- project_name: Server
9594
- project_name: Setup
9695
- project_name: Sso
9796
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Create release
9191
if: ${{ inputs.release_type != 'Dry Run' }}
92-
uses: ncipollo/release-action@440c8c1cb0ed28b9f43e4d1d670870f059653174 # v1.16.0
92+
uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
9393
with:
9494
artifacts: "docker-stub-US.zip,
9595
docker-stub-EU.zip,

.github/workflows/repository-management.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
version: ${{ inputs.version_number_override }}
8484

8585
- name: Generate GH App token
86-
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
86+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
8787
id: app-token
8888
with:
8989
app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}
@@ -207,7 +207,7 @@ jobs:
207207
uses: bitwarden/gh-actions/azure-logout@main
208208

209209
- name: Generate GH App token
210-
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
210+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
211211
id: app-token
212212
with:
213213
app-id: ${{ steps.get-kv-secrets.outputs.BW-GHAPP-ID }}

.github/workflows/review-code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Code Review
22

33
on:
44
pull_request:
5-
types: [opened, synchronize, reopened, ready_for_review]
5+
types: [opened, synchronize, reopened]
66

77
permissions: {}
88

.github/workflows/test-database.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
run: 'docker logs "$(docker ps --quiet --filter "name=mssql")"'
157157

158158
- name: Report test results
159-
uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0
159+
uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0
160160
if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !cancelled() }}
161161
with:
162162
name: Test Results
@@ -165,7 +165,7 @@ jobs:
165165
fail-on-error: true
166166

167167
- name: Upload to codecov.io
168-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
168+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
169169

170170
- name: Docker Compose down
171171
if: always()
@@ -197,7 +197,7 @@ jobs:
197197
shell: pwsh
198198

199199
- name: Upload DACPAC
200-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
200+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
201201
with:
202202
name: sql.dacpac
203203
path: Sql.dacpac
@@ -223,7 +223,7 @@ jobs:
223223
shell: pwsh
224224

225225
- name: Report validation results
226-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
226+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
227227
with:
228228
name: report.xml
229229
path: |

0 commit comments

Comments
 (0)