Skip to content

Commit 5401677

Browse files
authored
Merge pull request finos#626 from finos/branding-and-style-touchups
chore: propagate renaming to remaining files
2 parents 3844985 + 6ad202e commit 5401677

File tree

12 files changed

+41
-52
lines changed

12 files changed

+41
-52
lines changed

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Code of Conduct for Git Proxy
1+
# Code of Conduct for GitProxy
22

33
Please see the [Community Code of Conduct](https://www.finos.org/code-of-conduct).

CONTRIBUTING.md

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# Git Proxy Contribution and Governance Policies
1+
# GitProxy Contribution and Governance Policies
22

3-
This document describes the contribution process and governance policies of the FINOS Git Proxy project. The project is also governed by the [Linux Foundation Antitrust Policy](https://www.linuxfoundation.org/antitrust-policy/), and the FINOS [IP Policy](IP-Policy.pdf), [Code of Conduct](Code-of-Conduct.md), [Collaborative Principles](Collaborative-Principles.md), and [Meeting Procedures](Meeting-Procedures.md).
3+
This document describes the contribution process and governance policies of the FINOS GitProxy project. The project is also governed by the [Linux Foundation Antitrust Policy](https://www.linuxfoundation.org/antitrust-policy/), and the FINOS [IP Policy](IP-Policy.pdf), [Code of Conduct](Code-of-Conduct.md), [Collaborative Principles](Collaborative-Principles.md), and [Meeting Procedures](Meeting-Procedures.md).
44

55
## Contribution Process
66

77
Before making a contribution, please take the following steps:
8+
89
1. Check whether there's already an open issue related to your proposed contribution. If there is, join the discussion and propose your contribution there.
910
2. If there isn't already a relevant issue, create one, describing your contribution and the problem you're trying to solve.
1011
3. Respond to any questions or suggestions raised in the issue by other developers.
@@ -21,33 +22,36 @@ NOTE: All contributors must have a contributor license agreement (CLA) on file w
2122
### Roles
2223

2324
The project community consists of Contributors and Maintainers:
24-
* A **Contributor** is anyone who submits a contribution to the project. (Contributions may include code, issues, comments, documentation, media, or any combination of the above.)
25-
* A **Maintainer** is a Contributor who, by virtue of their contribution history, has been given write access to project repositories and may merge approved contributions.
26-
* The **Lead Maintainer** is the project's interface with the FINOS team and Board. They are responsible for approving [quarterly project reports](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/93225748/Board+Reporting+and+Program+Health+Checks) and communicating on behalf of the project. The Lead Maintainer is elected by a vote of the Maintainers.
25+
26+
- A **Contributor** is anyone who submits a contribution to the project. (Contributions may include code, issues, comments, documentation, media, or any combination of the above.)
27+
- A **Maintainer** is a Contributor who, by virtue of their contribution history, has been given write access to project repositories and may merge approved contributions.
28+
- The **Lead Maintainer** is the project's interface with the FINOS team and Board. They are responsible for approving [quarterly project reports](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/93225748/Board+Reporting+and+Program+Health+Checks) and communicating on behalf of the project. The Lead Maintainer is elected by a vote of the Maintainers.
2729

2830
### Contribution Rules
2931

3032
Anyone is welcome to submit a contribution to the project. The rules below apply to all contributions. (The key words "MUST", "SHALL", "SHOULD", "MAY", etc. in this document are to be interpreted as described in [IETF RFC 2119](https://www.ietf.org/rfc/rfc2119.txt).)
3133

32-
* All contributions MUST be submitted as pull requests, including contributions by Maintainers.
33-
* All pull requests SHOULD be reviewed by a Maintainer (other than the Contributor) before being merged.
34-
* Pull requests for non-trivial contributions SHOULD remain open for a review period sufficient to give all Maintainers a sufficient opportunity to review and comment on them.
35-
* After the review period, if no Maintainer has an objection to the pull request, any Maintainer MAY merge it.
36-
* If any Maintainer objects to a pull request, the Maintainers SHOULD try to come to consensus through discussion. If not consensus can be reached, any Maintainer MAY call for a vote on the contribution.
34+
- All contributions MUST be submitted as pull requests, including contributions by Maintainers.
35+
- All pull requests SHOULD be reviewed by a Maintainer (other than the Contributor) before being merged.
36+
- Pull requests for non-trivial contributions SHOULD remain open for a review period sufficient to give all Maintainers a sufficient opportunity to review and comment on them.
37+
- After the review period, if no Maintainer has an objection to the pull request, any Maintainer MAY merge it.
38+
- If any Maintainer objects to a pull request, the Maintainers SHOULD try to come to consensus through discussion. If not consensus can be reached, any Maintainer MAY call for a vote on the contribution.
3739

3840
### Maintainer Voting
3941

4042
The Maintainers MAY hold votes only when they are unable to reach consensus on an issue. Any Maintainer MAY call a vote on a contested issue, after which Maintainers SHALL have 36 hours to register their votes. Votes SHALL take the form of "+1" (agree), "-1" (disagree), "+0" (abstain). Issues SHALL be decided by the majority of votes cast. If there is only one Maintainer, they SHALL decide any issue otherwise requiring a Maintainer vote. If a vote is tied, the Lead Maintainer MAY cast an additional tie-breaker vote.
4143

4244
The Maintainers SHALL decide the following matters by consensus or, if necessary, a vote:
43-
* Contested pull requests
44-
* Election and removal of the Lead Maintainer
45-
* Election and removal of Maintainers
45+
46+
- Contested pull requests
47+
- Election and removal of the Lead Maintainer
48+
- Election and removal of Maintainers
4649

4750
All Maintainer votes MUST be carried out transparently, with all discussion and voting occurring in public, either:
48-
* in comments associated with the relevant issue or pull request, if applicable;
49-
* on the project mailing list or other official public communication channel; or
50-
* during a regular, minuted project meeting.
51+
52+
- in comments associated with the relevant issue or pull request, if applicable;
53+
- on the project mailing list or other official public communication channel; or
54+
- during a regular, minuted project meeting.
5155

5256
### Maintainer Qualifications
5357

certs/create-cert.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/bash
22

3-
# Generates a self-signed certificate used for the SSL Certificate used by the Git Proxy HTTPS endpoint
3+
# Generates a self-signed certificate used for the SSL Certificate used by the GitProxy HTTPS endpoint
44

55
# The certificate expires in 10 years (9 May 2034)
66
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 3650 -nodes -subj "/C=US/ST=NY/L=New York/O=FINOS/OU=CTI/CN=localhost"

config.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json-schema.org/draft-07/schema",
33
"$id": "https://git-proxy.finos.org/config.schema.json",
4-
"title": "Git Proxy configuration file",
4+
"title": "GitProxy configuration file",
55
"description": "Configuration for customizing git-proxy",
66
"type": "object",
77
"properties": {

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
work correctly both with client-side routing and a non-root public URL.
6464
Learn how to configure a non-root public URL by running `npm run build`.
6565
-->
66-
<title>Git Proxy</title>
66+
<title>GitProxy</title>
6767
</head>
6868
<body>
6969
<noscript> You need to enable JavaScript to run this app. </noscript>

packages/git-proxy-cli/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const baseUrl = `${uiHost}:${uiPort}`;
1414
axios.defaults.timeout = 30000;
1515

1616
/**
17-
* Log in to Git Proxy
17+
* Log in to GitProxy
1818
* @param {string} username The user name to login with
1919
* @param {string} password The password to use for the login
2020
*/
@@ -155,11 +155,11 @@ async function authoriseGitPush(id) {
155155
params: {
156156
attestation: [
157157
{
158-
label: "Authorising via GitProxy CLI",
159-
checked: true
160-
}
161-
]
162-
}
158+
label: 'Authorising via GitProxy CLI',
159+
checked: true,
160+
},
161+
],
162+
},
163163
},
164164
{
165165
headers: { Cookie: cookies },

packages/git-proxy-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@finos/git-proxy-cli",
33
"version": "0.1.0",
4-
"description": "Command line interface tool for FINOS Git Proxy.",
4+
"description": "Command line interface tool for FINOS GitProxy.",
55
"bin": "./index.js",
66
"dependencies": {
77
"axios": "^1.6.0",

packages/git-proxy-cli/test/testCliUtils.js

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ async function runCli(
8181

8282
/**
8383
* Starts the server.
84-
* @param {Object} service - The Git Proxy API service to be started.
84+
* @param {Object} service - The GitProxy API service to be started.
8585
* @return {Promise<void>} A promise that resolves when the service has
8686
* successfully started. Does not return any value upon resolution.
8787
*/
@@ -183,7 +183,7 @@ async function addGitPushToDb(id, repo, debug = false) {
183183
false, // error
184184
null, // errorMessage
185185
true, // blocked
186-
`\n\n\nGit Proxy has received your push:\n\nhttp://localhost:8080/requests/${id}\n\n\n`, // blockedMessage
186+
`\n\n\nGitProxy has received your push:\n\nhttp://localhost:8080/requests/${id}\n\n\n`, // blockedMessage
187187
null, // content
188188
);
189189
const commitData = [];
@@ -212,21 +212,8 @@ async function addGitPushToDb(id, repo, debug = false) {
212212
* @param {boolean} admin Flag to make the user administrator.
213213
* @param {boolean} debug Flag to enable logging for debugging.
214214
*/
215-
async function addUserToDb(
216-
username,
217-
password,
218-
email,
219-
gitAccount,
220-
admin = false,
221-
debug = false,
222-
) {
223-
const result = await db.createUser(
224-
username,
225-
password,
226-
email,
227-
gitAccount,
228-
admin,
229-
);
215+
async function addUserToDb(username, password, email, gitAccount, admin = false, debug = false) {
216+
const result = await db.createUser(username, password, email, gitAccount, admin);
230217
if (debug) {
231218
console.log(`New user added to DB: ${util.inspect(result)}`);
232219
}

scripts/doc-schema.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ try {
2121

2222
const schemaDoc = readFileSync(`${tempdir}${sep}schema.md`, 'utf-8')
2323
.replace(/\n\n<\/summary>/g, '</summary>')
24-
.replace(/# Git Proxy configuration file/g, '# Schema Reference'); // https://github.com/finos/git-proxy/pull/327#discussion_r1377343213
24+
.replace(/# GitProxy configuration file/g, '# Schema Reference'); // https://github.com/finos/git-proxy/pull/327#discussion_r1377343213
2525
const docString = `---
2626
title: Schema Reference
27-
description: JSON schema reference documentation for Git Proxy
27+
description: JSON schema reference documentation for GitProxy
2828
---
2929
3030
${schemaDoc}

src/plugin.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ class PluginLoader {
5858
*/
5959
async _loadFilePlugin(filepath) {
6060
const lp = await lpModule;
61-
const resolvedModuleFile = await lp.resolvePlugin(
62-
path.join(process.cwd(), filepath),
63-
);
61+
const resolvedModuleFile = await lp.resolvePlugin(path.join(process.cwd(), filepath));
6462
return await lp.loadPlugin(resolvedModuleFile);
6563
}
6664

@@ -100,7 +98,7 @@ class PluginLoader {
10098
}
10199

102100
/**
103-
* Parent class for all Git Proxy plugins. New plugin types must inherit from
101+
* Parent class for all GitProxy plugins. New plugin types must inherit from
104102
* ProxyPlugin to be loaded by PluginLoader.
105103
*/
106104
class ProxyPlugin {}

0 commit comments

Comments
 (0)