From b286640b8ceab8c6b12af4d4ea50292a38bb0b5a Mon Sep 17 00:00:00 2001 From: alexanderbazhenoff Date: Sun, 24 Mar 2024 01:41:30 +0300 Subject: [PATCH] prettier troubleshooting --- .github/workflows/mega_linter.yml | 12 ++++++++---- .mega-linter.yml | 1 + roles/bareos/tasks/pkg_management/install_dnf.yml | 3 ++- roles/bareos/tasks/pkg_management/install_yum.yml | 3 ++- .../examples/install_postgresql16_with_pgadmin.yml | 3 ++- roles/postgresql/molecule/default/side_effect.yml | 3 ++- .../postgresql/tasks/pkg_management/install_apk.yml | 3 ++- .../postgresql/tasks/pkg_management/install_apt.yml | 3 ++- .../postgresql/tasks/pkg_management/install_dnf.yml | 3 ++- .../postgresql/tasks/pkg_management/install_yum.yml | 3 ++- roles/postgresql/tasks/server_packages_redhat.yml | 3 ++- 11 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.github/workflows/mega_linter.yml b/.github/workflows/mega_linter.yml index 5479306..4b2658a 100644 --- a/.github/workflows/mega_linter.yml +++ b/.github/workflows/mega_linter.yml @@ -35,14 +35,16 @@ jobs: fetch-depth: 0 - name: MegaLinter - uses: oxsecurity/megalinter@latest # kics-scan ignore-line + # kics-scan ignore-line + uses: oxsecurity/megalinter@latest id: ml env: VALIDATE_ALL_CODEBASE: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Archive production artifacts - uses: actions/upload-artifact@v4 # kics-scan ignore-line + # kics-scan ignore-line + uses: actions/upload-artifact@v4 if: success() || failure() with: name: MegaLinter reports @@ -81,7 +83,8 @@ jobs: # Create pull request if applicable # (for now works only on PR from the same repository, not from forks) - name: Create Pull Request with applied fixes - uses: peter-evans/create-pull-request@v6 # kics-scan ignore-line + # kics-scan ignore-line + uses: peter-evans/create-pull-request@v6 id: cpr if: env.APPLY_FIXES_IF_PR == 'true' with: @@ -103,7 +106,8 @@ jobs: run: sudo chown -Rc $UID .git/ - name: Commit and push applied linter fixes - uses: stefanzweifel/git-auto-commit-action@latest # kics-scan ignore-line + # kics-scan ignore-line + uses: stefanzweifel/git-auto-commit-action@latest if: env.APPLY_FIXES_IF_COMMIT == 'true' with: branch: >- diff --git a/.mega-linter.yml b/.mega-linter.yml index 5da8dcd..bb1d07f 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -1,4 +1,5 @@ --- YAML_YAMLLINT_CONFIG_FILE: .yamllint +YAML_YAMLLINT_FILTER_REGEX_EXCLUDE: server_packages_redhat.yml DISABLE_LINTERS: - SPELL_CSPELL diff --git a/roles/bareos/tasks/pkg_management/install_dnf.yml b/roles/bareos/tasks/pkg_management/install_dnf.yml index 878cc19..aabdb95 100644 --- a/roles/bareos/tasks/pkg_management/install_dnf.yml +++ b/roles/bareos/tasks/pkg_management/install_dnf.yml @@ -3,7 +3,8 @@ - name: "install dnf | Install packages" # noqa package-latest ansible.builtin.dnf: name: "{{ item }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true register: install_yum_results until: install_yum_results is succeeded diff --git a/roles/bareos/tasks/pkg_management/install_yum.yml b/roles/bareos/tasks/pkg_management/install_yum.yml index 843f7dc..5a5bb03 100644 --- a/roles/bareos/tasks/pkg_management/install_yum.yml +++ b/roles/bareos/tasks/pkg_management/install_yum.yml @@ -3,7 +3,8 @@ - name: "install yum | Install packages" # noqa package-latest ansible.builtin.yum: name: "{{ item }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true register: install_yum_results until: install_yum_results is succeeded diff --git a/roles/postgresql/examples/install_postgresql16_with_pgadmin.yml b/roles/postgresql/examples/install_postgresql16_with_pgadmin.yml index 63aa419..4309316 100644 --- a/roles/postgresql/examples/install_postgresql16_with_pgadmin.yml +++ b/roles/postgresql/examples/install_postgresql16_with_pgadmin.yml @@ -14,7 +14,8 @@ postgresql_version: 16 install_pgadmin: true pgadmin_email: admin@domain.com - pgadmin_password: my_pgadmin_password # kics-scan ignore-line + # kics-scan ignore-line + pgadmin_password: my_pgadmin_password postgresql_conf: port: 5432 max_connections: 1000 diff --git a/roles/postgresql/molecule/default/side_effect.yml b/roles/postgresql/molecule/default/side_effect.yml index 96ba52d..06df347 100644 --- a/roles/postgresql/molecule/default/side_effect.yml +++ b/roles/postgresql/molecule/default/side_effect.yml @@ -15,7 +15,8 @@ role_subject: users postgresql_users: - name: test - password: my_password # kics-scan ignore-line + # kics-scan ignore-line + password: my_password - name: "default >>> side effect | Include postgresql role to create database" ansible.builtin.include_role: diff --git a/roles/postgresql/tasks/pkg_management/install_apk.yml b/roles/postgresql/tasks/pkg_management/install_apk.yml index e3e8369..d8b2dce 100644 --- a/roles/postgresql/tasks/pkg_management/install_apk.yml +++ b/roles/postgresql/tasks/pkg_management/install_apk.yml @@ -3,7 +3,8 @@ - name: "install apk | Install packages" community.general.apk: name: "{{ item.package }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true register: install_results until: install_results is succeeded diff --git a/roles/postgresql/tasks/pkg_management/install_apt.yml b/roles/postgresql/tasks/pkg_management/install_apt.yml index 75d9e10..7d9ccec 100644 --- a/roles/postgresql/tasks/pkg_management/install_apt.yml +++ b/roles/postgresql/tasks/pkg_management/install_apt.yml @@ -3,7 +3,8 @@ - name: "install apt | Install packages" # noqa package-latest ansible.builtin.apt: name: "{{ item.package }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true register: install_results until: install_results is succeeded diff --git a/roles/postgresql/tasks/pkg_management/install_dnf.yml b/roles/postgresql/tasks/pkg_management/install_dnf.yml index 78a4582..9f8c6ed 100644 --- a/roles/postgresql/tasks/pkg_management/install_dnf.yml +++ b/roles/postgresql/tasks/pkg_management/install_dnf.yml @@ -3,7 +3,8 @@ - name: "install dnf | Install packages" # noqa package-latest ansible.builtin.dnf: name: "{{ item.package }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true disable_gpg_check: "{{ item.disable_gpg_check | default(false) }}" register: install_results diff --git a/roles/postgresql/tasks/pkg_management/install_yum.yml b/roles/postgresql/tasks/pkg_management/install_yum.yml index e09d736..254d841 100644 --- a/roles/postgresql/tasks/pkg_management/install_yum.yml +++ b/roles/postgresql/tasks/pkg_management/install_yum.yml @@ -3,7 +3,8 @@ - name: "install yum | Install packages" # noqa package-latest ansible.builtin.yum: name: "{{ item.package }}" - state: latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest update_cache: true disablerepo: "{{ item.disable_repo | default(omit) }}" enablerepo: "{{ item.enable_repo | default(omit) }}" diff --git a/roles/postgresql/tasks/server_packages_redhat.yml b/roles/postgresql/tasks/server_packages_redhat.yml index bc415f3..67b31ab 100644 --- a/roles/postgresql/tasks/server_packages_redhat.yml +++ b/roles/postgresql/tasks/server_packages_redhat.yml @@ -30,7 +30,8 @@ - name: "server packages redhat | Install repo package to check versioned postgresql package is available" ansible.builtin.dnf: name: "{{ postgresql_packages[1].package }}" - state: latest # noqa package-latest # kics-scan ignore-line + # kics-scan ignore-line + state: latest # noqa package-latest update_cache: true disable_gpg_check: "{{ postgresql_packages[1].disable_gpg_check | default(false) }}" ignore_errors: true