Skip to content

Commit 4b79374

Browse files
EliSchleiferEliSchleifer
authored
Add additional environment variables used by python networking stack (#1032)
Add additional environment variables used by python networking stack Passes thru additional environment variable to PIP to unblock pip and other PYTHON libraries that use proxy info. Fixes broken trunk check in OpenAI Codex
1 parent 0d2348e commit 4b79374

File tree

26 files changed

+597
-586
lines changed

26 files changed

+597
-586
lines changed

‎.github/actions/action_tests/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ runs:
2828
using: composite
2929
steps:
3030
- name: Setup node
31-
uses: actions/setup-node@v3
31+
uses: actions/setup-node@v4
3232
with:
33-
node-version: 18
33+
node-version: 22
3434

3535
- name: Specify defaults
3636
run: |

‎.github/actions/linter_tests/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ runs:
4242
using: composite
4343
steps:
4444
- name: Setup node
45-
uses: actions/setup-node@v3
45+
uses: actions/setup-node@v4
4646
with:
47-
node-version: 18
47+
node-version: 22
4848

4949
# NOTE: tzdata is a dependency of php, but without the DEBIAN_FRONTEND=noninteractive
5050
# it will prompt for a timezone selection

‎.github/actions/tool_tests/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ runs:
3232
using: composite
3333
steps:
3434
- name: Setup node
35-
uses: actions/setup-node@v3
35+
uses: actions/setup-node@v4
3636
with:
37-
node-version: 18
37+
node-version: 22
3838

3939
- name: Install packages and specify defaults
4040
run: |

‎.trunk/trunk.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.1
22

33
# version used for local trunk runs and testing
44
cli:
5-
version: 1.22.12
5+
version: 1.22.15
66
shell_hooks:
77
enforce: true
88

@@ -17,7 +17,11 @@ plugins:
1717

1818
- id: configs
1919
uri: https://github.com/trunk-io/configs
20-
ref: v1.0.11
20+
ref: v1.0.12
21+
22+
runtimes:
23+
enabled:
24+
- node@22.16.0
2125

2226
lint:
2327
files:
@@ -41,8 +45,9 @@ lint:
4145
success_codes: [0]
4246
enabled:
4347
# enabled linters inherited from github.com/trunk-io/configs plugin
48+
- pmd@pmd_releases/7.12.0
4449
- definition-checker
45-
- eslint@9.24.0
50+
- eslint@9.27.0
4651
- trunk-toolbox@0.5.4
4752
disabled:
4853
- pylint # pylint diagnostics are too strict

‎linters/cfnlint/plugin.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tools:
55
runtime: python
66
package: cfn-lint
77
shims: [cfn-lint]
8-
known_good_version: 0.58.2
8+
known_good_version: 1.35.3
99
lint:
1010
definitions:
1111
- name: cfnlint
@@ -22,7 +22,7 @@ lint:
2222
tools: [cfnlint]
2323
suggest_if: files_present
2424
issue_url_format: https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md
25-
known_good_version: 0.58.2
25+
known_good_version: 1.35.3
2626
version_command:
2727
parse_regex: ${semver}
2828
run: cfn-lint --version

‎linters/cfnlint/test_data/cfnlint_v1.35.3_basic.check.shot‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`Testing linter cfnlint test basic 1`] = `
4+
{
5+
"issues": [
6+
{
7+
"code": "E3030",
8+
"column": "7",
9+
"file": "test_data/basic.in.yaml",
10+
"issueClass": "ISSUE_CLASS_EXISTING",
11+
"issueUrl": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md",
12+
"level": "LEVEL_HIGH",
13+
"line": "19",
14+
"linter": "cfnlint",
15+
"message": "'DNSS' is not one of ['DNS', 'EMAIL', 'HTTP']",
16+
"targetType": "cloudformation",
17+
},
18+
{
19+
"code": "E3012",
20+
"column": "7",
21+
"file": "test_data/basic.in.yaml",
22+
"issueClass": "ISSUE_CLASS_EXISTING",
23+
"issueUrl": "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/rules.md",
24+
"level": "LEVEL_HIGH",
25+
"line": "21",
26+
"linter": "cfnlint",
27+
"message": "'*.test.io' is not of type 'array'",
28+
"targetType": "cloudformation",
29+
},
30+
],
31+
"lintActions": [
32+
{
33+
"command": "lint",
34+
"fileGroupName": "cloudformation",
35+
"linter": "cfnlint",
36+
"paths": [
37+
"test_data/basic.in.yaml",
38+
],
39+
"verb": "TRUNK_VERB_CHECK",
40+
},
41+
{
42+
"command": "lint",
43+
"fileGroupName": "cloudformation",
44+
"linter": "cfnlint",
45+
"paths": [
46+
"test_data/basic.in.yaml",
47+
],
48+
"upstream": true,
49+
"verb": "TRUNK_VERB_CHECK",
50+
},
51+
],
52+
"taskFailures": [],
53+
"unformattedFiles": [],
54+
}
55+
`;

‎linters/pmd/plugin.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ lint:
6565
files: [java]
6666
runtime: java
6767
suggest_if: never
68-
known_good_version: 6.55.0
68+
known_good_version: 7.13.0
6969
known_bad_versions:
7070
- pmd_releases/7.0.0-rc4
7171
- pmd_releases/7.0.0-rc3

‎linters/pmd/test_data/pmd_v7.0.0_CUSTOM.check.shot‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = `
88
"column": "8",
99
"file": "test_data/apex.in.cls",
1010
"issueClass": "ISSUE_CLASS_EXISTING",
11-
"level": "LEVEL_HIGH",
11+
"level": "LEVEL_MEDIUM",
1212
"line": "1",
1313
"linter": "pmd",
1414
"message": "Missing ApexDoc comment",
@@ -26,7 +26,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = `
2626
"column": "8",
2727
"file": "test_data/apex.in.cls",
2828
"issueClass": "ISSUE_CLASS_EXISTING",
29-
"level": "LEVEL_HIGH",
29+
"level": "LEVEL_MEDIUM",
3030
"line": "1",
3131
"linter": "pmd",
3232
"message": "Avoid using global modifier",
@@ -44,7 +44,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = `
4444
"column": "8",
4545
"file": "test_data/apex.in.cls",
4646
"issueClass": "ISSUE_CLASS_EXISTING",
47-
"level": "LEVEL_HIGH",
47+
"level": "LEVEL_MEDIUM",
4848
"line": "2",
4949
"linter": "pmd",
5050
"message": "Missing ApexDoc comment",
@@ -62,7 +62,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = `
6262
"column": "1",
6363
"file": "test_data/hello.in.java",
6464
"issueClass": "ISSUE_CLASS_EXISTING",
65-
"level": "LEVEL_HIGH",
65+
"level": "LEVEL_MEDIUM",
6666
"line": "3",
6767
"linter": "pmd",
6868
"message": "All classes, interfaces, enums and annotations must belong to a named package",
@@ -80,7 +80,7 @@ exports[`Testing linter pmd test CUSTOM 1`] = `
8080
"column": "1",
8181
"file": "test_data/hello.in.java",
8282
"issueClass": "ISSUE_CLASS_EXISTING",
83-
"level": "LEVEL_HIGH",
83+
"level": "LEVEL_MEDIUM",
8484
"line": "3",
8585
"linter": "pmd",
8686
"message": "This utility class has a non-private constructor",

‎linters/semgrep/plugin.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tools:
55
runtime: python
66
package: semgrep
77
shims: [semgrep]
8-
known_good_version: 1.33.2
8+
known_good_version: 1.222.0
99
lint:
1010
definitions:
1111
- name: semgrep
@@ -34,7 +34,7 @@ lint:
3434
environment:
3535
- name: PATH
3636
list: ["${env.PATH}"]
37-
known_good_version: 1.33.2
37+
known_good_version: 1.122.0
3838
known_bad_versions: [1.5.1, 1.117.0] # Does not work on MacOS
3939
version_command:
4040
parse_regex: ${semver}

‎linters/semgrep/semgrep.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ import { customLinterCheckTest } from "tests";
22
import { skipOS, TEST_DATA } from "tests/utils";
33

44
// Note semgrep runs can take a while since they require downloading rulesets each time.
5-
customLinterCheckTest({ linterName: "semgrep", args: TEST_DATA, skipTestIf: skipOS(["win32"]) });
5+
customLinterCheckTest({
6+
linterName: "semgrep",
7+
args: `${TEST_DATA} --cache=false`,
8+
skipTestIf: skipOS(["win32"]),
9+
});

0 commit comments

Comments
 (0)