diff --git a/tasks/export.rb b/tasks/export.rb index efd9d81..e3f44d0 100755 --- a/tasks/export.rb +++ b/tasks/export.rb @@ -1,30 +1,30 @@ #!/opt/puppetlabs/puppet/bin/ruby require 'json' require 'open3' require 'puppet' def get(file, database, user, password) cmd_string = 'mysqldump' cmd_string << " --databases #{database}" unless database.nil? cmd_string << " --user=#{user}" unless user.nil? cmd_string << " --password=#{password}" unless password.nil? cmd_string << " > #{file}" unless file.nil? - stdout, _stderr, status = Open3.capture3(cmd_string) - raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0 + stdout, stderr, status = Open3.capture3(cmd_string) + raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0 { status: stdout.strip } end params = JSON.parse(STDIN.read) database = params['database'] user = params['user'] password = params['password'] file = params['file'] begin result = get(file, database, user, password) puts result.to_json exit 0 rescue Puppet::Error => e puts({ status: 'failure', error: e.message }.to_json) exit 1 end diff --git a/tasks/sql.rb b/tasks/sql.rb index 29b2c6b..53c9d01 100755 --- a/tasks/sql.rb +++ b/tasks/sql.rb @@ -1,29 +1,29 @@ #!/opt/puppetlabs/puppet/bin/ruby require 'json' require 'open3' require 'puppet' def get(sql, database, user, password) cmd = ['mysql', '-e', "#{sql} "] cmd << "--database=#{database}" unless database.nil? cmd << "--user=#{user}" unless user.nil? cmd << "--password=#{password}" unless password.nil? - stdout, stderr, status = Open3.capture3(*cmd) # rubocop:disable Lint/UselessAssignment - raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0 + stdout, stderr, status = Open3.capture3(*cmd) + raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0 { status: stdout.strip } end params = JSON.parse(STDIN.read) database = params['database'] user = params['user'] password = params['password'] sql = params['sql'] begin result = get(sql, database, user, password) puts result.to_json exit 0 rescue Puppet::Error => e puts({ status: 'failure', error: e.message }.to_json) exit 1 end