From ab616e4d494d517007326c81ec364885df1d3797 Mon Sep 17 00:00:00 2001
From: Jonas Cirotzki <jonas.cirotzki@posteo.de>
Date: Tue, 27 Sep 2022 15:53:41 +0200
Subject: [PATCH] fix local docker psql execution

---
 src/docker/process.rs | 10 ++++++++--
 src/main.rs           |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/docker/process.rs b/src/docker/process.rs
index a60e4ab..4c13da4 100644
--- a/src/docker/process.rs
+++ b/src/docker/process.rs
@@ -2,6 +2,12 @@ use crate::style_print::*;
 use std::process::Command;
 use std::str;
 
+
+pub fn process_psql_docker() {
+    create_docker_network();
+    process_docker_psql("zapp-psql");
+}
+
 pub fn process_docker_build(project_id: &str, service_name: &str, gcr_region: &str) {
     let gcr_url = String::from(gcr_region) + "/" + project_id + "/" + service_name;
     let output = Command::new("docker")
@@ -18,7 +24,7 @@ pub fn process_docker_push(project_id: &str, service_name: &str, gcr_region: &st
     println!("output = {:?}", output);
 }
 
-pub fn create_docker_network() {
+fn create_docker_network() {
     let _output = Command::new("docker")
         .args(&["network", "create", "zapp"])
         .output();
@@ -32,7 +38,7 @@ pub fn process_docker_restart() {
     let _output2 = Command::new("zapp").args(&["docker", "psql"]).output();
 }
 
-pub fn process_docker_psql(service_name: &str) {
+fn process_docker_psql(service_name: &str) {
     let underscored_name = service_name.to_string().replace("-", "_");
     let container_name = String::from(service_name) + "-psql";
     let db_name = String::from("POSTGRES_DB=") + &underscored_name + "_db";
diff --git a/src/main.rs b/src/main.rs
index fcda9d2..428c0db 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -135,9 +135,7 @@ fn main() {
             let docker_cmd = docker.command.unwrap_or(DockerCommands::Help);
             match docker_cmd {
                 DockerCommands::Psql => {
-                    let gcp = get_gcp();
-                    create_docker_network();
-                    process_docker_psql(&gcp.service_name);
+                    process_psql_docker();
                 }
                 DockerCommands::Build => {
                     let gcp = get_gcp();
@@ -225,6 +223,8 @@ fn main() {
     }
 }
 
+
+
 pub fn get_gcp() -> GcpConfig {
     let file_name = "gcp_config.json";
     let f = File::open(file_name).unwrap();