Skip to content

Commit

Permalink
replace helm yamllint with prettier (#18080)
Browse files Browse the repository at this point in the history
Test plan: add bad spacing to values.yaml

```
make check_prettier
npm --prefix js_modules/dagster-ui/packages/eslint-config exec -- prettier `git ls-files \
        'python_modules/*.yml' 'python_modules/*.yaml' 'helm/*.yml' 'helm/*.yaml' \
        ':!:helm/**/templates/*.yml' ':!:helm/**/templates/*.yaml'` --check
Checking formatting...
[warn] helm/dagster/values.yaml
[warn] Code style issues found in the above file. Run Prettier to fix.
make: *** [check_prettier] Error 1
```
  • Loading branch information
johannkm authored Nov 17, 2023
1 parent c336bc0 commit 63ac962
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
8 changes: 0 additions & 8 deletions .buildkite/dagster-buildkite/dagster_buildkite/steps/helm.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,6 @@ def build_helm_steps() -> List[BuildkiteStep]:

def _build_lint_steps(package_spec) -> List[CommandStep]:
return [
CommandStepBuilder(":yaml: :lint-roller:")
.run(
"pip install yamllint",
"make yamllint",
)
.with_skip(skip_if_no_helm_changes() and package_spec.skip_reason)
.on_test_image(AvailablePythonVersion.get_default())
.build(),
CommandStepBuilder("dagster-json-schema")
.run(
"pip install -e helm/dagster/schema",
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ check_ruff:
ruff .
ruff format --check .

yamllint:
yamllint -c .yamllint.yaml --strict \
`git ls-files 'helm/*.yml' 'helm/*.yaml' ':!:helm/**/templates/*.yml' ':!:helm/**/templates/*.yaml'`

check_prettier:
yarn exec --cwd js_modules/dagster-ui/packages/eslint-config -- prettier `git ls-files 'python_modules/*.yml' 'python_modules/*.yaml'` --check
yarn exec --cwd js_modules/dagster-ui/packages/eslint-config -- prettier `git ls-files \
'python_modules/*.yml' 'python_modules/*.yaml' 'helm/*.yml' 'helm/*.yaml' \
':!:helm/**/templates/*.yml' ':!:helm/**/templates/*.yaml'` --check

prettier:
yarn exec --cwd js_modules/dagster-ui/packages/eslint-config -- prettier `git ls-files 'python_modules/*.yml' 'python_modules/*.yaml'` --write
yarn exec --cwd js_modules/dagster-ui/packages/eslint-config -- prettier `git ls-files \
'python_modules/*.yml' 'python_modules/*.yaml' 'helm/*.yml' 'helm/*.yaml' \
':!:helm/**/templates/*.yml' ':!:helm/**/templates/*.yaml'` --write

install_dev_python_modules:
python scripts/install_dev_python_modules.py -qqq
Expand Down
4 changes: 2 additions & 2 deletions helm/dagster/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# yamllint disable rule:line-length
# README:
# - If using a fixed tag for images, changing the image pull policy to anything other than "Always"
# will use a cached/stale image.
Expand Down Expand Up @@ -424,7 +423,8 @@ scheduler:
# CustomScheduler,
# ]
type: DagsterDaemonScheduler
config: {}
config:
{}
## This configuration will only be used if the DagsterDaemonScheduler is selected.
# daemonScheduler:
# maxCatchupRuns: 5
Expand Down

0 comments on commit 63ac962

Please sign in to comment.