Skip to content
This repository was archived by the owner on Dec 26, 2020. It is now read-only.

Harmonize style #290

Merged
merged 11 commits into from
Jun 20, 2020
Merged

Harmonize style #290

merged 11 commits into from
Jun 20, 2020

Conversation

aisbergg
Copy link
Contributor

@aisbergg aisbergg commented Jun 9, 2020

This PR mostly aims to harmonize the style of the role.

Due to contributions from various authors the role contains different styles in formatting, quoting and such. This PR includes the following changes to deal with this issue:

  • change of indentation
  • consistent use of single quotes
  • name of all tasks beginn with lower case
  • explicit begin in all YAML files
  • use of 'loop' instead of old style 'with_items'

Besides style the PR includes:

  • correct usage of the ansible_managed header in combination with the 'comment' filter
  • usage of Jinjas feature 'lstrip_blocks' so we don't have to strip manually using -%}
  • fix for template validation, so that Match LocalPort can be used

@schurzi schurzi self-assigned this Jun 9, 2020
@aisbergg
Copy link
Contributor Author

I guess it is to much for one request. I will split it into multiple PRs, so the reviewing might be easier

@schurzi
Copy link
Contributor

schurzi commented Jun 16, 2020

no it's ok. just had some very full few days ...
I will look into this until tomorrow evening

aisbergg added 8 commits June 17, 2020 19:15
Using 'Match LocalPort' in the configuration results in an error:

    'Match LocalPort' in configuration but 'lport' not in connection test
    specification.

Adding '-C lport=22' to the validation fixes this issue.

Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
Changes include:
- change of indentation
- consistent use of single quotes
- name of all tasks beginn with lower case
- explicit begin in all YAML files
- use of 'loop' instead of old style 'with_items'

Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
Signed-off-by: Andre Lehmann <[email protected]>
@schurzi
Copy link
Contributor

schurzi commented Jun 18, 2020

thank you for your help and patience!
@rndmh3ro LGTM now

@rndmh3ro
Copy link
Member

Thank you for this awesome PR!

@rndmh3ro rndmh3ro merged commit 3f962b5 into dev-sec:master Jun 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants