From ea45e082b5771a36b8ad23a334d487c66e5550ad Mon Sep 17 00:00:00 2001
From: Javy de Koning <javydekoning+github@gmail.com>
Date: Thu, 1 Jun 2023 09:23:23 +0200
Subject: [PATCH] Upgrade megalinter to v7 (#632)

Co-authored-by: Javy de Koning <javy@amazon.nl>
---
 .github/workflows/mega-linter.yml |  6 +++---
 .mega-linter.yml                  | 13 +++----------
 .prettierrc.js                    |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
index 5294d254f..b288922be 100644
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@@ -1,6 +1,6 @@
 ---
 # MegaLinter GitHub Action configuration file
-# More info at https://oxsecurity.github.io/megalinter
+# More info at https://megalinter.io
 name: MegaLinter
 
 on: [push, pull_request]
@@ -27,10 +27,10 @@ jobs:
 
       - name: MegaLinter
         id: ml
-        uses: oxsecurity/megalinter@v6
+        uses: oxsecurity/megalinter@v7
         env:
           # All available variables are described in documentation
-          # https://oxsecurity.github.io/megalinter/configuration/
+          # https://megalinter.io/configuration/
           VALIDATE_ALL_CODEBASE: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.mega-linter.yml b/.mega-linter.yml
index 3e9e68a28..08d81fdda 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -1,5 +1,5 @@
 # Configuration file for MegaLinter
-# See all available variables at https://oxsecurity.github.io/megalinter/configuration/ and in linters documentation
+# See all available variables at https://megalinter.io/configuration/ and in linters documentation
 
 # all, none, or list of linter keys
 APPLY_FIXES: none
@@ -10,8 +10,7 @@ APPLY_FIXES: none
 # If you use ENABLE_LINTERS variable, all other linters will be disabled by default
 ENABLE_LINTERS:
   - BASH_EXEC
-  # Temporarely disable cfn-lint until megalinter v7 release.
-  # - CLOUDFORMATION_CFN_LINT
+  - CLOUDFORMATION_CFN_LINT
   - DOCKERFILE_HADOLINT
   - EDITORCONFIG_EDITORCONFIG_CHECKER
   - JSON_JSONLINT
@@ -22,22 +21,16 @@ ENABLE_LINTERS:
   - MARKDOWN_MARKDOWNLINT
   - MARKDOWN_MARKDOWN_TABLE_FORMATTER
   - SPELL_CSPELL
-  - SPELL_MISSPELL
   - TERRAFORM_TFLINT
   - YAML_YAMLLINT
 
-# DISABLE:
-#   - COPYPASTE # Comment to enable checks of excessive copy-pastes
-#   - SPELL # Comment to enable checks of spelling mistakes
-
 SARIF_REPORTER: true
 SHOW_ELAPSED_TIME: true
 FILEIO_REPORTER: false
-# DISABLE_ERRORS: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass
 
 # Install pluging for list handling.
 JSON_PRETTIER_PRE_COMMANDS:
-  - command: npm install prettier-plugin-multiline-arrays@1.1.0
+  - command: npm install -g prettier-plugin-multiline-arrays@1.1.3
     cwd: "workspace"
 
 CLOUDFORMATION_CFN_LINT_CONFIG_FILE: '.cfnlintrc'
diff --git a/.prettierrc.js b/.prettierrc.js
index 519d6676c..15479ccf8 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   plugins: [
-    '/node-deps/node_modules/prettier-plugin-multiline-arrays'
+    'prettier-plugin-multiline-arrays'
   ],
   trailingComma: 'es5',
   semi: false,