Skip to content

Commit 6fc66b3

Browse files
authored
Fix: warn about missing Git repository while building (#529)
1 parent 55da9e6 commit 6fc66b3

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

cmd/build.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/elastic/elastic-package/internal/builder"
1414
"github.com/elastic/elastic-package/internal/cobraext"
1515
"github.com/elastic/elastic-package/internal/docs"
16+
"github.com/elastic/elastic-package/internal/logger"
1617
"github.com/elastic/elastic-package/internal/packages"
1718
)
1819

@@ -45,6 +46,12 @@ func buildCommandAction(cmd *cobra.Command, args []string) error {
4546
return errors.Wrap(err, "locating package root failed")
4647
}
4748

49+
buildDir, err := builder.BuildDirectory()
50+
if err != nil {
51+
return errors.Wrap(err, "can't prepare build directory")
52+
}
53+
logger.Debugf("Use build directory: %s", buildDir)
54+
4855
targets, err := docs.UpdateReadmes(packageRoot)
4956
if err != nil {
5057
return errors.Wrap(err, "updating files failed")

internal/builder/packages.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
func BuildDirectory() (string, error) {
2020
buildDir, found, err := findBuildDirectory()
2121
if err != nil {
22-
return "", errors.Wrap(err, "locating build directory failed")
22+
return "", errors.Wrap(err, "can't locate build directory")
2323
}
2424
if !found {
2525
buildDir, err = createBuildDirectory()
2626
if err != nil {
27-
return "", errors.Wrap(err, "creating new build directory failed")
27+
return "", errors.Wrap(err, "can't create new build directory")
2828
}
2929
}
3030
return buildDir, nil
@@ -33,7 +33,7 @@ func BuildDirectory() (string, error) {
3333
func findBuildDirectory() (string, bool, error) {
3434
workDir, err := os.Getwd()
3535
if err != nil {
36-
return "", false, errors.Wrap(err, "locating working directory failed")
36+
return "", false, errors.Wrap(err, "can't locate build directory")
3737
}
3838

3939
dir := workDir
@@ -57,12 +57,12 @@ func findBuildDirectory() (string, bool, error) {
5757
func BuildPackagesDirectory(packageRoot string) (string, error) {
5858
buildDir, found, err := FindBuildPackagesDirectory()
5959
if err != nil {
60-
return "", errors.Wrap(err, "locating build directory failed")
60+
return "", errors.Wrap(err, "can't locate build directory")
6161
}
6262
if !found {
6363
buildDir, err = createBuildDirectory("integrations") // TODO add support for other package types
6464
if err != nil {
65-
return "", errors.Wrap(err, "creating new build directory failed")
65+
return "", errors.Wrap(err, "can't create new build directory")
6666
}
6767
}
6868

@@ -102,7 +102,7 @@ func FindBuildPackagesDirectory() (string, bool, error) {
102102
func BuildPackage(packageRoot string) (string, error) {
103103
destinationDir, err := BuildPackagesDirectory(packageRoot)
104104
if err != nil {
105-
return "", errors.Wrap(err, "locating build directory for package failed")
105+
return "", errors.Wrap(err, "can't locate build directory")
106106
}
107107
logger.Debugf("Build directory: %s\n", destinationDir)
108108

@@ -160,5 +160,5 @@ func createBuildDirectory(dirs ...string) (string, error) {
160160
}
161161
dir = filepath.Dir(dir)
162162
}
163-
return "", errors.New("locating place for build directory failed")
163+
return "", errors.New("package can be only built inside of a Git repository (.git folder is used as reference point)")
164164
}

0 commit comments

Comments
 (0)