Skip to content

Don't require Elasticsearch for static tests #1716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Don't require Elasticsearch for static tests #1716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions cmd/testrunner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

"github.com/elastic/elastic-package/internal/cobraext"
"github.com/elastic/elastic-package/internal/common"
"github.com/elastic/elastic-package/internal/elasticsearch"
"github.com/elastic/elastic-package/internal/install"
"github.com/elastic/elastic-package/internal/kibana"
"github.com/elastic/elastic-package/internal/packages"
Expand Down Expand Up @@ -296,13 +297,18 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command

variantFlag, _ := cmd.Flags().GetString(cobraext.VariantFlagName)

esClient, err := stack.NewElasticsearchClientFromProfile(profile)
if err != nil {
return fmt.Errorf("can't create Elasticsearch client: %w", err)
}
err = esClient.CheckHealth(cmd.Context())
if err != nil {
return err
var esAPI *elasticsearch.API
if testType != "static" {
// static tests do not need a running Elasticsearch
esClient, err := stack.NewElasticsearchClientFromProfile(profile)
if err != nil {
return fmt.Errorf("can't create Elasticsearch client: %w", err)
}
err = esClient.CheckHealth(cmd.Context())
if err != nil {
return err
}
esAPI = esClient.API
}

var kibanaClient *kibana.Client
Expand Down Expand Up @@ -336,7 +342,7 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command
TestFolder: folder,
PackageRootPath: packageRootPath,
GenerateTestResult: generateTestResult,
API: esClient.API,
API: esAPI,
KibanaClient: kibanaClient,
DeferCleanup: deferCleanup,
ServiceVariant: variantFlag,
Expand Down