Skip to content

Commit 27b190b

Browse files
committed
Merge remote-tracking branch 'finos/main' into denis-coric/ssh-flow
2 parents 61e6a0b + cc8fac5 commit 27b190b

File tree

21 files changed

+291
-183
lines changed

21 files changed

+291
-183
lines changed

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Initializes the CodeQL tools for scanning.
6262
- name: Initialize CodeQL
63-
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3
63+
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3
6464
with:
6565
languages: ${{ matrix.language }}
6666
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -73,7 +73,7 @@ jobs:
7373
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
7474
# If this step fails, then you should remove it and run the build manually (see below)
7575
- name: Autobuild
76-
uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3
76+
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3
7777

7878
# ℹ️ Command-line programs to run using the OS shell.
7979
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -86,6 +86,6 @@ jobs:
8686
# ./location_of_script_within_repo/buildscript.sh
8787

8888
- name: Perform CodeQL Analysis
89-
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3
89+
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3
9090
with:
9191
category: '/language:${{matrix.language}}'

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: 'Checkout Repository'
1818
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1919
- name: Dependency Review
20-
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4
20+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4
2121
with:
2222
comment-summary-in-pr: always
2323
fail-on-severity: high

.github/workflows/release.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: 'Upload to code-scanning'
75-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
75+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
7676
with:
7777
sarif_file: results.sarif

config.schema.json

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"properties": {
88
"proxyUrl": {
99
"type": "string",
10-
"description": "Used in early versions of git proxy to configure the remote host that traffic is proxied to. In later versions, the repository URL is used to determine the domain proxied, allowing multiple hosts to be proxied by one instance.",
10+
"description": "Deprecated: Used in early versions of git proxy to configure the remote host that traffic is proxied to. In later versions, the repository URL is used to determine the domain proxied, allowing multiple hosts to be proxied by one instance.",
1111
"deprecated": true
1212
},
1313
"cookieSecret": { "type": "string" },
@@ -27,19 +27,34 @@
2727
"https://somedomain.com/some/path/checkUserGroups?domain=<domain>&name=<name>&id=<id>"
2828
]
2929
}
30-
}
30+
},
31+
"additionalProperties": false
3132
},
3233
"github": {
3334
"type": "object",
35+
"description": "Deprecated: Defunct property that was used to provide the API URL for GitHub. No longer referenced in the codebase.",
3436
"properties": {
3537
"baseUrl": {
3638
"type": "string",
3739
"format": "uri",
38-
"examples": ["https://api.github.com"]
40+
"examples": ["https://api.github.com"],
41+
"deprecated": true
3942
}
43+
},
44+
"additionalProperties": false
45+
},
46+
"gitleaks": {
47+
"type": "object",
48+
"description": "Configuration for the gitleaks (https://github.com/gitleaks/gitleaks) plugin",
49+
"properties": {
50+
"enabled": { "type": "boolean" },
51+
"ignoreGitleaksAllow": { "type": "boolean" },
52+
"noColor": { "type": "boolean" },
53+
"configPath": { "type": "string" }
4054
}
4155
}
42-
}
56+
},
57+
"additionalProperties": false
4358
},
4459
"commitConfig": {
4560
"description": "Enforce rules and patterns on commits including e-mail and message",
@@ -118,7 +133,7 @@
118133
"description": "List of authentication sources. The first source in the configuration with enabled=true will be used.",
119134
"type": "array",
120135
"items": {
121-
"$ref": "#/definitions/authentication"
136+
"$ref": "#/definitions/authenticationElement"
122137
}
123138
},
124139
"tempPassword": {
@@ -136,7 +151,7 @@
136151
"description": "List of authentication sources for API endpoints. May be empty, in which case all endpoints are public.",
137152
"type": "array",
138153
"items": {
139-
"$ref": "#/definitions/authentication"
154+
"$ref": "#/definitions/authenticationElement"
140155
}
141156
},
142157
"tls": {
@@ -239,7 +254,7 @@
239254
},
240255
"required": ["type", "enabled"]
241256
},
242-
"authentication": {
257+
"authenticationElement": {
243258
"type": "object",
244259
"description": "Configuration for an authentication source",
245260
"oneOf": [

experimental/li-cli/package-lock.json

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

experimental/li-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"@jest/globals": "^29.7.0",
24-
"@types/node": "^22.18.6",
24+
"@types/node": "^22.18.7",
2525
"@types/yargs": "^17.0.33",
2626
"jest": "^29.7.0",
2727
"rimraf": "^6.0.1",

package-lock.json

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@finos/git-proxy",
3-
"version": "2.0.0-rc.2",
3+
"version": "2.0.0-rc.3",
44
"description": "Deploy custom push protections and policies on top of Git.",
55
"scripts": {
66
"cli": "node ./packages/git-proxy-cli/index.js",
@@ -53,7 +53,7 @@
5353
"connect-mongo": "^5.1.0",
5454
"cors": "^2.8.5",
5555
"diff2html": "^3.4.52",
56-
"env-paths": "^2.2.1",
56+
"env-paths": "^3.0.0",
5757
"express": "^4.21.2",
5858
"express-http-proxy": "^2.1.2",
5959
"express-rate-limit": "^8.1.0",

packages/git-proxy-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@finos/git-proxy-cli",
3-
"version": "0.1.0",
3+
"version": "2.0.0-rc.3",
44
"description": "Command line interface tool for FINOS GitProxy.",
55
"bin": "./index.js",
66
"dependencies": {

0 commit comments

Comments
 (0)