Skip to content

Commit 67d4155

Browse files
authored
Merge branch 'main' into layout-auth-decoupling
2 parents 351d67d + fc6f166 commit 67d4155

38 files changed

+1969
-213
lines changed
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
name: "\U0001F91D GitProxy Meeting Minutes"
3+
about: To track GitProxy meeting agenda and attendance
4+
title: DD MMM YYYY - GitProxy Meeting Minutes
5+
labels: meeting
6+
assignees:
7+
8+
---
9+
10+
## Date
11+
YYYYMMDD - time
12+
13+
## Meeting info
14+
- [Meeting link](https://zoom-lfx.platform.linuxfoundation.org/meeting/95849833904?password=99413314-d03a-4b1c-b682-1ede2c399595)
15+
16+
- [Register for future meetings](https://zoom-lfx.platform.linuxfoundation.org/meeting/95849833904?password=99413314-d03a-4b1c-b682-1ede2c399595&invite=true)
17+
18+
## Untracked attendees
19+
- Full Name, Affiliation, (optional) GitHub username
20+
- ...
21+
22+
## Meeting notices
23+
- FINOS **Project leads** are responsible for observing the FINOS guidelines for [running project meetings](https://community.finos.org/docs/governance/meeting-procedures/). Project maintainers can find additional resources in the [FINOS Maintainers Cheatsheet](https://community.finos.org/docs/finos-maintainers-cheatsheet).
24+
25+
- **All participants** in FINOS project meetings are subject to the [LF Antitrust Policy](https://www.linuxfoundation.org/antitrust-policy/), the [FINOS Community Code of Conduct](https://community.finos.org/docs/governance/code-of-conduct) and all other [FINOS policies](https://community.finos.org/docs/governance/#policies).
26+
27+
- FINOS meetings involve participation by industry competitors, and it is the intention of FINOS and the Linux Foundation to conduct all of its activities in accordance with applicable antitrust and competition laws. It is therefore extremely important that attendees adhere to meeting agendas, and be aware of, and not participate in, any activities that are prohibited under applicable US state, federal or foreign antitrust and competition laws. Please contact legal@finos.org with any questions.
28+
29+
- FINOS project meetings may be recorded for use solely by the FINOS team for administration purposes. In very limited instances, and with explicit approval, recordings may be made more widely available.
30+
31+
## Agenda
32+
- [ ] Convene & roll call (5mins)
33+
- [ ] Display [FINOS Antitrust Policy summary slide](https://community.finos.org/Compliance-Slides/Antitrust-Compliance-Slide.pdf)
34+
- [ ] Review Meeting Notices (see above)
35+
- [ ] Approve past meeting minutes
36+
- [ ] Agenda item 1
37+
- [ ] Agenda item 2
38+
- [ ] ...
39+
- [ ] AOB, Q&A & Adjourn (5mins)
40+
41+
## Decisions Made
42+
- [ ] Decision 1
43+
- [ ] Decision 2
44+
- [ ] ...
45+
46+
## Action Items
47+
- [ ] Action 1
48+
- [ ] Action 2
49+
- [ ] ...

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ jobs:
5252
npm run test-coverage-ci --workspaces --if-present
5353
5454
- name: Upload test coverage report
55-
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
55+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
5656
with:
5757
files: ./coverage/lcov.info
5858
token: ${{ secrets.CODECOV_TOKEN }}
5959
# - name: Exit if coverage condition not met
6060
# if: ${{ steps.test.outputs.exit_code }} != 0
6161
# run: exit ${{ steps.test.outputs.exit_code }}
6262

63-
- name: Build application
64-
run: npm run build
63+
- name: Build frontend
64+
run: npm run build-ui
6565

6666
- name: Save build folder
6767
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
@@ -77,7 +77,7 @@ jobs:
7777
path: build
7878

7979
- name: Run cypress test
80-
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
80+
uses: cypress-io/github-action@be1bab96b388bbd9ce3887e397d373c8557e15af # v6.9.2
8181
with:
8282
start: npm start &
8383
wait-on: "http://localhost:3000"

.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@28deaeda66b76a05916b6923827895f2b14ab387 # v3
63+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 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.
@@ -74,7 +74,7 @@ jobs:
7474
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
7575
# If this step fails, then you should remove it and run the build manually (see below)
7676
- name: Autobuild
77-
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3
77+
uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
7878

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

8989
- name: Perform CodeQL Analysis
90-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3
90+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3
9191
with:
9292
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1919
- name: Dependency Review
20-
uses: actions/dependency-review-action@67d4f4bd7a9b17a0db54d2a7519187c65e339de8 # v4
20+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4
2121
with:
2222
comment-summary-in-pr: always
2323
fail-on-severity: high

.github/workflows/npm.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
# Setup .npmrc file to publish to npm
1919
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2020
with:
21-
node-version: '18.x'
21+
node-version: '20.x'
2222
registry-url: 'https://registry.npmjs.org'
2323
- run: npm ci
2424
- run: npm run build
25+
env:
26+
IS_PUBLISHING: 'YES'
2527
- run: npm publish --access=public
2628
env:
2729
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/sample-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Setup .npmrc file to publish to npm
2222
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2323
with:
24-
node-version: '18.x'
24+
node-version: '20.x'
2525
registry-url: 'https://registry.npmjs.org'
2626
- name: publish sample package
2727
run: npm install --include peer && npm publish --access=public

.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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
75+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
7676
with:
7777
sarif_file: results.sarif

.github/workflows/unused-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: 'Setup Node.js'
1919
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
2020
with:
21-
node-version: '18.x'
21+
node-version: '20.x'
2222
- name: 'Run depcheck'
2323
run: |
2424
npx depcheck --skip-missing --ignores="tsx,@babel/*,@commitlint/*,eslint,eslint-*,husky,mocha,ts-mocha,ts-node,concurrently,nyc,prettier,typescript,tsconfig-paths,vite-tsconfig-paths"

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,10 @@ yarn-error.log*
263263

264264
# Docusaurus website
265265
website/build
266-
website/.docusaurus
266+
website/.docusaurus
267+
268+
# git-config-cache
269+
.git-config-cache
270+
271+
# Jetbrains IDE
272+
.idea

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# This file required to override .gitignore when publishing to npm
22
website/
33
plugins/
4+
experimental/
5+
cypress/

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
[![NPM](https://img.shields.io/npm/v/@finos/git-proxy?colorA=00C586&colorB=000000)](https://www.npmjs.com/package/@finos/git-proxy)
2828
[![Build](https://img.shields.io/github/actions/workflow/status/finos/git-proxy/ci.yml?branch=main&label=CI&logo=github&colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/actions/workflows/ci.yml)
2929
[![codecov](https://codecov.io/gh/finos/git-proxy/branch/main/graph/badge.svg)](https://codecov.io/gh/finos/git-proxy)
30-
[![git-proxy](https://api.securityscorecards.dev/projects/github.com/finos/git-proxy/badge)](https://api.securityscorecards.dev/projects/github.com/finos/git-proxy)
3130
[![Documentation](https://img.shields.io/badge/_-documentation-000000?colorA=00C586&logo=docusaurus&logoColor=FFFFFF&)](https://git-proxy.finos.org)
3231
<br />
3332
[![License](https://img.shields.io/github/license/finos/git-proxy?colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/blob/main/LICENSE)
3433
[![Contributors](https://img.shields.io/github/contributors/finos/git-proxy?colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/graphs/contributors)
3534
[![Slack](https://img.shields.io/badge/_-Chat_on_Slack-000000.svg?logo=slack&colorA=00C586)](https://app.slack.com/client/T01E7QRQH97/C06LXNW0W76)
36-
[![Stars](https://img.shields.io/github/stars/finos/git-proxy?colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/stargazers)
37-
[![Forks](https://img.shields.io/github/forks/finos/git-proxy?colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/forks)
35+
[![git-proxy](https://api.securityscorecards.dev/projects/github.com/finos/git-proxy/badge)](https://api.securityscorecards.dev/projects/github.com/finos/git-proxy)
36+
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10520/badge)](https://www.bestpractices.dev/projects/10520)
3837

3938
</div>
4039
<br />
@@ -85,6 +84,7 @@ $ git push proxy $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remo
8584
Using the default configuration, GitProxy intercepts the push and _blocks_ it. To enable code pushing to your fork via GitProxy, add your repository URL into the GitProxy config file (`proxy.config.json`). For more information, refer to [our documentation](https://git-proxy.finos.org).
8685

8786
## Documentation
87+
8888
For detailed step-by-step instructions for how to install, deploy & configure GitProxy and
8989
customize for your environment, see the [project's documentation](https://git-proxy.finos.org/docs/):
9090

@@ -102,11 +102,11 @@ If you identify a security vulnerability in the codebase, please follow the step
102102

103103
## Code of Conduct
104104

105-
We are committed to making open source an enjoyable and respectful experience for our community. See <a href="https://github.com/finos/git-proxy/blob/main/CODE_OF_CONDUCT.md"><code>CODE_OF_CONDUCT</code></a> for more information.
105+
We are committed to making open source an enjoyable and respectful experience for our community. See [`CODE_OF_CONDUCT`](CODE_OF_CONDUCT.md) for more information.
106106

107107
## License
108108

109-
This project is distributed under the Apache-2.0 license. See <a href="./LICENSE"><code>LICENSE</code></a> for more information.
109+
This project is distributed under the Apache-2.0 license. See [`LICENSE`](LICENSE) for more information.
110110

111111
## Contact
112112

@@ -116,4 +116,4 @@ If you can't access Slack, you can also [subscribe to our mailing list](mailto:g
116116

117117
Join our [fortnightly Zoom meeting](https://zoom.us/j/97235277537?pwd=aDJsaE8zcDJpYW1vZHJmSTJ0RXNZUT09) on Monday, 11AM EST (odd week numbers). Send an e-mail to [help@finos.org](mailto:help@finos.org) to get a calendar invitation.
118118

119-
Otherwise, if you have a deeper query or require more support, please [raise an issue](https://github.com/finos/git-proxy/issues).
119+
Otherwise, if you have a deeper query or require more support, please [raise an issue](https://github.com/finos/git-proxy/issues).

config.schema.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,30 @@
2424
"description": "Provide domains to use alternative to the defaults",
2525
"type": "object"
2626
},
27+
"rateLimit": {
28+
"description": "API Rate limiting configuration.",
29+
"type": "object",
30+
"properties": {
31+
"windowMs": {
32+
"type": "number",
33+
"description": "How long to remember requests for, in milliseconds (default 10 mins)."
34+
},
35+
"limit": {
36+
"type": "number",
37+
"description": "How many requests to allow (default 150)."
38+
},
39+
"statusCode": {
40+
"type": "number",
41+
"description": "HTTP status code after limit is reached (default is 429)."
42+
},
43+
"message": {
44+
"type": "string",
45+
"description": "Response to return after limit is reached."
46+
}
47+
},
48+
"required": ["windowMs", "limit"],
49+
"additionalProperties": false
50+
},
2751
"privateOrganizations": {
2852
"description": "Pattern searches for listed private organizations are disabled",
2953
"type": "array"
@@ -89,6 +113,18 @@
89113
},
90114
"required": ["enabled", "key", "cert"]
91115
},
116+
"configurationSources": {
117+
"enabled": { "type": "boolean" },
118+
"reloadIntervalSeconds": { "type": "number" },
119+
"merge": { "type": "boolean" },
120+
"sources": {
121+
"type": "array",
122+
"items": {
123+
"type": "object",
124+
"description": "Configuration source"
125+
}
126+
}
127+
},
92128
"uiRouteAuth": {
93129
"description": "UI routes that require authentication (logged in or admin)",
94130
"type": "object",

experimental/li-cli/package-lock.json

Lines changed: 12 additions & 12 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
"@inquirer/prompts": "^7.5.0",
1717
"yaml": "^2.7.1",
1818
"yargs": "^17.7.2",
19-
"zod": "^3.24.3"
19+
"zod": "^3.24.4"
2020
},
2121
"devDependencies": {
2222
"@jest/globals": "^29.7.0",
23-
"@types/node": "^22.15.3",
23+
"@types/node": "^22.15.12",
2424
"@types/yargs": "^17.0.33",
2525
"jest": "^29.7.0",
2626
"rimraf": "^6.0.1",
2727
"ts-jest": "^29.3.2",
2828
"ts-node": "^10.9.2",
29-
"tsc-alias": "^1.8.15",
29+
"tsc-alias": "^1.8.16",
3030
"tslib": "^2.8.1",
3131
"typescript": "^5.8.3"
3232
}

package-lock.json

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

0 commit comments

Comments
 (0)