This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new b2de542 Enforce formatting on helm chart json schema files (#15895)
b2de542 is described below
commit b2de542f24766204d69050fb5252872f72d391b2
Author: Jed Cunningham <[email protected]>
AuthorDate: Mon May 17 12:23:45 2021 -0600
Enforce formatting on helm chart json schema files (#15895)
---
.editorconfig | 3 +++
.pre-commit-config.yaml | 8 ++++++++
BREEZE.rst | 4 ++--
STATIC_CODE_CHECKS.rst | 2 ++
breeze-complete | 1 +
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 8af1774..5032d5b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -47,3 +47,6 @@ indent_size = 2
[*.{htm,html}]
indent_size = 2
+
+[*.json]
+indent_size = 4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 472da04..00ff4bd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -180,6 +180,14 @@ repos:
exclude: ^airflow/_vendor/
args:
- --remove
+ - id: pretty-format-json
+ args:
+ - --autofix
+ - --no-sort-keys
+ - --indent
+ - "4"
+ files: ^chart/values\.schema\.json$|^chart/values_schema\.schema\.json$
+ pass_filenames: true
- repo: https://github.com/asottile/pyupgrade
rev: v2.13.0
hooks:
diff --git a/BREEZE.rst b/BREEZE.rst
index 2d6a507..5ec7a5e 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -2265,8 +2265,8 @@ This is the current syntax for `./breeze <./breeze>`_:
incorrect-use-of-LoggingMixin insert-license isort
json-schema language-matters
lint-dockerfile lint-openapi markdownlint mermaid
mixed-line-ending mypy mypy-helm
no-providers-in-core-examples no-relative-imports
pre-commit-descriptions
- pre-commit-hook-names provide-create-sessions
providers-init-file provider-yamls
- pydevd pydocstyle pylint pylint-tests python-no-log-warn
pyupgrade
+ pre-commit-hook-names pretty-format-json
provide-create-sessions providers-init-file
+ provider-yamls pydevd pydocstyle pylint pylint-tests
python-no-log-warn pyupgrade
restrict-start_date rst-backticks setup-order
setup-extra-packages shellcheck
sort-in-the-wild sort-spelling-wordlist stylelint
trailing-whitespace ui-lint
update-breeze-file update-extras update-local-yml-file
update-setup-cfg-file
diff --git a/STATIC_CODE_CHECKS.rst b/STATIC_CODE_CHECKS.rst
index 1481c2f..879c553 100644
--- a/STATIC_CODE_CHECKS.rst
+++ b/STATIC_CODE_CHECKS.rst
@@ -138,6 +138,8 @@ require Breeze Docker images to be installed locally:
-----------------------------------
---------------------------------------------------------------- ------------
``pre-commit-hook-names`` Check that hook names are not overly long
-----------------------------------
---------------------------------------------------------------- ------------
+``pretty-format-json`` Formats json files
+-----------------------------------
---------------------------------------------------------------- ------------
``provide-create-sessions`` Make sure provide-session and
create-session imports are OK
-----------------------------------
---------------------------------------------------------------- ------------
``providers-init-file`` Check that provider's __init__.py file
is removed
diff --git a/breeze-complete b/breeze-complete
index 18724b3..796f2a8 100644
--- a/breeze-complete
+++ b/breeze-complete
@@ -121,6 +121,7 @@ no-providers-in-core-examples
no-relative-imports
pre-commit-descriptions
pre-commit-hook-names
+pretty-format-json
provide-create-sessions
providers-init-file
provider-yamls
