From 4dfa7fe9473261b2baa31bbb59dd67ded30d2ee9 Mon Sep 17 00:00:00 2001 From: swatiganesh <145528613+swatiganesh@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:15:07 +0530 Subject: [PATCH] modified automate_config.go (#8341) * modified automate_config.go Signed-off-by: swatign * checking backup gateway Signed-off-by: swatign * modified backup-gateway plan.sh Signed-off-by: swatign * modified backup-gateway Signed-off-by: swatign * removed commented lines Signed-off-by: swatign --------- Signed-off-by: swatign --- .../pkg/client/automate_config.go | 27 +++++++++++++------ components/backup-gateway/habitat/plan.sh | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/components/automate-deployment/pkg/client/automate_config.go b/components/automate-deployment/pkg/client/automate_config.go index 865500b06c8..f2e205be8c6 100644 --- a/components/automate-deployment/pkg/client/automate_config.go +++ b/components/automate-deployment/pkg/client/automate_config.go @@ -3,6 +3,7 @@ package client import ( "context" "fmt" + "os" "os/exec" "regexp" "strings" @@ -16,15 +17,15 @@ import ( "github.com/chef/automate/components/automate-deployment/pkg/cli" ) -var backupPathFix = `sleep 5 +var backupPathFix = `#!/bin/sh +sleep 5 chef-automate status --wait-for-healthy > /dev/null -indices=( -chef-automate-es6-automate-cs-oc-erchef +indices="chef-automate-es6-automate-cs-oc-erchef chef-automate-es6-compliance-service chef-automate-es6-event-feed-service -chef-automate-es6-ingest-service -) -for index in ${indices[@]}; do +chef-automate-es6-ingest-service" + +for index in $indices; do curl -XPUT -k -H 'Content-Type: application/json' http://localhost:10144/_snapshot/$index --data-binary @- << EOF { "type" : "fs", @@ -107,10 +108,20 @@ func PatchAutomateConfig(timeout int64, config *dc.AutomateConfig, writer cli.Fo if config.Global.V1.Backups.Filesystem.Path.Value != "" && !isOSEnabled { fmt.Println("Waiting till all the services comes in healthy state...") backupScript := fmt.Sprintf(backupPathFix, strings.TrimSuffix(config.Global.V1.Backups.Filesystem.Path.Value, "/")) - _, err := exec.Command("/bin/sh", "-c", backupScript).Output() - if err != nil { + cmd := exec.Command("/bin/sh", "-c", backupScript) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + if err := cmd.Start(); err != nil { + fmt.Printf("Failed to start script: %v\n", err) return status.Wrap(err, status.DeploymentServiceCallError, "Failed attempting to patch Chef Automate configurations") } + + if err := cmd.Wait(); err != nil { + fmt.Printf("Script execution failed with error: %v\n", err) + return status.Wrap(err, status.DeploymentServiceCallError, "Failed attempting to patch Chef Automate configurations") + } + } } } diff --git a/components/backup-gateway/habitat/plan.sh b/components/backup-gateway/habitat/plan.sh index c3069463351..6793eb13790 100644 --- a/components/backup-gateway/habitat/plan.sh +++ b/components/backup-gateway/habitat/plan.sh @@ -47,3 +47,5 @@ do_strip() { return 0 } + +