Skip to content

Commit b807e99

Browse files
zkoppertzkoppert
authored
Merge pull request #10 from github/upstream
Upstream
2 parents 4e51915 + 5ef42d2 commit b807e99

File tree

227 files changed

+10392
-7259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+10392
-7259
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
"image": "ghcr.io/super-linter/super-linter:latest",
44
"customizations": {
55
"vscode": {
6-
"settings": {},
6+
"settings": {
7+
"editor.defaultFormatter": "esbenp.prettier-vscode",
8+
"editor.wordWrap": "off",
9+
"prettier.resolveGlobalModules": true
10+
},
711
"extensions": [
812
"DavidAnson.vscode-markdownlint",
913
"EditorConfig.EditorConfig",
14+
"esbenp.prettier-vscode",
1015
"GitHub.vscode-github-actions",
1116
"GitHub.vscode-pull-request-github",
1217
"mads-hartmann.bash-ide-vscode",
@@ -24,18 +29,10 @@
2429
"type": "bind"
2530
},
2631
{
27-
"source": "${localWorkspaceFolder}/lib/linter.sh",
28-
"target": "/action/lib/linter.sh",
29-
"type": "bind"
30-
},
31-
{
32-
"source": "${localWorkspaceFolder}/lib/functions",
33-
"target": "/action/lib/functions",
32+
"source": "${localWorkspaceFolder}/lib",
33+
"target": "/action/lib",
3434
"type": "bind"
3535
}
3636
],
37-
"runArgs": [
38-
"--env-file",
39-
".devcontainer/devcontainer.env"
40-
]
37+
"runArgs": ["--env-file", ".devcontainer/devcontainer.env"]
4138
}

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ indent_size = 4
3333
# Disable the filename rule because our test case logic requires that files used in test cases
3434
# follow a certain syntax which is not compatible with what ktlint currently mandates (PascalCase)
3535
disabled_rules = filename
36+
37+
[*.md]
38+
39+
# Indentation in Markdown files might not be constant, or a multiple of 2.
40+
# Prettier takes care of formatting Markdown files.
41+
indent_size = unset

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,34 @@ body:
1313
label: Is there an existing issue for this?
1414
description: Search to see if an issue already exists for the bug you encountered.
1515
options:
16-
- label: I have searched the existing issues
17-
required: true
16+
- label: I have searched the existing issues
17+
required: true
18+
- type: checkboxes
19+
attributes:
20+
label: Are you using the latest Super-linter version available?
21+
description: |
22+
Ensure that you're using the latest Super-linter version.
23+
https://github.com/super-linter/super-linter/releases/latest
24+
options:
25+
- label: I am using the latest Super-linter version.
26+
required: true
27+
- label: |
28+
I can reproduce the issue running Super-linter using complete version identifier (example: vX.Y.Z), and not just with a partial one (example: vX)
29+
required: true
30+
- label: |
31+
I am using the super-linter/super-linter action or container image, and not the deprecated github/super-linter action or container image.
32+
required: true
33+
- type: checkboxes
34+
attributes:
35+
label: Are you resonably sure that it's a Super-linter issue, and not an issue related to a tool that Super-linter runs?
36+
description: |
37+
If you encounter a specific issue, ensure that the issue is about
38+
Super-linter, and not about a tool that Super-linter runs. For example,
39+
if a linter reports an unexpected or a surprising error, you may check
40+
if there are similar issues reported in that linter's issue tracker.
41+
options:
42+
- label: I think that this is a Super-linter issue.
43+
required: true
1844
- type: textarea
1945
attributes:
2046
label: Current Behavior
@@ -33,10 +59,33 @@ body:
3359
description: |
3460
Super-Linter version where you observed this issue
3561
placeholder: |
36-
vX.Y.Z
62+
vX.Y.Z
3763
render: markdown
3864
validations:
3965
required: true
66+
- type: textarea
67+
attributes:
68+
label: Super-linter configuration
69+
description: |
70+
How you configured Super-linter to experience the issue.
71+
If running on GitHub Actions, include the actions/checkout step
72+
as well.
73+
placeholder: |
74+
- name: Checkout code
75+
uses: actions/checkout@v4
76+
with:
77+
fetch-depth: 0
78+
79+
- name: Super-linter
80+
uses: super-linter/[email protected]
81+
env:
82+
# To report GitHub Actions status checks
83+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
84+
........
85+
........
86+
render: yaml
87+
validations:
88+
required: true
4089
- type: textarea
4190
id: logs
4291
attributes:
@@ -45,6 +94,7 @@ body:
4594
Copy and paste any relevant log output.
4695
This will be automatically formatted into code, so no need for backticks.
4796
Enable debug logging, either on GitHub Actions, or when running locally.
97+
Not attaching debug logging will delay the issue triaging process.
4898
render: shell
4999
validations:
50100
required: true
@@ -67,7 +117,5 @@ body:
67117
label: Anything else?
68118
description: |
69119
Links? References? Anything that will give us more context about the issue you are encountering!
70-
71-
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
72120
validations:
73121
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
22
blank_issues_enabled: false
3-
...

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ body:
1616
label: Is there an existing issue for this?
1717
description: Search to see if an issue already exists for the bug you encountered.
1818
options:
19-
- label: I have searched the existing issues
20-
required: true
19+
- label: I have searched the existing issues
20+
required: true
2121
- type: textarea
2222
attributes:
2323
label: Current Behavior
@@ -34,10 +34,6 @@ body:
3434
attributes:
3535
label: Anything else?
3636
description: |
37-
Links? References? Anything that will give us more context about the issue you are encountering!
38-
39-
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
37+
Links? References? Anything that will give us more context about the issue you are encountering.
4038
validations:
4139
required: false
42-
43-
---

‎.github/dependabot.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
#################################
55
version: 2
66
updates:
7-
87
- package-ecosystem: "devcontainers"
8+
commit-message:
9+
prefix: "chore(devcontainer)"
910
directory: "/"
1011
schedule:
1112
interval: weekly
1213
open-pull-requests-limit: 100
1314

1415
- package-ecosystem: github-actions
1516
commit-message:
16-
prefix: "deps(github-actions)"
17+
prefix: "ci(github-actions)"
1718
directory: "/"
1819
schedule:
1920
interval: "weekly"
@@ -77,15 +78,15 @@ updates:
7778

7879
- package-ecosystem: "docker"
7980
commit-message:
80-
prefix: "deps(dev-docker)"
81+
prefix: "ci(dev-docker)"
8182
directory: "/dev-dependencies"
8283
schedule:
8384
interval: "weekly"
8485
open-pull-requests-limit: 100
8586

8687
- package-ecosystem: "npm"
8788
commit-message:
88-
prefix: "deps(dev-npm)"
89+
prefix: "ci(dev-npm)"
8990
directory: "/dev-dependencies"
9091
schedule:
9192
interval: "weekly"

‎.github/linters/.cfnlintrc.yml‎

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

‎.github/linters/.checkov-test-linters-failure.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ directory:
55
- test/linters/checkov/bad
66

77
quiet: false
8-
9-
...

‎.github/linters/.checkov-test-linters-success.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,17 @@ directory:
55
- test/linters/checkov/good
66

77
quiet: false
8-
...
8+
9+
skip-framework:
10+
# The Kubernetes framework because it doesn't run Kustomize before running the
11+
# scan, as expected. There's the Kustomize framework for that.
12+
# If we don't skip the Kubernetes framework, Checkov reports issues against
13+
# Kubernetes descriptors that we handle with Kustomize. For example, we set
14+
# a non-default Kubernetes Namespace using Kustomize.
15+
# Checkov doesn't currently support skipping checks only for a given set of
16+
# frameworks, and the Kubernetes framework runs the same checks that the Helm
17+
# and the Kustomize frameworks run. So, we skip the Kubernetes framework when
18+
# running test cases. In case we need to implement new Kubernetes test cases,
19+
# we have to do that as part of the test Helm chart or the test Kustomize
20+
# "package".
21+
- kubernetes

‎.github/linters/.checkov.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ quiet: true
1717
skip-path:
1818
- test/linters/ansible
1919
- test/linters/arm
20-
- test/linters/checkov/bad
20+
# We can't exclude just test/linters/checkov/bad because of
21+
# https://github.com/bridgecrewio/checkov/issues/6468
22+
- test/linters/checkov
2123
- test/linters/dockerfile_hadolint
2224
- test/linters/jscpd
2325
- test/linters/json
@@ -26,4 +28,3 @@ skip-path:
2628
- test/linters/terraform_fmt
2729
- test/linters/terraform_tflint
2830
- test/linters/terraform_terrascan
29-
...

0 commit comments

Comments
 (0)