1
0
Fork 0
Commit Graph

149 Commits

Author SHA1 Message Date
Imran Iqbal 589cd17578
Merge pull request #53 from myii/bug/fix-for-salt-ssh
fix: make necessary modifications to get working on `salt-ssh`
2020-05-07 08:45:36 +01:00
Imran Iqbal 57c88a8140
fix: make necessary modifications to get working on `salt-ssh`
* https://freenode.logbot.info/saltstack-formulas/20200506#c3811885-c3812572
* Avoid `defaults.merge`
* Send template values by `context`, to avoid:

```python
      ID: logrotate-config
Function: file.managed
    Name: /etc/logrotate.conf
  Result: False
 Comment: An exception occurred in this state: Traceback (most recent call last):
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/templates.py", line 394, in render_jinja_tmpl
              output = template.render(**decoded_context)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/environment.py", line 1008, in render
              return self.environment.handle_exception(exc_info, True)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/environment.py", line 780, in handle_exception
              reraise(exc_type, exc_value, tb)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/_compat.py", line 37, in reraise
              raise value.with_traceback(tb)
            File "<template>", line 1, in top-level template code
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/jinja.py", line 193, in get_source
              raise TemplateNotFound(template)
          jinja2.exceptions.TemplateNotFound: logrotate/map.jinja

          During handling of the above exception, another exception occurred:

          Traceback (most recent call last):
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/state.py", line 1981, in call
              **cdata['kwargs'])
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/loader.py", line 1977, in wrapper
              return f(*args, **kwargs)
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/states/file.py", line 3037, in managed
              **kwargs
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/modules/file.py", line 4846, in check_managed_changes
              **kwargs)
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/modules/file.py", line 4287, in get_managed
              **kwargs)
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/templates.py", line 169, in render_tmpl
              output = render_str(tmplstr, context, tmplpath)
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/templates.py", line 443, in render_jinja_tmpl
              trace=tracestr)
          salt.exceptions.SaltRenderError: Jinja error: logrotate/map.jinja
          Traceback (most recent call last):
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/templates.py", line 394, in render_jinja_tmpl
              output = template.render(**decoded_context)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/environment.py", line 1008, in render
              return self.environment.handle_exception(exc_info, True)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/environment.py", line 780, in handle_exception
              reraise(exc_type, exc_value, tb)
            File "/var/tmp/.root_08c4d3_salt/pyall/jinja2/_compat.py", line 37, in reraise
              raise value.with_traceback(tb)
            File "<template>", line 1, in top-level template code
            File "/var/tmp/.root_08c4d3_salt/pyall/salt/utils/jinja.py", line 193, in get_source
              raise TemplateNotFound(template)
          jinja2.exceptions.TemplateNotFound: logrotate/map.jinja

          ; line 1

          ---
          {%- from "logrotate/map.jinja" import logrotate with context -%}    <======================
          {%- set config = salt['pillar.get']('logrotate:default_config', logrotate.default_config) -%}

          {%- set processed_parameters = [] -%}

          {%- macro set_parameter(parameter, default=None) -%}
          [...]
```
2020-05-06 15:42:57 +01:00
Imran Iqbal 483589d1a5 chore(codeowners): update `semantic-release` related files [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/174
2020-05-04 23:15:47 +01:00
Imran Iqbal f4fcc15c7b chore(codeowners): add to repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/173
2020-05-04 22:44:04 +01:00
Imran Iqbal 4c2a90bccd ci(workflows/commitlint): add to repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/172
2020-05-04 09:29:34 +01:00
Imran Iqbal bf6f9406da ci(kitchen+travis): remove `master-py2-arch-base-latest` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/167
2020-05-02 04:28:07 +01:00
Imran Iqbal a5cf505cc0 ci(gemfile.lock): add to repo with updated `Gemfile` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/163
2020-04-21 22:07:56 +01:00
Imran Iqbal c8274b6549 chore(rubocop): use org-wide standard settings for `Metrics/BlockLength` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/158
2020-04-18 13:43:57 +01:00
semantic-release-bot 67cad29a38 chore(release): 0.11.3 [skip ci]
## [0.11.3](https://github.com/saltstack-formulas/logrotate-formula/compare/v0.11.2...v0.11.3) (2020-03-22)

### Bug Fixes

* **release.config.js:** use full commit hash in commit link [skip ci] ([c79d42e](c79d42e0e0))

### Continuous Integration

* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([e6a2d52](e6a2d52a4c))
* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([6200869](6200869f7a))
* **kitchen:** ensure `cron` installed on `Debian` ([4401a20](4401a20671))
* **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([7ba188f](7ba188f535))
* **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([c4a1fa9](c4a1fa9f6f))
* **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([74ab7a1](74ab7a144d))
* **travis:** apply changes from build config validation [skip ci] ([4e65a71](4e65a7197b))
* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([05f9738](05f973872e))
* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([b7ff28d](b7ff28d630))
* **travis:** run `shellcheck` during lint job [skip ci] ([b60e2ab](b60e2abf73))
* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([a75723c](a75723cbe5))
* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([d08d9bf](d08d9bfa06))
* **travis:** use build config validation (beta) [skip ci] ([ef455ff](ef455fffae))

### Documentation

* **contributing:** remove to use org-level file instead [skip ci] ([01493e9](01493e95a9))
* **readme:** update link to `CONTRIBUTING` [skip ci] ([d2ee252](d2ee2524cd))

### Performance Improvements

* **travis:** improve `salt-lint` invocation [skip ci] ([ebd94f0](ebd94f078e))
2020-03-22 18:05:42 +00:00
Imran Iqbal 97a6932603
Merge pull request #52 from myii/ci/ensure-cron-installed-on-debian
ci(kitchen): ensure `cron` installed on `Debian`
2020-03-22 17:57:27 +00:00
Imran Iqbal 4401a20671
ci(kitchen): ensure `cron` installed on `Debian`
* Pre-salted image(s) no longer have it installed (checked `debian-10`)
2020-03-22 17:46:58 +00:00
Imran Iqbal 4cad22ccdc chore(gitignore): update from the `template-formula` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/132
2020-02-14 22:29:17 +00:00
Imran Iqbal f768fb8a36 chore(rubocop): move `LineLength` cop from `Metrics` to `Layout` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/129
2020-02-14 12:51:08 +00:00
Imran Iqbal 6200869f7a ci(kitchen): avoid using bootstrap for `master` instances [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/124
2020-02-05 14:05:48 +00:00
Imran Iqbal d08d9bfa06 ci(travis): use `major.minor` for `semantic-release` version [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/112
2019-12-22 00:58:52 +00:00
Imran Iqbal e6a2d52a4c ci(gemfile): restrict `train` gem version until upstream fix [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/110
2019-12-16 13:41:54 +00:00
Imran Iqbal b7ff28d630 ci(travis): quote pathspecs used with `git ls-files` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/107
2019-11-27 21:53:34 +00:00
Imran Iqbal b60e2abf73 ci(travis): run `shellcheck` during lint job [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/106
2019-11-27 20:53:12 +00:00
Imran Iqbal 05f973872e ci(travis): opt-in to `dpl v2` to complete build config validation [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/100
2019-11-20 16:31:28 +00:00
Imran Iqbal 4e65a7197b ci(travis): apply changes from build config validation [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/98
2019-11-16 20:04:22 +00:00
Imran Iqbal ef455fffae ci(travis): use build config validation (beta) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/97
2019-11-13 16:46:21 +00:00
Imran Iqbal c4a1fa9f6f ci(kitchen): use `develop` image until `master` is ready (`amazonlinux`) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/93
2019-11-03 11:35:03 +00:00
Imran Iqbal ebd94f078e perf(travis): improve `salt-lint` invocation [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/90
2019-11-02 08:36:59 +00:00
Imran Iqbal c79d42e0e0 fix(release.config.js): use full commit hash in commit link [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/89
2019-10-31 10:29:04 +00:00
Imran Iqbal 74ab7a144d ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/86
2019-10-30 04:47:31 +00:00
Imran Iqbal 7ba188f535 ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/84
2019-10-24 18:09:42 +01:00
Imran Iqbal a75723cbe5 ci(travis): update `salt-lint` config for `v0.0.10` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/82
2019-10-23 17:33:37 +01:00
Imran Iqbal 01493e95a9 docs(contributing): remove to use org-level file instead [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/70
2019-10-14 12:29:03 +01:00
Imran Iqbal d2ee2524cd
docs(readme): update link to `CONTRIBUTING` [skip ci] 2019-10-14 11:36:56 +01:00
semantic-release-bot ca4225050b chore(release): 0.11.2 [skip ci]
## [0.11.2](https://github.com/saltstack-formulas/logrotate-formula/compare/v0.11.1...v0.11.2) (2019-10-11)

### Bug Fixes

* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/logrotate-formula/commit/de80802))
* **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/logrotate-formula/commit/401493b))

### Continuous Integration

* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/logrotate-formula/commit/e98975f))
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/logrotate-formula/commit/4e76aa3))
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/logrotate-formula/commit/26582d7))
* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/logrotate-formula/commit/7e0f2b4))
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/logrotate-formula/commit/a66f4fe))
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/logrotate-formula/commit/f31e348))
* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/logrotate-formula/commit/b836a66))
* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/logrotate-formula/commit/b8d7987))
* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/logrotate-formula/commit/7544833))
2019-10-11 22:20:01 +00:00
Imran Iqbal b8d798734b ci(travis): merge `rubocop` linter into main `lint` job
* Semi-automated using https://github.com/myii/ssf-formula/pull/65
2019-10-11 22:52:46 +01:00
Imran Iqbal 401493bf77
fix(rubocop): fix remaining errors manually 2019-10-11 22:51:03 +01:00
Imran Iqbal de80802f7d
fix(rubocop): add fixes using `rubocop --safe-auto-correct` 2019-10-11 22:49:18 +01:00
Imran Iqbal 3c3ce8acb5 chore(issues): remove issues templates to use org-level templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/61
2019-10-10 15:25:53 +01:00
Éric Veiras Galisson b614e1d528
Merge pull request #50 from myii/ci/merge-matrix-and-add-salt-lint-and-rubocop
ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
2019-10-09 11:39:59 +02:00
Imran Iqbal a66f4fefb3 ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
* Automated using https://github.com/myii/ssf-formula/pull/60
2019-10-09 03:07:04 +01:00
Imran Iqbal f31e34882d ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
* Automated using https://github.com/myii/ssf-formula/pull/60
2019-10-08 16:36:53 +01:00
Imran Iqbal e4d68312a1 chore(yamllint): update ignored paths and add `octal-values` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/59
2019-10-07 19:31:16 +01:00
Imran Iqbal 99f9999726 chore(issues): update `Bug report` & `Feature request` templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/58
2019-10-07 15:25:19 +01:00
Imran Iqbal 4e76aa3216 ci(kitchen): install required packages to bootstrapped `opensuse` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/53
2019-10-02 00:06:51 +01:00
Imran Iqbal 26582d704f ci(kitchen): use bootstrapped `opensuse` images until `2019.2.2` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/52
2019-10-01 21:33:08 +01:00
Imran Iqbal 7e0f2b49b1 ci(platform): add `arch-base-latest` (commented out for now) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/50
2019-10-01 16:20:01 +01:00
Imran Iqbal d48107ba6b chore(issues): provide `Bug report` & `Feature request` templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/48
2019-09-30 15:57:14 +01:00
Imran Iqbal e98975f98a ci(kitchen): change `log_level` to `debug` instead of `info`
* Automated using https://github.com/myii/ssf-formula/pull/41
2019-09-23 16:59:00 +01:00
Niels Abspoel 8064011677
Merge pull request #49 from myii/chore/standardise-structure
ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
2019-09-12 18:11:34 +02:00
Imran Iqbal 7544833478 ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
* Automated using https://github.com/myii/ssf-formula/pull/27
2019-09-10 05:52:48 +01:00
Niels Abspoel 8addd008d8
Merge pull request #48 from myii/chore/standardise-structure
ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
2019-09-08 21:44:52 +02:00
Imran Iqbal b836a66b20 ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
* Automated using https://github.com/myii/ssf-formula/pull/22
2019-09-07 03:34:48 +01:00
semantic-release-bot 6233156161 chore(release): 0.11.1 [skip ci]
## [0.11.1](https://github.com/saltstack-formulas/logrotate-formula/compare/v0.11.0...v0.11.1) (2019-09-01)

### Continuous Integration

* **kitchen+travis:** replace EOL pre-salted images ([cc3fa62](https://github.com/saltstack-formulas/logrotate-formula/commit/cc3fa62))

### Tests

* **inspec:** improve to work on `amazon` as well ([be09e0d](https://github.com/saltstack-formulas/logrotate-formula/commit/be09e0d))
2019-09-01 10:31:00 +00:00
Niels Abspoel a1429d650a
Merge pull request #47 from myii/chore/standardise-structure
ci(kitchen+travis): replace EOL pre-salted images
2019-09-01 11:42:05 +02:00