Merge branch 'main' into feature/crt_passphrase_check

Author: danopt

.config/ansible-lint.yml

@@ -7,13 +7,12 @@ warn_list:
   - key-order[task]  # Ensure specific order of keys in mappings.
   - name[casing]
   - 'risky-shell-pipe'
-  - no-handler # backup of old certificates
   - var-naming[no-role-prefix] # remove when https://github.com/ansible/ansible-lint/discussions/3451 is done
 skip_list:
   - '106'
   - 'command-instead-of-module'
   - 'role-name'
   - 'line-length'
-  - 'fqcn-builtins'
   - 'package-latest'
   - yaml  # Violations reported by yamllint.
+  - no-handler # backup of old certificates

.github/workflows/test_full_stack.yml

@@ -16,27 +16,10 @@ on:
     - cron: "0 4 * * *"
 
 jobs:
-
   lint_full:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint .
-          ansible-lint roles/
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: ''
 
   molecule_full_stack_every_os:
     runs-on: ubuntu-latest

.github/workflows/test_linting.yml

@@ -0,0 +1,68 @@
+---
+name: Test Linting
+on:
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: 'Log level'
+        required: true
+        default: 'warning'
+        type: choice
+        options:
+          - info
+          - warning
+          - debug
+  workflow_call:
+    inputs:
+      rolename:
+        required: true
+        type: string
+  push:
+    branches:
+      - 'feature/**'
+      - 'fix/**'
+      - '!doc/**'
+    paths:
+      - '.github/workflows/test_linting.yml'
+      - '.config/ansible-lint.yml'
+      - '.yamllint'
+  pull_request:
+    branches:
+      - 'feature/**'
+      - 'fix/**'
+      - '!doc/**'
+    paths:
+      - '.github/workflows/test_linting.yml'
+      - '.config/ansible-lint.yml'
+      - '.yamllint'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v3
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r requirements-test.txt
+
+      - name: Lint code (yamllint).
+        run: |
+          yamllint .
+        if: ${{ inputs.rolename == '' }}
+
+      - name: Lint Role (yamllint).
+        run: |
+          ansible-lint roles/${{ inputs.rolename }}
+        if: ${{ inputs.rolename != '' }}
+
+      - name: Lint Role (ansible-lint).
+        run: |
+          ansible-lint roles/${{ inputs.rolename }}

.github/workflows/test_role_beats.yml

@@ -21,8 +21,6 @@ on:
       - 'roles/beats/**'
       - '.github/workflows/test_role_beats.yml'
       - 'molecule/beats_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
       - 'feature/**'
@@ -32,30 +30,12 @@ on:
       - 'roles/beats/**'
       - '.github/workflows/test_role_beats.yml'
       - 'molecule/beats_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_beats:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint roles/beats/
-          ansible-lint roles/beats/
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: beats
 
   molecule_beats:
     needs: lint_beats

.github/workflows/test_role_elasticsearch.yml

@@ -21,8 +21,6 @@ on:
       - 'roles/elasticsearch/**'
       - '.github/workflows/test_role_elasticsearch.yml'
       - 'molecule/elasticsearch_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
       - 'feature/**'
@@ -32,30 +30,12 @@ on:
       - 'roles/elasticsearch/**'
       - '.github/workflows/test_role_elasticsearch.yml'
       - 'molecule/elasticsearch_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_elasticsearch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint roles/elasticsearch/
-          ansible-lint roles/elasticsearch/
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: elasticsearch
 
   molecule_elasticsearch:
     needs: lint_elasticsearch

.github/workflows/test_role_kibana.yml

@@ -21,8 +21,6 @@ on:
       - 'roles/kibana/**'
       - '.github/workflows/test_role_kibana.yml'
       - 'molecule/kibana_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
       - 'feature/**'
@@ -32,30 +30,13 @@ on:
       - 'roles/kibana/**'
       - '.github/workflows/test_role_kibana.yml'
       - 'molecule/kibana_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_kibana:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: kibana
 
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint roles/kibana/
-          ansible-lint roles/kibana/
 
   molecule_kibana:
     needs: lint_kibana

.github/workflows/test_role_logstash.yml

@@ -21,8 +21,6 @@ on:
       - 'roles/logstash/**'
       - '.github/workflows/test_role_logstash.yml'
       - 'molecule/logstash_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
       - 'feature/**'
@@ -32,30 +30,13 @@ on:
       - 'roles/logstash/**'
       - '.github/workflows/test_role_logstash.yml'
       - 'molecule/logstash_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_logstash:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: logstash
 
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint roles/logstash/
-          ansible-lint roles/logstash/
 
   molecule_logstash_extended:
     runs-on: ubuntu-latest

.github/workflows/test_role_repos.yml

@@ -20,8 +20,6 @@ on:
       - 'roles/repos/**'
       - '.github/workflows/test_role_repos.yml'
       - 'molecule/repos_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
       - 'feature/**'
@@ -31,30 +29,12 @@ on:
       - 'roles/repos/**'
       - '.github/workflows/test_role_repos.yml'
       - 'molecule/repos_**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_repos:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint roles/repos/
-          ansible-lint roles/repos/
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: repos
 
   molecule_repos:
     needs: lint_repos

.github/workflows/test_roles_pr.yml

@@ -21,8 +21,6 @@ on:
       - 'roles/**'
       - '.github/workflows/test_roles_pr.yml'
       - 'molecule/elasticstack_default/**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   push:
     branches:
       - 'feature/**'
@@ -32,30 +30,13 @@ on:
       - 'roles/**'
       - '.github/workflows/test_roles_pr.yml'
       - 'molecule/elasticstack_default/**'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
 
 jobs:
   lint_full:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase.
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+    uses: ./.github/workflows/test_linting.yml
+    with:
+      rolename: ''
 
-      - name: Install test dependencies.
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements-test.txt
-
-      - name: Lint code.
-        run: |
-          yamllint .
-          ansible-lint roles/
   molecule_full_stack:
     runs-on: ubuntu-latest
     needs: lint_full

.mailmap

@@ -1,8 +1,15 @@
+Afeef Ghannam <afeef.ghannam@netways.de> <39904920+afeefghannam89@users.noreply.github.com>
 Alexander Stoll <alexander.stoll@netways.de> <45196568+Crited@users.noreply.github.com>
+Daniel Neuberger <daniel.neuberger@netways.de> <xtruthx@users.noreply.github.com>
+Daniel Patrick <daniel.patrick@netways.de> <daniel.patrick@netways.de>
 Daniel Patrick <daniel.patrick@netways.de> <dani.p1991@gmail.com>
+Denise Siemer <denise.siemer@netways.de> <118279543+dnssmr@users.noreply.github.com>
+Lorenz Kästle <lorenz.kaestle@netways.de> <12514511+RincewindsHat@users.noreply.github.com>
 Markus Frosch <markus.frosch@netways.de> <markus@lazyfrosch.de>
+Matthias Döhler <matthias.doehler@netways.de> <88634789+Donien@users.noreply.github.com>
 Nathaniel Donahue <nathaniel.donahue@netways.de> <56820910+Nathaniel-Donahue@users.noreply.github.com>
 Patrick Dolinic <patrick.dolinic@netways.de> <71389319+pdolinic@users.noreply.github.com>
-Thomas Widhalm <thomas.widhalm@netways.de> <widhalmt@widhalm.or.at>
-Thilo Wening <thilo.wening@netways.de>
 Thilo Wening <mkayontour@gmail.com>
+Thilo Wening <mkayontour@gmail.com> <mkayontour@users.noreply.github.com>
+Thilo Wening <mkayontour@gmail.com> <thilo.wening@netways.de>
+Thomas Widhalm <thomas.widhalm@netways.de> <widhalmt@widhalm.or.at>