From 63ac962387ddf203ebbe7436083cb69088b03309 Mon Sep 17 00:00:00 2001 From: Johann Miller Date: Fri, 17 Nov 2023 16:24:52 -0500 Subject: [PATCH] replace helm yamllint with prettier (#18080) 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 ``` --- .../dagster_buildkite/steps/helm.py | 8 -------- Makefile | 12 ++++++------ helm/dagster/values.yaml | 4 ++-- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.buildkite/dagster-buildkite/dagster_buildkite/steps/helm.py b/.buildkite/dagster-buildkite/dagster_buildkite/steps/helm.py index a64db1ded29db..6bfec4b75297a 100644 --- a/.buildkite/dagster-buildkite/dagster_buildkite/steps/helm.py +++ b/.buildkite/dagster-buildkite/dagster_buildkite/steps/helm.py @@ -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", diff --git a/Makefile b/Makefile index a02144db6ba06..bf7eb6f19649e 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/helm/dagster/values.yaml b/helm/dagster/values.yaml index 0927e103b72bd..0294910aa0a06 100644 --- a/helm/dagster/values.yaml +++ b/helm/dagster/values.yaml @@ -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. @@ -424,7 +423,8 @@ scheduler: # CustomScheduler, # ] type: DagsterDaemonScheduler - config: {} + config: + {} ## This configuration will only be used if the DagsterDaemonScheduler is selected. # daemonScheduler: # maxCatchupRuns: 5