Testing: git push auto fixed files (#4180)

* git add commit push * git try if apply_fixes * check for GitHub and APPLY_FIXES * git error log format * chore(deps): update trufflesecurity/trufflehog docker tag to v3.82.12 (#4179) * chore(deps): update dependency sfdx-hardis to v5.2.4 (#4178) * apply_fixes typo correction * fixed typo in git error message --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
oxsecurity · Oct 22, 2024 · 6f241f1 · 6f241f1
1 parent d7f392b
commit 6f241f1
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,7 @@ ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=checkmarx/kics
 ARG REPOSITORY_KICS_VERSION=v2.1.3-alpine
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 # renovate: datasource=docker depName=ghcr.io/terraform-linters/tflint
@@ -103,7 +103,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 ARG ARM_TTK_NAME='master.zip'
 ARG ARM_TTK_URI='https://github.com/Azure/arm-ttk/archive/master.zip'
 ARG ARM_TTK_DIRECTORY='/opt/microsoft'

diff --git a/flavors/c_cpp/Dockerfile b/flavors/c_cpp/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile
@@ -19,7 +19,7 @@ ARG DOCKERFILE_HADOLINT_VERSION=v2.12.0-alpine
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 #ARGTOP__END
 
 #############################################################################################

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -27,7 +27,7 @@ ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=checkmarx/kics
 ARG REPOSITORY_KICS_VERSION=v2.1.3-alpine
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=ghcr.io/terraform-linters/tflint
 ARG TERRAFORM_TFLINT_VERSION=0.53.0
 # renovate: datasource=docker depName=tenable/terrascan

diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/dotnetweb/Dockerfile b/flavors/dotnetweb/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END
@@ -80,7 +80,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 # renovate: datasource=github-tags depName=detekt/detekt
 ARG DETEKT_VERSION=1.23.7
 

diff --git a/flavors/security/Dockerfile b/flavors/security/Dockerfile
@@ -23,7 +23,7 @@ ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=checkmarx/kics
 ARG REPOSITORY_KICS_VERSION=v2.1.3-alpine
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=ghcr.io/terraform-linters/tflint
 ARG TERRAFORM_TFLINT_VERSION=0.53.0
 # renovate: datasource=docker depName=tenable/terrascan

diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile
@@ -27,7 +27,7 @@ ARG PROTOBUF_PROTOLINT_VERSION=0.50.5
 # renovate: datasource=docker depName=zricethezav/gitleaks
 ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 #ARGTOP__END

diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile
@@ -29,7 +29,7 @@ ARG REPOSITORY_GITLEAKS_VERSION=v8.21.1
 # renovate: datasource=docker depName=checkmarx/kics
 ARG REPOSITORY_KICS_VERSION=v2.1.3-alpine
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 # renovate: datasource=docker depName=jdkato/vale
 ARG SPELL_VALE_VERSION=v3.7.1
 # renovate: datasource=docker depName=ghcr.io/terraform-linters/tflint

diff --git a/linters/repository_trufflehog/Dockerfile b/linters/repository_trufflehog/Dockerfile
@@ -12,7 +12,7 @@
 #############################################################################################
 #ARGTOP__START
 # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
 #ARGTOP__END
 
 #############################################################################################

diff --git a/linters/salesforce_lightning_flow_scanner/Dockerfile b/linters/salesforce_lightning_flow_scanner/Dockerfile
@@ -49,7 +49,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 # renovate: datasource=npm depName=lightning-flow-scanner
 ARG LIGHTNING_FLOW_SCANNER_VERSION=2.34.0
 #ARG__END

diff --git a/linters/salesforce_sfdx_scanner_apex/Dockerfile b/linters/salesforce_sfdx_scanner_apex/Dockerfile
@@ -49,7 +49,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 # renovate: datasource=npm depName=@salesforce/sfdx-scanner
 ARG SALESFORCE_SFDX_SCANNER_VERSION=4.6.0
 #ARG__END

diff --git a/linters/salesforce_sfdx_scanner_aura/Dockerfile b/linters/salesforce_sfdx_scanner_aura/Dockerfile
@@ -49,7 +49,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 # renovate: datasource=npm depName=@salesforce/sfdx-scanner
 ARG SALESFORCE_SFDX_SCANNER_VERSION=4.6.0
 #ARG__END

diff --git a/linters/salesforce_sfdx_scanner_lwc/Dockerfile b/linters/salesforce_sfdx_scanner_lwc/Dockerfile
@@ -49,7 +49,7 @@ ARG SALESFORCE_CLI_VERSION=2.62.6
 # renovate: datasource=npm depName=@salesforce/plugin-packaging
 ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
 # renovate: datasource=npm depName=sfdx-hardis
-ARG SFDX_HARDIS_VERSION=5.2.3
+ARG SFDX_HARDIS_VERSION=5.2.4
 # renovate: datasource=npm depName=@salesforce/sfdx-scanner
 ARG SALESFORCE_SFDX_SCANNER_VERSION=4.6.0
 #ARG__END

diff --git a/megalinter/descriptors/repository.megalinter-descriptor.yml b/megalinter/descriptors/repository.megalinter-descriptor.yml
@@ -620,7 +620,7 @@ linters:
       dockerfile:
         - |-
           # renovate: datasource=docker depName=trufflesecurity/trufflehog 
-          ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.11
+          ARG REPOSITORY_TRUFFLEHOG_VERSION=3.82.12
         - FROM trufflesecurity/trufflehog:${REPOSITORY_TRUFFLEHOG_VERSION} AS trufflehog
         - COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/
     test_folder: gitleaks
diff --git a/megalinter/descriptors/salesforce.megalinter-descriptor.yml b/megalinter/descriptors/salesforce.megalinter-descriptor.yml
@@ -16,7 +16,7 @@ install:
       ARG SALESFORCE_PLUGIN_PACKAGING_VERSION=2.8.12
     - |-
       # renovate: datasource=npm depName=sfdx-hardis
-      ARG SFDX_HARDIS_VERSION=5.2.3
+      ARG SFDX_HARDIS_VERSION=5.2.4
     - ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
     - ENV PATH="$JAVA_HOME/bin:${PATH}"
     - |-

diff --git a/megalinter/reporters/UpdatedSourcesReporter.py b/megalinter/reporters/UpdatedSourcesReporter.py
@@ -61,12 +61,11 @@ def produce_report(self):
         if len(updated_files) > 0:
             logging.info(
                 f"[Updated Sources Reporter] copied {str(len(updated_files))} fixed source files"
-                f" in folder {updated_sources_dir}.\n"
-                "Download it from artifacts then copy-paste it in your local repo to apply linters updates"
+                f" in folder {updated_sources_dir}."
             )
 
             if not config.exists(self.master.request_id, "GITHUB_REPOSITORY"):
-                apply_fixes = config.get_list(self.master.request_id, "APPLY_FIXES", "none")
+                apply_fixes = config.get(self.master.request_id, "APPLY_FIXES", "none")
                 if apply_fixes.lower() != "none":
                     try:
                         repo = git.Repo(os.path.realpath(self.master.github_workspace))
@@ -75,7 +74,8 @@ def produce_report(self):
                         repo.git.push
                     except Exception as exp:
                         logging.error(
-                            "[Updated Sources Reporter] Failed to git push auto fixes: " + str(exp.message)
+                            "[Updated Sources Reporter] Failed to git push auto fixes: " + str(exp.message) + "\n"
+                            "Download it from artifacts then copy-paste it in your local repo to apply linters updates"
                         )
         else:
             logging.info(