From e6527317dd110505334d5ad2b484596d8eb85d4a Mon Sep 17 00:00:00 2001
From: mtojek <marcin.tojek@elastic.co>
Date: Fri, 1 Oct 2021 13:19:56 +0200
Subject: [PATCH] Fix: warn about missing Git repository while building

---
 cmd/build.go                 |  7 +++++++
 internal/builder/packages.go | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cmd/build.go b/cmd/build.go
index db3d0231e0..cc08e3430f 100644
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -13,6 +13,7 @@ import (
 	"github.com/elastic/elastic-package/internal/builder"
 	"github.com/elastic/elastic-package/internal/cobraext"
 	"github.com/elastic/elastic-package/internal/docs"
+	"github.com/elastic/elastic-package/internal/logger"
 	"github.com/elastic/elastic-package/internal/packages"
 )
 
@@ -45,6 +46,12 @@ func buildCommandAction(cmd *cobra.Command, args []string) error {
 		return errors.Wrap(err, "locating package root failed")
 	}
 
+	buildDir, err := builder.BuildDirectory()
+	if err != nil {
+		return errors.Wrap(err, "can't prepare build directory")
+	}
+	logger.Debugf("Use build directory: %s", buildDir)
+
 	targets, err := docs.UpdateReadmes(packageRoot)
 	if err != nil {
 		return errors.Wrap(err, "updating files failed")
diff --git a/internal/builder/packages.go b/internal/builder/packages.go
index 169d188e6a..338fb53a26 100644
--- a/internal/builder/packages.go
+++ b/internal/builder/packages.go
@@ -19,12 +19,12 @@ import (
 func BuildDirectory() (string, error) {
 	buildDir, found, err := findBuildDirectory()
 	if err != nil {
-		return "", errors.Wrap(err, "locating build directory failed")
+		return "", errors.Wrap(err, "can't locate build directory")
 	}
 	if !found {
 		buildDir, err = createBuildDirectory()
 		if err != nil {
-			return "", errors.Wrap(err, "creating new build directory failed")
+			return "", errors.Wrap(err, "can't create new build directory")
 		}
 	}
 	return buildDir, nil
@@ -33,7 +33,7 @@ func BuildDirectory() (string, error) {
 func findBuildDirectory() (string, bool, error) {
 	workDir, err := os.Getwd()
 	if err != nil {
-		return "", false, errors.Wrap(err, "locating working directory failed")
+		return "", false, errors.Wrap(err, "can't locate build directory")
 	}
 
 	dir := workDir
@@ -57,12 +57,12 @@ func findBuildDirectory() (string, bool, error) {
 func BuildPackagesDirectory(packageRoot string) (string, error) {
 	buildDir, found, err := FindBuildPackagesDirectory()
 	if err != nil {
-		return "", errors.Wrap(err, "locating build directory failed")
+		return "", errors.Wrap(err, "can't locate build directory")
 	}
 	if !found {
 		buildDir, err = createBuildDirectory("integrations") // TODO add support for other package types
 		if err != nil {
-			return "", errors.Wrap(err, "creating new build directory failed")
+			return "", errors.Wrap(err, "can't create new build directory")
 		}
 	}
 
@@ -102,7 +102,7 @@ func FindBuildPackagesDirectory() (string, bool, error) {
 func BuildPackage(packageRoot string) (string, error) {
 	destinationDir, err := BuildPackagesDirectory(packageRoot)
 	if err != nil {
-		return "", errors.Wrap(err, "locating build directory for package failed")
+		return "", errors.Wrap(err, "can't locate build directory")
 	}
 	logger.Debugf("Build directory: %s\n", destinationDir)
 
@@ -160,5 +160,5 @@ func createBuildDirectory(dirs ...string) (string, error) {
 		}
 		dir = filepath.Dir(dir)
 	}
-	return "", errors.New("locating place for build directory failed")
+	return "", errors.New("package can be only built inside of a Git repository (.git folder is used as reference point)")
 }