Update #3
Merged
Update #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update context.sls
* Automated using myii/ssf-formula#160
```bash
tomcat-formula$ find . -name '*.sls' | xargs salt-lint
[206] Jinja variables should have spaces before and after: {{ var_name }}
./tomcat/init.sls:49
- unless: {{tomcat.ver|int > 8 }} ##no plist file shipped with Tomcat9
[201] Trailing whitespace
./tomcat/init.sls:63
- service: tomcat package installed and service running
[206] Jinja variables should have spaces before and after: {{ var_name }}
./tomcat/native.sls:22
- target: /usr/lib/{{grains['cpuarch']}}-linux-gnu/libtcnative-1.so
```
```bash
tomcat-formula$ yamllint -s .
./pillar.example
1:1 warning missing document start "---" (document-start)
14:7 error wrong indentation: expected 8 but found 6 (indentation)
17:5 warning comment not indented like content (comments-indentation)
23:15 warning truthy value should be one of [false, true] (truthy)
26:7 warning missing starting space in comment (comments)
27:22 warning truthy value should be one of [false, true] (truthy)
30:7 error wrong indentation: expected 8 but found 6 (indentation)
33:7 error wrong indentation: expected 8 but found 6 (indentation)
34:9 error wrong indentation: expected 10 but found 8 (indentation)
50:10 warning missing starting space in comment (comments)
54:22 warning too few spaces before comment (comments)
54:23 warning missing starting space in comment (comments)
54:89 error line too long (104 > 88 characters) (line-length)
55:11 error wrong indentation: expected 12 but found 10 (indentation)
55:33 warning too few spaces before comment (comments)
55:34 warning missing starting space in comment (comments)
55:89 error line too long (108 > 88 characters) (line-length)
61:13 error wrong indentation: expected 14 but found 12 (indentation)
67:11 error wrong indentation: expected 12 but found 10 (indentation)
72:13 error wrong indentation: expected 14 but found 12 (indentation)
77:13 error wrong indentation: expected 14 but found 12 (indentation)
82:89 error line too long (126 > 88 characters) (line-length)
87:11 error wrong indentation: expected 12 but found 10 (indentation)
92:11 error wrong indentation: expected 12 but found 10 (indentation)
93:13 error wrong indentation: expected 14 but found 12 (indentation)
96:13 error wrong indentation: expected 14 but found 12 (indentation)
99:15 error wrong indentation: expected 16 but found 14 (indentation)
146:7 error wrong indentation: expected 8 but found 6 (indentation)
147:9 error wrong indentation: expected 10 but found 8 (indentation)
148:11 error wrong indentation: expected 12 but found 10 (indentation)
153:11 error wrong indentation: expected 12 but found 10 (indentation)
158:9 error wrong indentation: expected 10 but found 8 (indentation)
159:11 error wrong indentation: expected 12 but found 10 (indentation)
161:11 error wrong indentation: expected 12 but found 10 (indentation)
162:22 warning truthy value should be one of [false, true] (truthy)
164:9 error wrong indentation: expected 10 but found 8 (indentation)
165:11 error wrong indentation: expected 12 but found 10 (indentation)
176:9 error wrong indentation: expected 10 but found 8 (indentation)
177:11 error wrong indentation: expected 12 but found 10 (indentation)
181:7 error wrong indentation: expected 8 but found 6 (indentation)
181:89 error line too long (93 > 88 characters) (line-length)
182:9 error wrong indentation: expected 10 but found 8 (indentation)
183:11 error wrong indentation: expected 12 but found 10 (indentation)
187:89 error line too long (96 > 88 characters) (line-length)
188:11 error wrong indentation: expected 12 but found 10 (indentation)
189:13 error wrong indentation: expected 14 but found 12 (indentation)
190:15 error wrong indentation: expected 16 but found 14 (indentation)
200:1 error trailing spaces (trailing-spaces)
202:13 error wrong indentation: expected 14 but found 12 (indentation)
203:15 error wrong indentation: expected 16 but found 14 (indentation)
208:1 error too many blank lines (3 > 0) (empty-lines)
./.kitchen.docker.yml
6:30 error no new line character at the end of file (new-line-at-end-of-file)
./tomcat/defaults.yaml
3:1 warning missing document start "---" (document-start)
12:28 warning missing starting space in comment (comments)
28:4 warning missing starting space in comment (comments)
29:22 error too few spaces after comma (commas)
37:4 warning missing starting space in comment (comments)
./tomcat/osmap.yaml
3:1 warning missing document start "---" (document-start)
55:4 warning missing starting space in comment (comments)
56:15 error empty value in block mapping (empty-values)
58:2 error syntax error: expected <block end>, but found '{' (syntax)
58:3 warning too few spaces before comment (comments)
58:4 warning missing starting space in comment (comments)
59:1 error wrong indentation: expected 3 but found 0 (indentation)
60:7 error wrong indentation: expected 5 but found 6 (indentation)
60:8 warning too few spaces before comment (comments)
60:89 error line too long (89 > 88 characters) (line-length)
61:10 warning too few spaces before comment (comments)
62:7 error wrong indentation: expected 10 but found 6 (indentation)
62:8 warning too few spaces before comment (comments)
63:10 warning too few spaces before comment (comments)
64:7 error wrong indentation: expected 10 but found 6 (indentation)
64:8 warning too few spaces before comment (comments)
65:3 error wrong indentation: expected 8 but found 2 (indentation)
65:11 error too many spaces inside braces (braces)
65:92 error too many spaces inside braces (braces)
65:89 error line too long (94 > 88 characters) (line-length)
66:3 error wrong indentation: expected 8 but found 2 (indentation)
66:8 error cannot infer indentation: unexpected token (indentation)
66:12 error too many spaces inside braces (braces)
66:94 error too many spaces inside braces (braces)
66:89 error line too long (96 > 88 characters) (line-length)
68:3 error wrong indentation: expected 8 but found 2 (indentation)
68:12 error cannot infer indentation: unexpected token (indentation)
68:16 error too many spaces inside braces (braces)
68:32 error too many spaces inside braces (braces)
69:3 error wrong indentation: expected 8 but found 2 (indentation)
69:10 error cannot infer indentation: unexpected token (indentation)
70:6 error cannot infer indentation: unexpected token (indentation)
71:6 error cannot infer indentation: unexpected token (indentation)
72:13 error cannot infer indentation: unexpected token (indentation)
73:11 error cannot infer indentation: unexpected token (indentation)
74:14 error cannot infer indentation: unexpected token (indentation)
75:23 error cannot infer indentation: unexpected token (indentation)
76:16 error cannot infer indentation: unexpected token (indentation)
77:10 error cannot infer indentation: unexpected token (indentation)
78:16 error cannot infer indentation: unexpected token (indentation)
79:16 error cannot infer indentation: unexpected token (indentation)
80:18 error cannot infer indentation: unexpected token (indentation)
82:4 warning missing starting space in comment (comments)
83:3 error wrong indentation: expected 8 but found 2 (indentation)
84:3 error wrong indentation: expected 10 but found 2 (indentation)
84:15 error cannot infer indentation: unexpected token (indentation)
85:18 error cannot infer indentation: unexpected token (indentation)
87:4 warning missing starting space in comment (comments)
88:3 error wrong indentation: expected 8 but found 2 (indentation)
89:5 error wrong indentation: expected 10 but found 4 (indentation)
./tomcat/codenamemap.yaml
1:1 warning missing document start "---" (document-start)
```
```bash
tomcat-formula$ rubocop -d
Offenses:
Rakefile:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal comment.
require 'rake'
^
Rakefile:31:4: C: Layout/TrailingEmptyLines: Final newline missing.
end
test/integration/tomcat_extend/serverspec/tomcat_extend_spec.rb:791:1: E: Lint/Syntax: unexpected token $end
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
test/integration/tomcat_install/controls/yaml_dump_spec.rb:175:79: C: Style/FormatStringToken: Prefer annotated tokens (like %<foo>s) over template tokens (like %{foo}).
pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i"
^^^^^^^^^^
test/integration/tomcat_install/controls/yaml_dump_spec.rb:348:79: C: Style/FormatStringToken: Prefer annotated tokens (like %<foo>s) over template tokens (like %{foo}).
pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i"
^^^^^^^^^^
test/integration/tomcat_install/controls/yaml_dump_spec.rb:521:79: C: Style/FormatStringToken: Prefer annotated tokens (like %<foo>s) over template tokens (like %{foo}).
pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i"
^^^^^^^^^^
test/integration/tomcat_install/serverspec/install_spec.rb:11:20: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:19:20: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:26:20: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:35:22: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:42:22: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:49:22: E: Lint/Syntax: unexpected token tCOLON
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
service_running: False
^
test/integration/tomcat_install/serverspec/install_spec.rb:77:1: E: Lint/Syntax: unexpected token kEND
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
end
^^^
test/integration/tomcat_install/serverspec/install_spec.rb:187:5: E: Lint/Syntax: unexpected token kWHEN
(Using Ruby 2.7 parser; configure using TargetRubyVersion parameter, under AllCops)
when '18.04'
^^^^
test/shared/spec_helper.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal comment.
require "serverspec"
^
test/shared/spec_helper.rb:1:9: C: Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
require "serverspec"
^^^^^^^^^^^^
test/shared/spec_helper.rb:2:9: C: Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
require "pathname"
^^^^^^^^^^
test/shared/spec_helper.rb:8:12: C: Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
c.path = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9 files inspected, 18 offenses detected
```
feat(semantic-release): implement for this formula
# [0.17.0](v0.16.0...v0.17.0) (2020-04-20) ### Bug Fixes * **rubocop:** fix (or exclude) all violations ([ead2d21](ead2d21)) * **salt-lint:** fix all violations ([579ea68](579ea68)) * **yamllint:** fix (or ignore) all errrors ([d50126a](d50126a)) ### Documentation * **readme:** apply standard structure ([a1365ef](a1365ef)) ### Features * **semantic-release:** implement for this formula ([7e4ced7](7e4ced7)) ### Tests * add tests for packages and services ([d1b4f3a](d1b4f3a)) * **yaml_dump:** add to `tomcat_install` suite ([c948f8b](c948f8b))
* Semi-automated using myii/ssf-formula#162
Rework map.jinja according to the template-formula and add support for Debian 10
## [0.17.1](v0.17.0...v0.17.1) (2020-04-21) ### Code Refactoring * standardise structure from the `template-formula` ([db49764](db49764)) * **map.jinja:** use `template-formula` structure & add `debian-10` ([d1bb84f](d1bb84f)) ### Continuous Integration * **travis+inspec:** test `debian-10` as well ([9b2bab5](9b2bab5))
Catalina variable handling
## [0.17.2](v0.17.1...v0.17.2) (2020-04-27) ### Bug Fixes * **config.sls:** ensure catalina_tmpdir created with correct permissions ([4b5387f](4b5387f)) * **debian:** define catalina_* variables for Debian based OSes ([7062834](7062834)) ### Continuous Integration * **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([479c014](479c014)) ### Tests * **yaml_dump:** update tests for changed catalina_* variables ([20cbcb8](20cbcb8))
* Semi-automated using myii/ssf-formula#165
…test-suites feat: merge test suites into single `default` suite
# [0.18.0](v0.17.2...v0.18.0) (2020-04-27) ### Bug Fixes * **cluster:** set accumlator name ([51f2968](51f2968)) * **fedora:** use `ver: 9` (Jasper Listener deprecated in tomcat >= 8) ([ba9cbf1](ba9cbf1)) * **native:** use EPEL repo for `amazonlinux-2` ([242f063](242f063)) * **server.xml:** replace tabs with spaces ([58d65f9](58d65f9)) ### Continuous Integration * **kitchen+travis+inspec:** merge test suites into single `default` suite ([429c56e](429c56e)) ### Documentation * **readme:** switch mixed-up state descriptions ([d43958f](d43958f)) ### Features * **osfingermap:** add settings for `debian-8` ([7c86d80](7c86d80)) ### Tests * update and fix all tests (inc. provide files for comparison) ([50262c3](50262c3))
…skip ci] * Automated using myii/ssf-formula#169
* Automated using myii/ssf-formula#172
* Automated using myii/ssf-formula#173
* Automated using myii/ssf-formula#191
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update from Saltstack