style: update precommit and style

This commit is contained in:
Jeff Neel 2023-10-11 21:52:56 -05:00
parent 3c0568c749
commit 5f487e33f6
5 changed files with 19 additions and 20 deletions

View file

@ -146,7 +146,6 @@ rubocop:
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
default-debian-11-master-py3: {extends: '.test_instance'}
default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'}

View file

@ -30,7 +30,7 @@ repos:
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.30.1
rev: v1.56.4
hooks:
- id: rubocop
name: Check Ruby files with rubocop
@ -38,14 +38,14 @@ repos:
always_run: true
pass_filenames: false
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.4
rev: v0.9.0.6
hooks:
- id: shellcheck
name: Check shell scripts with shellcheck
files: ^.*\.(sh|bash|ksh)$
types: []
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.32.0
hooks:
- id: yamllint
name: Check YAML syntax with yamllint
@ -53,7 +53,7 @@ repos:
always_run: true
pass_filenames: false
- repo: https://github.com/warpnet/salt-lint
rev: v0.8.0
rev: v0.9.2
hooks:
- id: salt-lint
name: Check Salt files using salt-lint

View file

@ -20,7 +20,7 @@ mysql_server_config:
- source: salt://{{ tpldir }}/files/server.cnf
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
- context:
tpldir: {{ tpldir }}
tpldir: {{ tpldir }}
- user: root
- group: root
- mode: 644
@ -37,7 +37,7 @@ mysql_galera_config:
- source: salt://{{ tpldir }}/files/galera.cnf
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
- context:
tpldir: {{ tpldir }}
tpldir: {{ tpldir }}
- user: root
- group: root
- mode: 644
@ -54,7 +54,7 @@ mysql_library_config:
- source: salt://{{ tpldir }}/files/client.cnf
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
- context:
tpldir: {{ tpldir }}
tpldir: {{ tpldir }}
- user: root
- group: root
- mode: 644
@ -71,7 +71,7 @@ mysql_clients_config:
- source: salt://{{ tpldir }}/files/mysql-clients.cnf
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
- context:
tpldir: {{ tpldir }}
tpldir: {{ tpldir }}
- user: root
- group: root
- mode: 644
@ -92,7 +92,7 @@ mysql_config:
- source: salt://{{ tpldir }}/files/my.cnf
{%- endif %}
- context:
tpldir: {{ tpldir }}
tpldir: {{ tpldir }}
{%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
- user: root
- group: root

View file

@ -81,11 +81,11 @@ mysql-macos-{{ product }}-desktop-shortcut-add:
- mode: 755
- template: jinja
- context:
user: {{ mysql.macos.user }}
home: {{ mysql.macos.userhomes }}
app: {{ data.app }}
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
user: {{ mysql.macos.user }}
home: {{ mysql.macos.userhomes }}
app: {{ data.app }}
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
cmd.run:
- name: /tmp/mac_shortcut.sh add
- runas: {{ mysql.macos.user }}

View file

@ -19,11 +19,11 @@ mysql-macos-{{ product }}-desktop-shortcut-remove:
- mode: 755
- template: jinja
- context:
user: {{ mysql.macos.user }}
home: {{ mysql.macos.userhomes }}
app: {{ data.app }}
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
user: {{ mysql.macos.user }}
home: {{ mysql.macos.userhomes }}
app: {{ data.app }}
dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }}
suffix: {{ '.app' if "isapp" in data and data.isapp else '' }}
cmd.run:
- name: /tmp/mac_shortcut.sh remove
- runas: {{ mysql.macos.user }}