Skip to content

Commit 3e1bda3

Browse files
committed
Merge branch 'main' into refactor-cli-to-ts-redone
2 parents 37f27b1 + 292ecad commit 3e1bda3

File tree

11 files changed

+34
-82
lines changed

11 files changed

+34
-82
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"description": "List of authentication sources. The first source in the configuration with enabled=true will be used.",
119119
"type": "array",
120120
"items": {
121-
"$ref": "#/definitions/authentication"
121+
"$ref": "#/definitions/authenticationElement"
122122
}
123123
},
124124
"tempPassword": {
@@ -136,7 +136,7 @@
136136
"description": "List of authentication sources for API endpoints. May be empty, in which case all endpoints are public.",
137137
"type": "array",
138138
"items": {
139-
"$ref": "#/definitions/authentication"
139+
"$ref": "#/definitions/authenticationElement"
140140
}
141141
},
142142
"tls": {
@@ -206,7 +206,7 @@
206206
},
207207
"required": ["type", "enabled"]
208208
},
209-
"authentication": {
209+
"authenticationElement": {
210210
"type": "object",
211211
"description": "Configuration for an authentication source",
212212
"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.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",
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": "tsx ./packages/git-proxy-cli/index.ts",

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": {
66
"git-proxy-cli": "./dist/index.js"

packages/git-proxy-cli/test/testCli.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ describe('test git-proxy-cli', function () {
7171
it(`"--version" option prints version details `, async function () {
7272
const cli = `${CLI_PATH} --version`;
7373
const expectedExitCode = 0;
74-
const expectedMessages = ['0.1.0'];
74+
const packageJson = require('../../../package.json');
75+
const version = packageJson.version;
76+
const expectedMessages = [version];
7577
const expectedErrorMessages = null;
7678
await helper.runCli(cli, expectedExitCode, expectedMessages, expectedErrorMessages);
7779
});

0 commit comments

Comments
 (0)