Skip to content

Commit 1784b34

Browse files
committed
ci(yamllint): add rule empty-values & use new yaml-files setting
* 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) ```
1 parent e7e06ff commit 1784b34

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
before_install: skip
5757
script:
5858
# Install and run `yamllint`
59-
- pip install --user yamllint
60-
# yamllint disable-line rule:line-length
61-
- yamllint -s . .yamllint pillar.example
59+
# Need at least `v1.17.0` for the `yaml-files` setting
60+
- pip install --user yamllint>=1.17.0
61+
- yamllint -s .
6262
# Install and run `commitlint`
6363
- npm install @commitlint/config-conventional -D
6464
- npm install @commitlint/travis-cli -D

.yamllint

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,24 @@ extends: default
66

77
# Files to ignore completely
88
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
9+
# 2. Any SLS files under directory `test/`, which are actually state files
910
ignore: |
1011
node_modules/
12+
test/**/states/**/*.sls
13+
14+
yaml-files:
15+
# Default settings
16+
- '*.yaml'
17+
- '*.yml'
18+
- .yamllint
19+
# SaltStack Formulas additional settings
20+
- '*.example'
21+
- test/**/*.sls
1122

1223
rules:
24+
empty-values:
25+
forbid-in-block-mappings: true
26+
forbid-in-flow-mappings: true
1327
line-length:
1428
# Increase from default of `80`
1529
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)

pillar.example

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ prometheus:
7676
alertmanagers:
7777
- static_configs:
7878
- targets:
79-
# - alertmanager:9093
79+
- alertmanager1:9093
80+
- alertmanager2:9093
81+
- alertmanager3:9093
8082

8183
# Load rules once and periodically evaluate them according to the global
8284
# 'evaluation_interval'.

0 commit comments

Comments
 (0)