Commit graph

736 commits

Author SHA1 Message Date
Imran Iqbal
8d506ea93e
chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/362
2021-08-23 09:26:34 +01:00
semantic-release-bot
f84c6cfaad chore(release): 5.0.3 [skip ci]
## [5.0.3](https://github.com/saltstack-formulas/template-formula/compare/v5.0.2...v5.0.3) (2021-08-19)

### Bug Fixes

* **convert-formula.sh:** add `~` to reST underlining during conversion ([80ed8cd](80ed8cd415))
* **convert-formula.sh:** fix reST underlining during conversion ([11068af](11068afae9))

### Continuous Integration

* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([be3ee0b](be3ee0be51))
* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([3c7fb0f](3c7fb0fca0))
* **gitlab:** update `dind-ruby-bionic` with ruby 2.7.1 ([b2fe67a](b2fe67a79d))
* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([29df15e](29df15e21c))
* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([1b8604d](1b8604dd02))
* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([7e74001](7e74001c05))
* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([e14f830](e14f83019a))
* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([c99c5a1](c99c5a1b68))
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([858ef8a](858ef8a2b7))

### Documentation

* **map.jinja:** fix `rst-lint` violation [skip ci] ([e43d6ce](e43d6ce83f))
* **map.jinja:** make section headings consistent with other docs ([40277fc](40277fc582))

### Tests

* **_mapdata:** add verification file for `debian-11` [skip ci] ([98edfd3](98edfd3ac4))
* **_mapdata:** add verification file for `fedora-34` [skip ci] ([79587c4](79587c422c))
* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] ([ec7ede0](ec7ede0407))
2021-08-19 15:32:39 +00:00
Imran Iqbal
07657fb5be
Merge pull request #237 from dafyddj/fix/rst-underlines
fix(convert-formula.sh): fix reST underlining during conversion
2021-08-19 16:13:14 +01:00
Imran Iqbal
80ed8cd415
fix(convert-formula.sh): add ~ to reST underlining during conversion
Maintain consistency with heading characters mentioned here:

* https://github.com/miyakogi/m2r#restrictions
2021-08-19 16:05:26 +01:00
Dafydd Jones
40277fc582
docs(map.jinja): make section headings consistent with other docs 2021-08-19 14:59:33 +01:00
Imran Iqbal
1b8604dd02
ci(kitchen+ci): update with latest 3003.2 pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/360
2021-08-19 10:15:47 +01:00
Dafydd Jones
b2fe67a79d ci(gitlab): update dind-ruby-bionic with ruby 2.7.1
Co-authored-by: Imran Iqbal <myii@users.noreply.github.com>
2021-08-18 15:24:28 +01:00
Dafydd Jones
11068afae9 fix(convert-formula.sh): fix reST underlining during conversion
Assuming the Python convention for section headings of:

  = for sections
  - for subsections
  ^ for subsubsections
  " for paragraphs

as described at https://devguide.python.org/documenting/#sections
2021-08-18 15:24:28 +01:00
Imran Iqbal
b4b03854d6
chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/359
2021-08-16 18:26:20 +01:00
Imran Iqbal
84cb63fc8e
chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/358
2021-08-09 12:17:29 +01:00
Imran Iqbal
3c7fb0fca0
ci(gemfile+lock): use ssf customised inspec repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/357
2021-08-04 21:57:31 +01:00
Imran Iqbal
f6357aad43
chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/356
2021-08-04 21:40:12 +01:00
Imran Iqbal
305765af93
chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/353
2021-07-26 14:32:28 +01:00
Imran Iqbal
9ef82f4f78
chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/349
2021-07-21 18:35:02 +01:00
Imran Iqbal
e14f83019a
ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/345
2021-07-18 19:06:33 +01:00
Imran Iqbal
98edfd3ac4
test(_mapdata): add verification file for debian-11 [skip ci] 2021-07-18 15:21:18 +01:00
Imran Iqbal
29df15e21c
ci(kitchen): move provisioner block & update run_command [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/344
2021-07-17 21:13:41 +01:00
Imran Iqbal
a04fba14ec
chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/343
2021-07-17 20:31:11 +01:00
Imran Iqbal
c8ca950d8e
chore(deps): bump addressable from 2.7.0 to 2.8.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/340
2021-07-14 12:17:30 +01:00
Imran Iqbal
be3ee0be51
ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/335
2021-07-02 00:09:05 +01:00
Imran Iqbal
ec7ede0407
test(alma+rocky): add platforms (based on CentOS 8) [skip ci] 2021-07-01 08:35:57 +01:00
Imran Iqbal
858ef8a2b7
ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/331
2021-06-21 20:49:35 +01:00
Imran Iqbal
7bbaab5e92
chore(pre-commit): use info report level for rstcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/325
2021-05-20 14:11:43 +01:00
Imran Iqbal
e43d6ce83f
docs(map.jinja): fix rst-lint violation [skip ci]
```
WARNING docs/map.jinja.rst:272 Cannot analyze code. No Pygments lexer found for "jinja2".
```
2021-05-17 19:09:09 +01:00
Imran Iqbal
7e74001c05
ci: add arch-master to matrix and update .travis.yml [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/323
2021-05-09 22:34:52 +01:00
Imran Iqbal
c99c5a1b68
ci(kitchen+gitlab): adjust matrix to add 3003 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/318
2021-04-23 08:50:29 +01:00
Imran Iqbal
79587c422c
test(_mapdata): add verification file for fedora-34 [skip ci] 2021-04-23 08:09:09 +01:00
semantic-release-bot
ac9c2e872e chore(release): 5.0.2 [skip ci]
## [5.0.2](https://github.com/saltstack-formulas/template-formula/compare/v5.0.1...v5.0.2) (2021-04-14)

### Bug Fixes

* **convert-formula.sh:** replace instances of `template-formula` for CI ([537fe65](537fe65d45)), closes [#231](https://github.com/saltstack-formulas/template-formula/issues/231)

### Tests

* standardise use of `share` suite & `_mapdata` state [skip ci] ([bbe1c78](bbe1c78409))
2021-04-14 16:39:24 +00:00
Imran Iqbal
9a957c3853
Merge pull request #234 from dafyddj/fix/convert-more-things
fix: convert more things
2021-04-14 17:31:20 +01:00
Dafydd Jones
537fe65d45 fix(convert-formula.sh): replace instances of template-formula for CI
* Fixes #231
2021-04-14 00:39:19 +01:00
Imran Iqbal
d9ee80784b
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:22:50 +01:00
Imran Iqbal
bbe1c78409
test: standardise use of share suite & _mapdata state [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/302
2021-03-23 21:34:24 +00:00
semantic-release-bot
3ff398bce4 chore(release): 5.0.1 [skip ci]
## [5.0.1](https://github.com/saltstack-formulas/template-formula/compare/v5.0.0...v5.0.1) (2021-03-09)

### Bug Fixes

* **convert-formula:** `_mapdata` control name must use the formula one ([1f3600d](1f3600d66f))
2021-03-09 18:06:33 +00:00
Dafydd Jones
1b5bcb4ec0
Merge pull request #229 from baby-gnu/fix/mapdata-control-name
fix(convert-formula): `_mapdata` control name must use the formula one
2021-03-09 17:58:30 +00:00
Daniel Dehennin
1f3600d66f fix(convert-formula): _mapdata control name must use the formula one
* test/integration/default/controls/_mapdata.rb: use `TEMPLATE` to let
  `conver-formula.sh` automatically rename the control.
2021-03-09 18:39:26 +01:00
semantic-release-bot
2f76e06660 chore(release): 5.0.0 [skip ci]
# [5.0.0](https://github.com/saltstack-formulas/template-formula/compare/v4.3.8...v5.0.0) (2021-03-09)

### Bug Fixes

* **inspec:** validate `map.jinja` configuration ([41d222e](41d222e30c))

### Continuous Integration

* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([6453145](6453145da1))

### Features

* **map:** update to v5 `map.jinja` ([42e1932](42e19322c9))

### BREAKING CHANGES

* **map:** `map.jinja` now exports a generic `mapdata` variable
* **map:** The per grain parameter values are now under `TEMPLATE/parameters/`
2021-03-09 16:29:15 +00:00
Imran Iqbal
1802e37e60
Merge pull request #225 from baby-gnu/feature/update-to-v5-map.jinja
feat(map): update to v5 map.jinja
2021-03-09 16:19:38 +00:00
Imran Iqbal
6453145da1
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/299
2021-03-07 22:23:20 +00:00
Imran Iqbal
d356e20411
chore(yamllint): add .git/ to ignores [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/297
2021-03-05 18:36:17 +00:00
Daniel Dehennin
5830a8ce97
chore(rubocop): allow use of YAML.load for _mapdata.rb [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/296
2021-02-23 21:52:33 +00:00
semantic-release-bot
0ae2aa7a40 chore(release): 4.3.8 [skip ci]
## [4.3.8](https://github.com/saltstack-formulas/template-formula/compare/v4.3.7...v4.3.8) (2021-02-21)

### Continuous Integration

* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([23c2bb2](23c2bb2dc2))
* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([00823a2](00823a2d27))

### Tests

* **_mapdata:** add verification files for Fedora 33 & Tumbleweed ([3347b85](3347b85c92))
2021-02-21 08:12:04 +00:00
Imran Iqbal
dbc3274fb7
Merge pull request #228 from dafyddj/chore/shellcheck-py
chore(shellcheck): switch hook for `shellcheck`
2021-02-21 08:04:25 +00:00
Dafydd Jones
f1ad843d29 chore(shellcheck): switch hook for shellcheck
* new hook follows upstream versions more closely, and manages the
  binary dependency

Fixes #226
2021-02-20 20:50:52 +00:00
Imran Iqbal
23c2bb2dc2
ci(gemfile+lock): use ssf customised kitchen-docker repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/294
2021-02-17 13:54:45 +00:00
Daniel Dehennin
42e19322c9 feat(map): update to v5 map.jinja
The v5 `map.jinja` is a generic and configurable system to load
configuration values, exposed as the `mapdata` variable, from
different places:

- YAML files and templates from the fileserver for non-secret data
- pillars or SDB are preferred for secret data
- grains or `config.get`

The `map.jinja` optional sources are configured with compound targeting like
syntax `[<TYPE>[:<OPTION>[:<DELIMITER>]]@]<KEY>` with the following
default ordered sources:

- `Y:G@osarch`: YAML file and Jinja template named after `osarch` grain
- `Y:G@os_family`: YAML file and Jinja template named after `os_family` grain
- `Y:G@os` YAML file and Jinja template named after `os` grain
- `Y:G@osfinger` YAML file and Jinja template named after `osfinger` grain
- `C@{{ tplroot ~ ':lookup' }}`: dict retrieved with `salt["config.get"]`
- `C@{{ tplroot }}`: dict retrieved with `salt["config.get"]`
- `Y:G@id`: YAML file and Jinja template named after `osarch` grain

This is done by two new libraries:

- `libmatchers.jinja` provides the `parse_matchers` macro to parse
  strings looking like compound matchers, for example `Y:G@osarch`

- `libmapstack.jinja` provides the `mapstack` macro to load
  configuration from different sources described by matchers

Post-processing of `mapdata` variable can be done in a `parameters/post-map.jinja`.

The v5 `map.jinja` is documented in `docs/map.jinja.rst`.

BREAKING CHANGE: `map.jinja` now exports a generic `mapdata` variable

BREAKING CHANGE: The per grain parameter values are now under `TEMPLATE/parameters/`
2021-02-16 11:10:09 +01:00
Daniel Dehennin
41d222e30c fix(inspec): validate map.jinja configuration
Update `_mapdata` reference files to include the `map.jinja`
configuration sources.
2021-02-15 16:28:47 +01:00
Imran Iqbal
00823a2d27
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/293
2021-02-14 10:43:09 +00:00
Imran Iqbal
3347b85c92
test(_mapdata): add verification files for Fedora 33 & Tumbleweed 2021-02-14 10:41:23 +00:00
Imran Iqbal
6d17eb0130
chore: standardise structure (.gitignore & _mapdata.rb) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/292
2021-02-11 11:54:49 +00:00
semantic-release-bot
63158c0aa9 chore(release): 4.3.7 [skip ci]
## [4.3.7](https://github.com/saltstack-formulas/template-formula/compare/v4.3.6...v4.3.7) (2021-02-11)

### Continuous Integration

* **pre-commit:** update hook for `rubocop` [skip ci] ([978a7e7](978a7e7cd0))

### Styles

* **inspec:** match current practices for file and control names ([aa8a58b](aa8a58b715))

### Tests

* **share:** standardise with latest changes [skip ci] ([dab2f34](dab2f34c58))
2021-02-11 07:07:16 +00:00