Skip to content

(maint) Create a helper for docker-compose exec #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Iristyle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

(maint) Create a helper for docker-compose exec #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions gem/lib/pupperware/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ def docker_compose_down()
run_command('docker ps --all')
end

def docker_compose_exec(service:, command:)
docker_compose("exec #{service} #{command}", stream: STDOUT)
end

# https://github.com/moby/moby/issues/39922
# Each launched VM (and correspondingly container) is run under a unique Windows
# user account (in this case a random GUID) to run it's vmwp.exe host process.
Expand Down Expand Up @@ -353,7 +357,7 @@ def emit_logs
def kill_service_and_wait_for_return(service: nil, process: nil)
container = get_service_container(service)
original_restart_count = inspect_container(container,'{{.RestartCount}}')
docker_compose("exec -T #{service} pkill #{process}")
docker_compose_exec(service: service, command: "pkill #{process}")
new_restart_count = inspect_container(container,'{{.RestartCount}}')
counter = 0
while(original_restart_count == new_restart_count) do
Expand All @@ -370,8 +374,8 @@ def kill_service_and_wait_for_return(service: nil, process: nil)

# @deprecated
def count_postgres_database(database, service = 'postgres')
cmd = "exec -T #{service} psql -t --username=puppetdb --command=\"SELECT count(datname) FROM pg_database where datname = '#{database}'\""
docker_compose(cmd)[:stdout].strip
cmd = "psql -t --username=puppetdb --command=\"SELECT count(datname) FROM pg_database where datname = '#{database}'\""
docker_compose_exec(service: service, command: cmd)[:stdout].strip
end

# @deprecated
Expand All @@ -384,8 +388,8 @@ def wait_on_postgres_db(database = 'puppetdb', seconds = 240, service = 'postgre

def get_postgres_extensions(service: 'postgres')
return retry_block_up_to_timeout(30) do
query = "exec -T #{service} psql --username=puppetdb --command=\"SELECT * FROM pg_extension\""
extensions = docker_compose(query)[:stdout].chomp
query = "psql --username=puppetdb --command=\"SELECT * FROM pg_extension\""
extensions = docker_compose_exec(service: service, command: query)[:stdout].chomp
raise('failed to retrieve extensions') if extensions.empty?
STDOUT.puts("retrieved extensions: #{extensions}")
extensions
Expand All @@ -396,8 +400,8 @@ def get_postgres_extensions(service: 'postgres')
# PE Console Services Helper
######################################################################
def unrevoke_console_admin_user(postgres_container_name = "postgres")
query = "exec -T #{postgres_container_name} psql --username=puppetdb --dbname=pe-rbac --command \"UPDATE subjects SET is_revoked = 'f' WHERE login='admin';\""
output = docker_compose(query)[:stdout].chomp
query = "psql --username=puppetdb --dbname=pe-rbac --command \"UPDATE subjects SET is_revoked = 'f' WHERE login='admin';\""
output = docker_compose_exec(service: postgres_container_name, command: query)[:stdout].chomp
raise('failed to unrevoke the admin account') if ! output.eql? "UPDATE 1"
end

Expand Down Expand Up @@ -513,7 +517,7 @@ def curl_console_task(target_nodes:)
# agent_name is the fully qualified name of the node
def clean_certificate(agent_name, service: 'puppet')
STDOUT.puts "cleaning cert for #{agent_name}"
result = docker_compose("exec -T #{service} puppetserver ca clean --certname #{agent_name}")
result = docker_compose_exec(service: service, command: "puppetserver ca clean --certname #{agent_name}")
return result[:status].exitstatus
end

Expand Down