Skip to content

Commit

Permalink
ci(yamllint): add rule empty-values & use new yaml-files setting
Browse files Browse the repository at this point in the history
* Semi-automated using myii/ssf-formula#27
* Fix errors shown below:

```bash
prometheus-formula$ yamllint -s .
./pillar.example
  78:25     error    empty value in block mapping  (empty-values)
```
  • Loading branch information
myii committed Sep 10, 2019
1 parent e7e06ff commit 1784b34
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
before_install: skip
script:
# Install and run `yamllint`
- pip install --user yamllint
# yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example
# Need at least `v1.17.0` for the `yaml-files` setting
- pip install --user yamllint>=1.17.0
- yamllint -s .
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D
Expand Down
14 changes: 14 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,24 @@ extends: default

# Files to ignore completely
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
# 2. Any SLS files under directory `test/`, which are actually state files
ignore: |
node_modules/
test/**/states/**/*.sls
yaml-files:
# Default settings
- '*.yaml'
- '*.yml'
- .yamllint
# SaltStack Formulas additional settings
- '*.example'
- test/**/*.sls

rules:
empty-values:
forbid-in-block-mappings: true
forbid-in-flow-mappings: true
line-length:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Expand Down
4 changes: 3 additions & 1 deletion pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ prometheus:
alertmanagers:
- static_configs:
- targets:
# - alertmanager:9093
- alertmanager1:9093
- alertmanager2:9093
- alertmanager3:9093

# Load rules once and periodically evaluate them according to the global
# 'evaluation_interval'.
Expand Down

0 comments on commit 1784b34

Please sign in to comment.