Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-25 06:00:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

CHEF-12024 Adds C Shell support to sybase_session resource (#7069)

Browse source 
* Fixes the sybase_session resource was not working with c shell

Signed-off-by: Vasu1105 <vjagdale@progress.com>

* Adds TODO

Signed-off-by: Vasu1105 <vjagdale@progress.com>

---------

Signed-off-by: Vasu1105 <vjagdale@progress.com>
This commit is contained in:
Vasundhara Jagdale 2024-07-15 15:30:22 +05:30 committed by GitHub
parent 3ef77179d1
commit e8b739154d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/inspec/resources/sybase_session.rb
View file

@ -44,10 +44,19 @@ module Inspec::Resources
# try to get a temp path
sql_file_path = upload_sql_file(sql)
# isql reuires that we have a matching locale set, but does not support C.UTF-8. en_US.UTF-8 is the least evil.
command = "LANG=en_US.UTF-8 SYBASE=#{sybase_home} #{bin} -s\"#{col_sep}\" -w80000 -S #{server} -U #{username} -D #{database} -P \"#{password}\" < #{sql_file_path}"
isql_cmd = inspec.command(command)
# TODO: Find if there is better way to get the current shell
current_shell = inspec.command("echo $SHELL")
res = current_shell.exit_status
# isql reuires that we have a matching locale set, but does not support C.UTF-8. en_US.UTF-8 is the least evil.
if res == 0 && ( current_shell.stdout&.include?("/csh") || current_shell.stdout&.include?("/tcsh") )
command = "source #{sybase_home}/SYBASE.csh; setenv LANG en_US.UTF-8; #{bin} -s\"#{col_sep}\" -w80000 -S #{server} -U #{username} -D #{database} -P \"#{password}\" < #{sql_file_path}"
else
command = "LANG=en_US.UTF-8 SYBASE=#{sybase_home} #{bin} -s\"#{col_sep}\" -w80000 -S #{server} -U #{username} -D #{database} -P \"#{password}\" < #{sql_file_path}"
end
isql_cmd = inspec.command(command)
# Check for isql errors
res = isql_cmd.exit_status
raise Inspec::Exceptions::ResourceFailed.new("isql exited with code #{res} and stderr '#{isql_cmd.stderr}', stdout '#{isql_cmd.stdout}'") unless res == 0