Skip to content

Commit

Permalink
[automation] Auto-update linters version, help and documentation (oxs…
Browse files Browse the repository at this point in the history
…ecurity#3086)

* Update .lintr config in template and tests to address depreciation, and sync bad test file with newest lintr default test file

* Temporarily add openssl to DEFAULT_DOCKERFILE_APK_PACKAGES to fix CVE-2023-5363

* [build-command] Update generated files

* Remove extra line break to trigger checks

* Fix flake8 error (line too long) in constants.py

* Set the expected output for the vector_logic linter of lintr

* Update flavors-stats.json

---------

Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 12, 2023
1 parent 418e3e3 commit 6843252
Show file tree
Hide file tree
Showing 161 changed files with 779 additions and 248 deletions.
369 changes: 336 additions & 33 deletions .automation/generated/flavors-stats.json

Large diffs are not rendered by default.

123 changes: 72 additions & 51 deletions .automation/generated/linter-helps.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions .automation/generated/linter-versions.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"actionlint": "1.6.26",
"ansible-lint": "6.21.1",
"ansible-lint": "6.22.0",
"arm-ttk": "0.0.0",
"bandit": "1.7.5",
"bash-exec": "5.2.15",
"bicep_linter": "0.23.1",
"black": "23.10.1",
"black": "23.11.0",
"cfn-lint": "0.83.1",
"checkmake": "0.2.0",
"checkov": "3.0.24",
"checkov": "3.0.32",
"checkstyle": "10.12.4",
"chktex": "1.7.8",
"clippy": "0.1.73",
"clj-kondo": "2023.10.20",
"cljstyle": "0.15.0",
"coffeelint": "5.2.11",
"cpplint": "1.6.1",
"csharpier": "0.26.0",
"cspell": "7.3.8",
"csharpier": "0.26.1",
"cspell": "8.0.0",
"dartanalyzer": "0.0.0",
"devskim": "1.0.23",
"djlint": "1.34.0",
Expand All @@ -42,7 +42,7 @@
"isort": "5.12.0",
"jscpd": "3.5.10",
"jsonlint": "14.0.3",
"kics": "1.7.10",
"kics": "1.7.11",
"ktlint": "1.0.1",
"kubeconform": "0.6.3",
"kubescape": "2.9.0",
Expand All @@ -54,7 +54,7 @@
"markdown-table-formatter": "1.4.0",
"markdownlint": "0.37.0",
"misspell": "0.3.4",
"mypy": "1.6.1",
"mypy": "1.7.0",
"npm-groovy-lint": "12.0.1",
"npm-package-json-lint": "7.1.0",
"perlcritic": "1.152",
Expand All @@ -71,15 +71,15 @@
"psalm": "Psalm.5.15.0@",
"puppet-lint": "4.2.1",
"pylint": "3.0.2",
"pyright": "1.1.334",
"pyright": "1.1.335",
"raku": "2020.10",
"remark-lint": "14.0.2",
"revive": "1.3.4",
"rst-lint": "1.4.0",
"rstcheck": "6.2.0",
"rstfmt": "0.0.14",
"rubocop": "1.57.2",
"ruff": "0.1.4",
"ruff": "0.1.5",
"scalafix": "0.11.1",
"scss-lint": "0.60.0",
"secretlint": "7.0.7",
Expand All @@ -97,8 +97,8 @@
"sqlfluff": "2.3.5",
"standard": "17.1.0",
"stylelint": "15.11.0",
"swiftlint": "0.53.0",
"syft": "0.94.0",
"swiftlint": "0.54.0",
"syft": "0.96.0",
"tekton-lint": "0.6.0",
"terraform-fmt": "1.6.3",
"terragrunt": "0.53.2",
Expand All @@ -112,5 +112,5 @@
"v8r": "2.1.0",
"vale": "2.29.5",
"xmllint": "21104",
"yamllint": "1.32.0"
"yamllint": "1.33.0"
}
2 changes: 1 addition & 1 deletion .automation/test/r/.lintr
Original file line number Diff line number Diff line change
@@ -1 +1 @@
linters: with_defaults(object_usage_linter = NULL)
linters: linters_with_defaults(object_usage_linter = NULL)
25 changes: 19 additions & 6 deletions .automation/test/r/r_bad_1.r
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# assignment
# function_left_parentheses
# closed_curly
# brace_linter
# commas
# paren_brace
f = function (x,y = 1){}
Expand All @@ -12,32 +12,45 @@ f = function (x,y = 1){}

# cyclocomp
# equals_na
# brace_linter
# indentation
# infix_spaces
# line_length
# object_length
# object_name
# object_usage
# open_curly
someComplicatedFunctionWithALongCameCaseName <- function(x)
# T_and_F_symbol
someComplicatedFunctionWithALongCamelCaseName <- function(x)
{
y <- 1
if (1 > 2 && 2 > 3 && 3 > 4 && 4 > 5 && 5*10 > 6 && x == NA) {TRUE} else {FALSE}
y <- 1
if (1 > 2 && 2 > 3 && 3 > 4 && 4 > 5 && 5*10 > 6 && 5 > 6 && 6 > 7 && x == NA) {T} else F
}

# vector_logic
if (1 & 2) FALSE else TRUE

# function_brace
my_metric <- function(x)
sum(x) + prod(x)

# no_tab
# pipe_continuation
# seq_linter
# spaces_inside
# indentation
x <- 1:10
x[ 2]
1:length(x) %>% lapply(function(x) x*2) %>%
head()
head()

# single_quotes
message('single_quotes')

# spaces_left_parentheses
# trailing_whitespace
y <- 2 +(1:10)
# semicolon
x <- 42; y <- 2 +(1:10)

# trailing_blank_lines

17 changes: 16 additions & 1 deletion .automation/test/r/r_good_1.r
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# assignment
# function_left_parentheses
# closed_curly
# brace_linter
# commas
# paren_brace
f <- function(x, y = 1) {
Expand All @@ -13,12 +13,15 @@ f <- function(x, y = 1) {

# cyclocomp
# equals_na
# brace_linter
# indentation
# infix_spaces
# line_length
# object_length
# object_name
# object_usage
# open_curly
# T_and_F_symbol
short_snake <- function(x) {
y <- 1
y <- y^2
Expand All @@ -29,9 +32,19 @@ short_snake <- function(x) {
}
}

# vector_logic
if (1 && 2) FALSE else TRUE

# function_brace
my_metric <- function(x) {
sum(x) + prod(x)
}

# no_tab
# pipe_continuation
# seq_linter
# spaces_inside
# indentation
x <- 1:10
x[2]
seq_len(x) %>%
Expand All @@ -43,6 +56,8 @@ message("single_quotes")

# spaces_left_parentheses
# trailing_whitespace
# semicolon
x <- 42
y <- 2 + (1:10)

# trailing_blank_lines
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l

- Allow to use value `any` to always activate a linter who as a **_DIRECTORY** variable. Example: `KUBERNETES_DIRECTORY: any`
- New flavor **c_cpp**: New flavor for pure C/C++ projects
- Updated lintr config template to use `linters_with_defaults()` (formerly `with_defaults()`)

- CI
- Upgrade pymdown-extensions and markdown, by @BryanQuigley in [#3053](https://github.com/oxsecurity/megalinter/pull/3053)
Expand Down Expand Up @@ -48,6 +49,18 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
- [trivy](https://aquasecurity.github.io/trivy/) from 0.46.1 to **0.47.0** on 2023-11-06
- [terragrunt](https://terragrunt.gruntwork.io) from 0.53.1 to **0.53.2** on 2023-11-06
- [csharpier](https://csharpier.com/) from 0.25.0 to **0.26.0** on 2023-11-07
- [ansible-lint](https://ansible-lint.readthedocs.io/) from 6.21.1 to **6.22.0** on 2023-11-11
- [csharpier](https://csharpier.com/) from 0.26.0 to **0.26.1** on 2023-11-11
- [black](https://black.readthedocs.io/en/stable/) from 23.10.1 to **23.11.0** on 2023-11-11
- [mypy](https://mypy.readthedocs.io/en/stable/) from 1.6.1 to **1.7.0** on 2023-11-11
- [pyright](https://github.com/Microsoft/pyright) from 1.1.334 to **1.1.335** on 2023-11-11
- [ruff](https://github.com/astral-sh/ruff) from 0.1.4 to **0.1.5** on 2023-11-11
- [checkov](https://www.checkov.io/) from 3.0.24 to **3.0.32** on 2023-11-11
- [kics](https://www.kics.io) from 1.7.10 to **1.7.11** on 2023-11-11
- [syft](https://github.com/anchore/syft) from 0.94.0 to **0.96.0** on 2023-11-11
- [cspell](https://github.com/streetsidesoftware/cspell/tree/master/packages/cspell) from 7.3.8 to **8.0.0** on 2023-11-11
- [swiftlint](https://github.com/realm/SwiftLint) from 0.53.0 to **0.54.0** on 2023-11-11
- [yamllint](https://yamllint.readthedocs.io/) from 1.32.0 to **1.33.0** on 2023-11-11
<!-- linter-versions-end -->

## [v7.5.0] - 2023-10-29
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ RUN apk add --no-cache \
make \
musl-dev \
openssh \
openssl \
docker \
openrc \
icu-libs \
Expand Down Expand Up @@ -122,7 +123,6 @@ RUN apk add --no-cache \
helm \
gcompat \
libc6-compat \
openssl \
readline-dev \
g++ \
libc-dev \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[![MegaLinter](https://github.com/oxsecurity/megalinter/workflows/MegaLinter/badge.svg?branch=main)](https://github.com/oxsecurity/megalinter/actions?query=workflow%3AMegaLinter+branch%3Amain)
[![codecov](https://codecov.io/gh/oxsecurity/megalinter/branch/main/graph/badge.svg)](https://codecov.io/gh/oxsecurity/megalinter)
<!-- gh-dependents-info-used-by-start -->
[![](https://img.shields.io/static/v1?label=Used%20by&message=3138&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
[![](https://img.shields.io/static/v1?label=Used%20by&message=3155&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
[![Secured with Trivy](https://img.shields.io/badge/Trivy-secured-green?logo=docker)](https://github.com/aquasecurity/trivy)
[![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
[![GitHub Sponsors](https://img.shields.io/github/sponsors/nvuillam)](https://github.com/sponsors/nvuillam)
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATES/.lintr
Original file line number Diff line number Diff line change
@@ -1 +1 @@
linters: with_defaults(object_usage_linter = NULL)
linters: linters_with_defaults(object_usage_linter = NULL)
Loading

0 comments on commit 6843252

Please sign in to comment.