replaced deprecated no-ansi opt

elastic · Jun 3, 2024 · 9991239 · 9991239
1 parent 17a45a7
commit 9991239
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.buildkite/scripts/initCloudEnv.sh b/.buildkite/scripts/initCloudEnv.sh
@@ -15,7 +15,7 @@ exportAwsSecrets() {
 }
 
 terraformApply() {
-  echo "~~~ Terraform Init on $MODULE_DIR"
+  echo "Terraform Init on $MODULE_DIR"
   terraform -chdir="$MODULE_DIR" init
 
   TF_VAR_BRANCH=$(echo "${BUILDKITE_BRANCH}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')
@@ -26,7 +26,7 @@ terraformApply() {
   export TF_VAR_BRANCH
   export TF_VAR_CREATED_DATE
 
-  echo "~~~ Terraform Apply on $MODULE_DIR"
+  echo "Terraform Apply on $MODULE_DIR"
   terraform -chdir="$MODULE_DIR" apply -auto-approve
 }
 
@@ -52,7 +52,7 @@ timeout=5
 retries=0
 
 while true; do
-  echo "--- Setting up Terraform"
+  echo "~~~ Setting up Terraform"
   out=$(terraformApply 2>&1)
   exit_code=$?
 

diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -202,6 +202,7 @@ steps:
         env:
           ASDF_TERRAFORM_VERSION: 1.0.2
           MODULE_DIR: "x-pack/metricbeat/module/aws"
+
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"

diff --git a/libbeat/tests/compose/wrapper.go b/libbeat/tests/compose/wrapper.go
@@ -154,7 +154,8 @@ func (d *wrapperDriver) Close() error {
 
 func (d *wrapperDriver) cmd(ctx context.Context, command string, arg ...string) *exec.Cmd {
 	var args []string
-	args = append(args, "--no-ansi", "--project-name", d.Name)
+	args = append(args, "--ansi never", "--project-name", d.Name)
+	//args = append(args, "--no-ansi", "--project-name", d.Name)
 	for _, f := range d.Files {
 		args = append(args, "--file", f)
 	}
@@ -367,7 +368,7 @@ func (d *wrapperDriver) serviceNames(ctx context.Context) ([]string, error) {
 	cmd.Stdout = &stdout
 	err := cmd.Run()
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get list of service names")
+		return nil, errors.Wrap(err, "failed to get list of service names. attempted command: ["+cmd.String()+"]")
 	}
 	return strings.Fields(stdout.String()), nil
 }