Skip to content

Es fix #24

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

Open
harsh-awg wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Es fix #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3f9f97
replace es with light image
harsh-awg Feb 23, 2024
a36d509
add env for es
harsh-awg Feb 23, 2024
ba08a3b
rem 9300 port
harsh-awg Mar 5, 2024
b4a39e2
add 9300 port
harsh-awg Mar 5, 2024
20605b5
add v6.4.2 es image
harsh-awg Mar 5, 2024
95e60d2
add oss v7 es image
harsh-awg Mar 5, 2024
172051c
Update elasticsearch.go
harsh-awg Mar 5, 2024
c253ec1
set 3min for indexinit
harsh-awg Mar 5, 2024
63ed330
exposed 9300 endpoint as well
harsh-awg Mar 6, 2024
1cfca5a
endpoint randomisation stopped
harsh-awg Mar 6, 2024
bf3895b
clean up
harsh-awg Mar 12, 2024
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
15 changes: 9 additions & 6 deletions canned/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ type ElasticSearch struct {
func NewElasticSearch(ctx context.Context) (*ElasticSearch, error) {
_ = os.Setenv("TC_HOST", "localhost")
req := testcontainers.ContainerRequest{
Image: getEnvString("ES_CONTAINER_IMAGE", "elasticsearch:7.17.9"),
Image: getEnvString("ES_CONTAINER_IMAGE", "elasticsearch:7.0.0"),
Env: map[string]string{
"discovery.type": "single-node"},
ExposedPorts: []string{"9200/tcp"},
"discovery.type": "single-node",
"network.host": "0.0.0.0",
"network.bind_host": "0.0.0.0",
},
ExposedPorts: []string{"9200/tcp", "9300/tcp"},
WaitingFor: wait.ForListeningPort("9200").WithStartupTimeout(time.Minute * 3), // Default timeout is 1 minute
RegistryCred: getBasicAuth(),
SkipReaper: skipReaper(),
Expand All @@ -40,15 +43,15 @@ func NewElasticSearch(ctx context.Context) (*ElasticSearch, error) {
}
host, _ := container.Host(ctx)
port, _ := container.MappedPort(ctx, "9200")
endpoint, err := container.Endpoint(ctx, "")
endpoint = fmt.Sprintf("http://%s", endpoint)
endpoint := fmt.Sprintf("http://%s:%s", host, port.Port())

if err != nil {
return nil, err
}

client, err := elasticsearch.NewClient(elasticsearch.Config{
Addresses: []string{endpoint},
Addresses: []string{endpoint},
EnableRetryOnTimeout: true,
})
if err != nil {
return nil, err
Expand Down
6 changes: 4 additions & 2 deletions pkg/grillelasticsearch/stubs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ import (
func (ge *ElasticSearch) CreateIndex(index string, mapping string) grill.Stub {
return grill.StubFunc(func() error {
req := esapi.IndicesCreateRequest{
Index: index,
Body: strings.NewReader(mapping),
Index: index,
MasterTimeout: 3000,
Timeout: 3000,
Body: strings.NewReader(mapping),
}
res, err := req.Do(context.Background(), ge.elasticSearch.Client)
if err != nil {
Expand Down