Downgrade revive & Temporary disable cljstyle (#3268)

* Downgrade revive * downgrade doc * Fix cljstyle installation * Disable cljstyle * Remove cljstyle from workflows --------- Co-authored-by: nvuillam <[email protected]>
oxsecurity · Jan 7, 2024 · b2da3a2 · b2da3a2
1 parent c9c770a
commit b2da3a2
Show file tree

Hide file tree

Showing 15 changed files with 21,105 additions and 21,124 deletions.
diff --git a/.github/workflows/deploy-BETA-linters.yml b/.github/workflows/deploy-BETA-linters.yml
@@ -84,7 +84,6 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
-            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

diff --git a/.github/workflows/deploy-DEV-linters.yml b/.github/workflows/deploy-DEV-linters.yml
@@ -55,7 +55,6 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
-            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

diff --git a/.github/workflows/deploy-RELEASE-linters.yml b/.github/workflows/deploy-RELEASE-linters.yml
@@ -59,7 +59,6 @@ jobs:
             "c_cpplint",
             "c_clang_format",
             "clojure_clj_kondo",
-            "clojure_cljstyle",
             "cloudformation_cfn_lint",
             "coffee_coffeelint",
             "copypaste_jscpd",

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ FROM golang:1-alpine as revive
 ## The golang image used as a builder is a temporary workaround 
 ## for the released revive binaries not returning version numbers (devel). 
 ## The install command should then be what is commented in the go.megalinter-descriptor.yml
-RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
+RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
 
 FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
 FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
@@ -526,11 +526,6 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 
-# cljstyle installation
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
-    && chmod +x install-cljstyle \
-    && ./install-cljstyle \
-
 # csharpier installation
     && dotnet tool install --global csharpier \
 

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -25,7 +25,7 @@ FROM golang:1-alpine as revive
 ## The golang image used as a builder is a temporary workaround 
 ## for the released revive binaries not returning version numbers (devel). 
 ## The install command should then be what is commented in the go.megalinter-descriptor.yml
-RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
+RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
 
 FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
 FROM mrtazz/checkmake:latest as checkmake
@@ -388,11 +388,6 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 
-# cljstyle installation
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
-    && chmod +x install-cljstyle \
-    && ./install-cljstyle \
-
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
 

diff --git a/flavors/cupcake/flavor.json b/flavors/cupcake/flavor.json
@@ -16,7 +16,6 @@
         "BASH_SHFMT",
         "C_CPPLINT",
         "CLOJURE_CLJ_KONDO",
-        "CLOJURE_CLJSTYLE",
         "CLOUDFORMATION_CFN_LINT",
         "COPYPASTE_JSCPD",
         "CPP_CPPLINT",

diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile
@@ -25,7 +25,7 @@ FROM golang:1-alpine as revive
 ## The golang image used as a builder is a temporary workaround 
 ## for the released revive binaries not returning version numbers (devel). 
 ## The install command should then be what is commented in the go.megalinter-descriptor.yml
-RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
+RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
 
 FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
 FROM mrtazz/checkmake:latest as checkmake

diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -304,11 +304,6 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
     && chmod +x install-clj-kondo \
     && ./install-clj-kondo \
 
-# cljstyle installation
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
-    && chmod +x install-cljstyle \
-    && ./install-cljstyle \
-
 # hadolint installation
 # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
 

diff --git a/flavors/java/flavor.json b/flavors/java/flavor.json
@@ -13,7 +13,6 @@
         "BASH_SHELLCHECK",
         "BASH_SHFMT",
         "CLOJURE_CLJ_KONDO",
-        "CLOJURE_CLJSTYLE",
         "COPYPASTE_JSCPD",
         "CSS_STYLELINT",
         "CSS_SCSS_LINT",

diff --git a/linters/clojure_cljstyle/Dockerfile b/linters/clojure_cljstyle/Dockerfile
@@ -164,7 +164,7 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases
         "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" \
 
 # cljstyle installation
-    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
+    && curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
     && chmod +x install-cljstyle \
     && ./install-cljstyle
 

diff --git a/linters/go_revive/Dockerfile b/linters/go_revive/Dockerfile
@@ -15,7 +15,7 @@ FROM golang:1-alpine as revive
 ## The golang image used as a builder is a temporary workaround 
 ## for the released revive binaries not returning version numbers (devel). 
 ## The install command should then be what is commented in the go.megalinter-descriptor.yml
-RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
+RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
 
 #FROM__END
 

diff --git a/megalinter/descriptors/all_flavors.json b/megalinter/descriptors/all_flavors.json
@@ -111,7 +111,6 @@
             "BASH_SHFMT",
             "C_CPPLINT",
             "CLOJURE_CLJ_KONDO",
-            "CLOJURE_CLJSTYLE",
             "CLOUDFORMATION_CFN_LINT",
             "COPYPASTE_JSCPD",
             "CPP_CPPLINT",
@@ -521,7 +520,6 @@
             "BASH_SHELLCHECK",
             "BASH_SHFMT",
             "CLOJURE_CLJ_KONDO",
-            "CLOJURE_CLJSTYLE",
             "COPYPASTE_JSCPD",
             "CSS_STYLELINT",
             "CSS_SCSS_LINT",

diff --git a/megalinter/descriptors/clojure.megalinter-descriptor.yml b/megalinter/descriptors/clojure.megalinter-descriptor.yml
@@ -89,6 +89,7 @@ linters:
 
     # cljstyle
   - linter_name: cljstyle
+    disabled: true # Disabled until https://github.com/greglook/cljstyle/issues/104 is solved
     linter_url: https://github.com/greglook/cljstyle
     linter_repo: https://github.com/greglook/cljstyle
     linter_rules_url: https://github.com/greglook/cljstyle/blob/main/doc/configuration.md#format-rules
@@ -112,7 +113,7 @@ linters:
     install:
       dockerfile:
         - |
-          RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/script/install-cljstyle \
+          RUN curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/greglook/cljstyle/main/util/install-cljstyle \
               && chmod +x install-cljstyle \
               && ./install-cljstyle
     ide:

diff --git a/megalinter/descriptors/go.megalinter-descriptor.yml b/megalinter/descriptors/go.megalinter-descriptor.yml
@@ -75,6 +75,8 @@ linters:
     examples:
       - "revive myfile.go"
       - "revive -config myfile.go"
+    downgraded_version: true
+    downgraded_reason: https://github.com/mgechev/revive/issues/956
     install:
       dockerfile:
         ## Until "FROM ghcr.io/mgechev/revive:1.2.5 as revive" is available, use
@@ -85,7 +87,7 @@ linters:
           ## The golang image used as a builder is a temporary workaround 
           ## for the released revive binaries not returning version numbers (devel). 
           ## The install command should then be what is commented in the go.megalinter-descriptor.yml
-          RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
+          RUN GOBIN=/usr/bin go install github.com/mgechev/revive@v1.3.4
         - COPY --link --from=revive /usr/bin/revive /usr/bin/revive
     ide:
       atom: