Merge branch 'main' into remove-trailing-space

parkerbxyz · parkerbxyz · commit cd635a8ed761 · 2022-10-21T18:32:15.000-07:00
diff --git a/.automation/test/markdown/markdown_good_1.md b/.automation/test/markdown/markdown_good_1.md
@@ -22,4 +22,5 @@ ls -la
 ### Walk away
 
 We're all done **here**.
+
 - [Link Action](https://github.com)
diff --git a/.automation/test/markdown/markdown_good_2.md b/.automation/test/markdown/markdown_good_2.md
@@ -22,4 +22,5 @@ ls -la
 ### Walk away
 
 We're all done **here**.
+
 - [Link Action](https://github.com)
diff --git a/.github/linters/.cspell.json b/.github/linters/.cspell.json
@@ -507,6 +507,7 @@
         "customrules",
         "cyclomatic",
         "dartanalyzer",
+        "davidanson",
         "debugent",
         "decamelize",
         "dedup",
@@ -1337,4 +1338,4 @@
         "\u0636clojure",
         "\u077bcbad"
     ]
-}
+}
diff --git a/Dockerfile b/Dockerfile
@@ -213,7 +213,7 @@ RUN npm --no-cache install --ignore-scripts \
                 v8r \
                 eslint-plugin-react \
                 eslint-plugin-jsx-a11y \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/docs/descriptors/markdown_markdownlint.md b/docs/descriptors/markdown_markdownlint.md
@@ -6,7 +6,7 @@
 
 - Version in MegaLinter: **0.32.2**
 - Visit [Official Web Site](https://github.com/DavidAnson/markdownlint#readme){target=_blank}
-- See [How to configure markdownlint rules](https://github.com/igorshubovych/markdownlint-cli#configuration){target=_blank}
+- See [How to configure markdownlint rules](https://github.com/DavidAnson/markdownlint-cli2#configuration){target=_blank}
   - If custom `.markdownlint.json` config file is not found, [.markdownlint.json](https://github.com/oxsecurity/megalinter/tree/main/TEMPLATES/.markdownlint.json){target=_blank} will be used
 - See [How to disable markdownlint rules in files](https://github.com/DavidAnson/markdownlint#configuration){target=_blank}
 - See [Index of problems detected by markdownlint](https://github.com/DavidAnson/markdownlint#rules--aliases){target=_blank}
@@ -121,4 +121,4 @@ Options:
 ### Installation on mega-linter Docker image
 
 - NPM packages (node.js):
-  - [markdownlint-cli](https://www.npmjs.com/package/markdownlint-cli)
+  - [markdownlint-cli2](https://www.npmjs.com/package/markdownlint-cli2)
diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile
@@ -126,7 +126,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile
@@ -144,7 +144,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile
@@ -126,7 +126,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -127,7 +127,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile
@@ -143,7 +143,7 @@ RUN npm --no-cache install --ignore-scripts \
                 v8r \
                 eslint-plugin-react \
                 eslint-plugin-jsx-a11y \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
@@ -148,7 +148,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile
@@ -135,7 +135,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile
@@ -126,7 +126,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile
@@ -126,7 +126,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile
@@ -127,7 +127,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile
@@ -128,7 +128,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile
@@ -130,7 +130,7 @@ RUN npm --no-cache install --ignore-scripts \
                 @microsoft/eslint-formatter-sarif \
                 v8r \
                 prettier \
-                markdownlint-cli \
+                markdownlint-cli2 \
                 markdown-link-check \
                 markdown-table-formatter \
                 @stoplight/spectral@5.6.0 \
diff --git a/linters/markdown_markdownlint/Dockerfile b/linters/markdown_markdownlint/Dockerfile
@@ -80,7 +80,7 @@ RUN npm install npm@latest-6 -g || true && \
 
 #NPM__START
 RUN npm install --no-cache --ignore-scripts \
-                markdownlint-cli
+                markdownlint-cli2
 #NPM__END
 
 # Add node packages to path #
diff --git a/megalinter/descriptors/markdown.megalinter-descriptor.yml b/megalinter/descriptors/markdown.megalinter-descriptor.yml
@@ -17,19 +17,24 @@ linters:
     linter_repo: https://github.com/DavidAnson/markdownlint
     linter_rules_url: https://github.com/DavidAnson/markdownlint#rules--aliases
     linter_image_url: https://davidanson.gallerycdn.vsassets.io/extensions/davidanson/vscode-markdownlint/0.37.1/1601748708034/Microsoft.VisualStudio.Services.Icons.Default
-    linter_rules_configuration_url: https://github.com/igorshubovych/markdownlint-cli#configuration
+    linter_rules_configuration_url: https://github.com/DavidAnson/markdownlint-cli2#configuration
     linter_rules_inline_disable_url: https://github.com/DavidAnson/markdownlint#configuration
     cli_lint_mode: list_of_files
-    config_file_name: .markdownlint.json
-    cli_lint_fix_arg_name: "--fix"
+    config_file_name: LINTER_DEFAULT
+    cli_executable: markdownlint-cli2
+    cli_executable_version: "markdownlint-cli2 | head -n1"
+    cli_executable_fix: "markdownlint-cli2-fix"
+    cli_help_arg_name: "| tail -n +4"
+    cli_version_arg_name: ""
     cli_lint_errors_count: total_lines
+    cli_docker_image: "davidanson/markdownlint-cli2"
     examples:
-      - "markdownlint myfile.md"
-      - "markdownlint -c .markdownlint.json myfile.md"
-      - "markdownlint --fix -c .markdownlint.json myfile.md"
+      - "markdownlint-cli2 myfile.md"
+      - "markdownlint-cli2-fix myfile.md"
+      - "markdownlint-cli2-config .markdownlint.json myfile.md"
     install:
       npm:
-        - markdownlint-cli
+        - markdownlint-cli2
     ide:
       atom:
         - name: linter-node-markdownlint
diff --git a/megalinter/descriptors/schemas/megalinter-configuration.jsonschema.json b/megalinter/descriptors/schemas/megalinter-configuration.jsonschema.json
@@ -6476,7 +6476,7 @@
     },
     "MARKDOWN_MARKDOWNLINT_CONFIG_FILE": {
       "$id": "#/properties/MARKDOWN_MARKDOWNLINT_CONFIG_FILE",
-      "default": ".markdownlint.json",
+      "default": "LINTER_DEFAULT",
       "description": "MARKDOWN_MARKDOWNLINT: User custom config file name if different from default",
       "title": "MARKDOWN_MARKDOWNLINT: Custom config file name",
       "type": "string"
diff --git a/megalinter/descriptors/schemas/megalinter-descriptor.jsonschema.json b/megalinter/descriptors/schemas/megalinter-descriptor.jsonschema.json
@@ -544,6 +544,12 @@
             "title": "CLI executable for linting request",
             "type": "string"
           },
+          "cli_executable_fix": {
+            "$id": "#/properties/linters/items/properties/cli_executable_fix",
+            "description": "Override if different from cli executable used for linting",
+            "title": "CLI executable for fix request",
+            "type": "string"
+          },
           "cli_executable_help": {
             "$id": "#/properties/linters/items/properties/cli_executable_help",
             "description": "Override if different from cli executable used for linting",
