Skip to content

Commit

Permalink
Testing: git push auto fixed files (#4180)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
lukelloyd1985 and renovate[bot] authored Oct 22, 2024
1 parent d7f392b commit 6f241f1
Show file tree
Hide file tree
Showing 26 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion flavors/c_cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/ci_light/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion flavors/cupcake/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/documentation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/dotnetweb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/javascript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions flavors/salesforce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion flavors/security/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flavors/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linters/repository_trufflehog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

#############################################################################################
Expand Down
2 changes: 1 addition & 1 deletion linters/salesforce_lightning_flow_scanner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linters/salesforce_sfdx_scanner_apex/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linters/salesforce_sfdx_scanner_aura/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linters/salesforce_sfdx_scanner_lwc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
- |-
Expand Down
8 changes: 4 additions & 4 deletions megalinter/reporters/UpdatedSourcesReporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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(
Expand Down

0 comments on commit 6f241f1

Please sign in to comment.