diff --git a/.automation/test/terraform_terrascan/good/terraform-terrascan_good_1.tf b/.automation/test/terraform_terrascan/good/terraform-terrascan_good_1.tf index f4e87e01..39afe51c 100644 --- a/.automation/test/terraform_terrascan/good/terraform-terrascan_good_1.tf +++ b/.automation/test/terraform_terrascan/good/terraform-terrascan_good_1.tf @@ -1,6 +1,7 @@ resource "aws_instance" "instanceWithVpc" { ami = "some-id" instance_type = "t2.micro" + monitoring = true vpc_security_group_ids = ["sg-12345678901234567"] subnet_id = "subnet-12345678901234567" diff --git a/.github/workflows/deploy-DEV.yml b/.github/workflows/deploy-DEV.yml index 5c30775e..fb7bb111 100644 --- a/.github/workflows/deploy-DEV.yml +++ b/.github/workflows/deploy-DEV.yml @@ -143,8 +143,6 @@ jobs: -e RUN_LOCAL=true \ -e TEST_CASE_RUN=true \ -e ANSIBLE_DIRECTORY=.automation/test/ansible \ - -e OUTPUT_FORMAT=tap -e OUTPUT_FOLDER=${GITHUB_SHA} \ - -e OUTPUT_DETAILS=detailed \ -e ACTIONS_RUNNER_DEBUG=true \ -e ERROR_ON_MISSING_EXEC_BIT=true \ -v ${GITHUB_WORKSPACE}:/tmp/lint \ diff --git a/Dockerfile b/Dockerfile index 71485b70..ba8a8e57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,7 +127,7 @@ RUN pip3 install --no-cache-dir pipenv \ && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ && chmod +x dotnet-install.sh \ && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel Current -version latest \ - && /usr/share/dotnet/dotnet tool install --tool-path /usr/bin dotnet-format + && /usr/share/dotnet/dotnet tool install --tool-path /usr/bin dotnet-format --version 5.0.211103 ############################## # Installs Perl dependencies # diff --git a/README.md b/README.md index 38bd9c62..3bcaf047 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,6 @@ But if you wish to select or exclude specific linters, we give you full control | **MULTI_STATUS** | `true` | A status API is made for each language that is linted to make visual parsing easier. | | **MARKDOWN_CONFIG_FILE** | `.markdown-lint.yml` | Filename for [Markdownlint configuration](https://github.com/DavidAnson/markdownlint#optionsconfig) (ex: `.markdown-lint.yml`, `.markdownlint.json`, `.markdownlint.yaml`) | | **MARKDOWN_CUSTOM_RULE_GLOBS** | `.markdown-lint/rules,rules/**` | Comma-separated list of [file globs](https://github.com/igorshubovych/markdownlint-cli#globbing) matching [custom Markdownlint rule files](https://github.com/DavidAnson/markdownlint/blob/main/doc/CustomRules.md). | -| **OUTPUT_DETAILS** | `simpler` | What level of details to be reported. Supported formats: simpler or detailed. | | **PYTHON_BLACK_CONFIG_FILE** | `.python-black` | Filename for [black configuration](https://github.com/psf/black/blob/master/docs/compatible_configs.md) (ex: `.isort.cfg`, `pyproject.toml`) | | **PYTHON_FLAKE8_CONFIG_FILE** | `.flake8` | Filename for [flake8 configuration](https://flake8.pycqa.org/en/latest/user/configuration.html) (ex: `.flake8`, `tox.ini`) | | **PYTHON_ISORT_CONFIG_FILE** | `.isort.cfg` | Filename for [isort configuration](https://pycqa.github.io/isort/docs/configuration/config_files/) (ex: `.isort.cfg`, `pyproject.toml`) | diff --git a/lib/linter.sh b/lib/linter.sh index 154c3b4f..164934a7 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -54,8 +54,6 @@ source /action/lib/functions/linterVersions.sh # Source the function script(s) # shellcheck source=/dev/null source /action/lib/functions/log.sh # Source the function script(s) # shellcheck source=/dev/null -source /action/lib/functions/tapLibrary.sh # Source the function script(s) -# shellcheck source=/dev/null source /action/lib/functions/updateSSL.sh # Source the function script(s) # shellcheck source=/dev/null source /action/lib/functions/validation.sh # Source the function script(s) @@ -308,13 +306,6 @@ export RAW_FILE_ARRAY # Workaround SC2034 TEST_CASE_FOLDER='.automation/test' # Folder for test cases we should always ignore export TEST_CASE_FOLDER # Workaround SC2034 -############## -# Format # -############## -# OUTPUT_FORMAT="${OUTPUT_FORMAT}" # Output format to be generated. Default none -OUTPUT_FOLDER="${OUTPUT_FOLDER:-super-linter.report}" # Folder where the reports are generated. Default super-linter.report -OUTPUT_DETAILS="${OUTPUT_DETAILS:-simpler}" # What level of details. (simpler or detailed). Default simpler - ########################## # Array of changed files # ########################## @@ -411,11 +402,6 @@ GetGitHubVars() { fatal "Provided volume is not a directory!" fi - ################################ - # Set the report output folder # - ################################ - REPORT_OUTPUT_FOLDER="${DEFAULT_WORKSPACE}/${OUTPUT_FOLDER}" - info "Linting all files in mapped directory:[${DEFAULT_WORKSPACE}]" # No need to touch or set the GITHUB_SHA @@ -717,16 +703,6 @@ trap 'cleanup' 0 1 2 3 6 14 15 ########## Header -############################################################## -# check flag for validating the report folder does not exist # -############################################################## -if [ -n "${OUTPUT_FORMAT}" ]; then - if [ -d "${REPORT_OUTPUT_FOLDER}" ]; then - error "ERROR! Found ${REPORT_OUTPUT_FOLDER}" - fatal "Please remove the folder and try again." - fi -fi - ################################## # Get and print all version info # ################################## @@ -747,8 +723,6 @@ export DEFAULT_ANSIBLE_DIRECTORY DEFAULT_TEST_CASE_ANSIBLE_DIRECTORY="${GITHUB_WORKSPACE}/${TEST_CASE_FOLDER}/ansible" # Default Ansible directory when running test cases export DEFAULT_TEST_CASE_ANSIBLE_DIRECTORY # Workaround SC2034 -REPORT_OUTPUT_FOLDER="${GITHUB_WORKSPACE}/${OUTPUT_FOLDER}" # Location for the report folder - ############################ # Validate the environment # ############################