Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cmd/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions internal/builder/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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")
}
}

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)")
}