Skip to content

Commit d86b9bb

Browse files
authored
Merge pull request #250 from voxpupuli/modulesync
modulesync 10.6.0
2 parents a6a3f11 + 5597828 commit d86b9bb

26 files changed

Lines changed: 94 additions & 59 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
21
{
32
"name": "VoxBox",
43
"image": "ghcr.io/voxpupuli/voxbox:latest"

.github/workflows/create_tag.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: Create Git tag
6+
7+
on:
8+
workflow_dispatch:
9+
10+
permissions: {}
11+
12+
jobs:
13+
create_tag:
14+
uses: 'voxpupuli/gha-puppet/.github/workflows/create_tag.yml@v4'
15+
with:
16+
allowed_owner: 'voxpupuli'
17+
git_name: 'pccibot'
18+
git_email: '12855858+pccibot@users.noreply.github.com'
19+
secrets:
20+
# Configure secrets here:
21+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
22+
ssh_private_key: ${{ secrets.PCCI_SSH_PRIVATE_KEY }}

.github/workflows/prepare_release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ permissions:
1717

1818
jobs:
1919
release_prep:
20-
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
20+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v4'
2121
with:
2222
version: ${{ github.event.inputs.version }}
2323
allowed_owner: 'voxpupuli'
24+
git_name: 'pccibot'
25+
git_email: '12855858+pccibot@users.noreply.github.com'
2426
secrets:
2527
# Configure secrets here:
2628
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2729
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'
30+
ssh_private_key: '${{ secrets.PCCI_SSH_PRIVATE_KEY }}'

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ name: Release
88
on:
99
push:
1010
tags:
11-
- '*'
11+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#onpushbranchestagsbranches-ignoretags-ignore
12+
# https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet
13+
- 'v[0-9]+.[0-9]+.[0-9]+'
1214

1315
permissions:
1416
contents: write
1517

1618
jobs:
1719
release:
1820
name: Release
19-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
21+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v4
2022
with:
2123
allowed_owner: 'voxpupuli'
2224
secrets:

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.5.0'
5+
modulesync_config_version: '10.7.0'

.rubocop_todo.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
# This configuration was generated by
2-
# `rubocop --auto-gen-config`
3-
# on 2023-08-17 21:37:00 UTC using RuboCop version 1.50.2.
2+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3+
# using RuboCop version 1.85.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 1
9+
# Offense count: 4
10+
RSpec/LeakyLocalVariable:
11+
Exclude:
12+
- 'spec/classes/proxysql_spec.rb'
13+
- 'spec/type_aliases/galerahostgroup_spec.rb'
14+
15+
# Offense count: 4
1016
# This cop supports unsafe autocorrection (--autocorrect-all).
11-
Style/MapToHash:
17+
Style/MapIntoArray:
1218
Exclude:
13-
- 'lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb'
19+
- 'lib/puppet/provider/proxy_cluster/proxysql.rb'
20+
- 'lib/puppet/provider/proxy_mysql_server/proxysql.rb'
21+
- 'lib/puppet/provider/proxy_mysql_server_no_hostgroup/proxysql.rb'
22+
- 'lib/puppet/provider/proxy_mysql_user/proxysql.rb'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 13.0', :require => false
7+
gem 'voxpupuli-test', '~> 14.0', :require => false
88
gem 'puppet_metadata', '~> 6.0', :require => false
99
end
1010

@@ -18,7 +18,7 @@ group :system_tests do
1818
end
1919

2020
group :release do
21-
gem 'voxpupuli-release', '~> 5.0', :require => false
21+
gem 'voxpupuli-release', '~> 5.3', :require => false
2222
end
2323

2424
gem 'rake', :require => false

lib/facter/proxysql_runtime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'runtime_mysql_query_rules',
3434
'runtime_mysql_query_rules_fast_routing',
3535
'runtime_mysql_replication_hostgroups',
36-
'runtime_proxysql_servers'
36+
'runtime_proxysql_servers',
3737
].each do |table|
3838
results = client.query("SELECT * FROM #{table}")
3939
fact[table] = results.map { |row| row }

lib/puppet/provider/proxy_cluster/proxysql.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def self.instances
1515
instances = []
1616
if mysql_running
1717
servers = mysql([defaults_file, '-NBe',
18-
'SELECT `hostname`, `port` FROM `proxysql_servers`'].compact).split(%r{\n})
18+
'SELECT `hostname`, `port` FROM `proxysql_servers`',].compact).split(%r{\n})
1919

2020
# To reduce the number of calls to MySQL we collect all the properties in
2121
# one big swoop.
@@ -34,7 +34,7 @@ def self.instances
3434
hostname: @hostname,
3535
port: @port,
3636
weight: @weight,
37-
comment: @comment
37+
comment: @comment,
3838
)
3939
end
4040
end
@@ -82,7 +82,7 @@ def exists?
8282
end
8383

8484
def initialize(value = {})
85-
super(value)
85+
super
8686
@property_flush = {}
8787
end
8888

lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
commands mysql: 'mysql'
77

88
def initialize(value = {})
9-
super(value)
9+
super
1010
@property_flush = {}
1111
end
1212

0 commit comments

Comments
 (0)