Commit graph

754 commits

Author SHA1 Message Date
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
Dafydd Jones
4777a0838d
Merge pull request #212 from baby-gnu/refactor/inspec-best-practices
style(inspec): match current practices for file and control names
2021-02-11 00:13:08 +00:00
Daniel
4bc10bfb3f
Merge pull request #223 from noelmcloughlin/gitignore
chore(git): add visual studio to gitignore
2021-02-10 22:04:22 +00:00
Daniel Dehennin
aa8a58b715 style(inspec): match current practices for file and control names
I don't find a reference best practices in the documentation but as
stated during a SaltStack Formula Workgroup meeting:

- the `_spec` in the control file name is inherited from RSpec and few
  examples use it

- the `control` name should be an identifier, I matched the `tpldot`
  name

- the `title` is a human readable description of the `control`

- remove `impact` which is not appropriate for an integration test
2021-02-10 23:02:25 +01:00
Imran Iqbal
978a7e7cd0
ci(pre-commit): update hook for rubocop [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-02 00:24:21 +00:00
Imran Iqbal
dab2f34c58
test(share): standardise with latest changes [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/288
2021-02-01 07:24:21 +00:00
noelmcloughlin
53b7666c33 chore(git): add visual studio to gitignore 2021-01-20 18:34:15 +00:00
semantic-release-bot
ab99109363 chore(release): 4.3.6 [skip ci]
## [4.3.6](https://github.com/saltstack-formulas/template-formula/compare/v4.3.5...v4.3.6) (2021-01-14)

### Bug Fixes

* **_mapdata:** ensure map data is directly under `values` ([bcb8e29](bcb8e29b68))

### Tests

* **_mapdata:** update for `_mapdata/init.sls` change ([50162ad](50162adad7))
2021-01-14 21:42:18 +00:00
Imran Iqbal
ddf31515b9
Merge pull request #221 from myii/fix/ensure-map-data-directly-under-values
fix(_mapdata): ensure map data is directly under `values`
2021-01-14 21:34:57 +00:00
Imran Iqbal
50162adad7
test(_mapdata): update for _mapdata/init.sls change 2021-01-14 21:20:30 +00:00
Daniel Dehennin
bcb8e29b68
fix(_mapdata): ensure map data is directly under values
* Semi-automated using https://github.com/myii/ssf-formula/pull/287
2021-01-14 20:35:51 +00:00
semantic-release-bot
d0d9cce017 chore(release): 4.3.5 [skip ci]
## [4.3.5](https://github.com/saltstack-formulas/template-formula/compare/v4.3.4...v4.3.5) (2020-12-23)

### Code Refactoring

* **map:** use top-level `values:` key in `map.jinja` dumps ([f8e8fcb](f8e8fcb29e))
2020-12-23 18:58:55 +00:00
Imran Iqbal
ed9ba7a233
Merge pull request #218 from myii/refactor/use-top-level-values-in-map-jinja-dumps
refactor(map): use top-level `values:` key in `map.jinja` dumps
2020-12-23 18:52:29 +00:00
Imran Iqbal
f8e8fcb29e
refactor(map): use top-level values: key in map.jinja dumps
* Semi-automated using https://github.com/myii/ssf-formula/pull/284
2020-12-23 18:44:04 +00:00
semantic-release-bot
b3b8e5e974 chore(release): 4.3.4 [skip ci]
## [4.3.4](https://github.com/saltstack-formulas/template-formula/compare/v4.3.3...v4.3.4) (2020-12-22)

### Continuous Integration

* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([e476d5a](e476d5a567))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([4c300d0](4c300d01cb))

### Tests

* **_mapdata:** fix existing verification files ([6bbafed](6bbafedd1f))
* **map:** standardise `map.jinja` verification ([4c8cf32](4c8cf32db1))
2020-12-22 12:47:05 +00:00
Imran Iqbal
4f8edce11f
Merge pull request #217 from myii/test/standardise-map.jinja-verification
test(map): standardise `map.jinja` verification
2020-12-22 12:36:08 +00:00
Imran Iqbal
6bbafedd1f
test(_mapdata): fix existing verification files 2020-12-22 00:46:41 +00:00
Imran Iqbal
4c8cf32db1
test(map): standardise map.jinja verification
* Automated using https://github.com/myii/ssf-formula/pull/281
2020-12-22 00:43:16 +00:00
Imran Iqbal
e476d5a567
ci(commitlint): ensure upstream/master uses main repo URL [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/278
2020-12-20 18:50:58 +00:00
Imran Iqbal
4c300d01cb
ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/277
2020-12-19 14:36:34 +00:00
semantic-release-bot
5d36fda7a4 chore(release): 4.3.3 [skip ci]
## [4.3.3](https://github.com/saltstack-formulas/template-formula/compare/v4.3.2...v4.3.3) (2020-12-16)

### Bug Fixes

* **codeowners:** ensure `lib*` files are owned by `ssf` ([d60cc15](d60cc15366))

### Continuous Integration

* **gitlab-ci:** use GitLab CI as Travis CI replacement ([0403f62](0403f62c77))
2020-12-16 07:25:07 +00:00
Imran Iqbal
0403f62c77
ci(gitlab-ci): use GitLab CI as Travis CI replacement
* Automated using https://github.com/myii/ssf-formula/pull/275
2020-12-16 06:59:07 +00:00
Imran Iqbal
7f4c12a82c
chore(convert-formula): add .gitlab-ci.yml to pattern deletion section 2020-12-16 03:09:59 +00:00
N
e88564807f
Merge pull request #209 from dafyddj/fix/convert-formula
fix(codeowners): ensure `lib*` files are owned by `ssf`
2020-11-25 15:45:33 +00:00
semantic-release-bot
889546bad2 chore(release): 4.3.2 [skip ci]
## [4.3.2](https://github.com/saltstack-formulas/template-formula/compare/v4.3.1...v4.3.2) (2020-10-31)

### Bug Fixes

* **convert-formula.sh:** add -_ to allowed chars in formula name ([a999fee](a999fee214))
* **convert-formula.sh:** delete all existing tags ([7c33601](7c33601fd4)), closes [#210](https://github.com/saltstack-formulas/template-formula/issues/210)
2020-10-31 19:20:24 +00:00
Imran Iqbal
4be96d3618
Merge pull request #207 from dafyddj/fix/convert-dash-underscore
fix(convert-formulas.sh): add -_ to allowed chars in formula name
2020-10-31 19:08:55 +00:00
Dafydd Jones
7c33601fd4 fix(convert-formula.sh): delete all existing tags
* closes #210
2020-10-31 18:35:34 +00:00
semantic-release-bot
2f057b0cfd chore(release): 4.3.1 [skip ci]
## [4.3.1](https://github.com/saltstack-formulas/template-formula/compare/v4.3.0...v4.3.1) (2020-10-28)

### Tests

* **inspec:** `system.rb` must call parent class initialisation ([1ff9ab1](1ff9ab15f2))
2020-10-28 11:03:52 +00:00
Daniel
7c85376480
Merge pull request #214 from baby-gnu/fix/rubocop-system-lib
test(inspec): `system.rb` must call parent class initialisation
2020-10-28 10:51:20 +00:00
Daniel Dehennin
1ff9ab15f2 test(inspec): system.rb must call parent class initialisation 2020-10-28 11:37:24 +01:00
Imran Iqbal
ef7330d485
chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/274
2020-10-26 22:55:11 +00:00
Imran Iqbal
d3fdd36199
chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/273
2020-10-20 10:23:04 +01:00
Dafydd Jones
a999fee214 fix(convert-formula.sh): add -_ to allowed chars in formula name 2020-10-14 22:42:18 +01:00