From c024dc48ff2b117122be4a157056c163ec32ef71 Mon Sep 17 00:00:00 2001 From: Phillip Baker Date: Fri, 17 Sep 2021 11:17:34 -0400 Subject: [PATCH] [provider] Revert part of 1bbc361da, reduce connection issues. Based on CI failures, keeping this defaulted to true seems to reduce connection issues, resulting in failures of the provider. --- CHANGELOG.md | 2 +- docs/index.md | 2 +- es/provider.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3842d6e8..d58028e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## Unreleased ### Changed -- [provider] Change default for healthcheck and sniffing to false, see https://github.com/phillbaker/terraform-provider-elasticsearch/pull/161. +- [provider] Change default for sniffing to false, see https://github.com/phillbaker/terraform-provider-elasticsearch/pull/161. - [aws] Reuse session options, ensure synchronization before using credentials, see https://github.com/phillbaker/terraform-provider-elasticsearch/issues/124. ### Added diff --git a/docs/index.md b/docs/index.md index 2bc78070..0863b76f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -58,7 +58,7 @@ The following arguments are supported: * `url` (Required) - Elasticsearch URL. Defaults to `ELASTICSEARCH_URL` from the environment. * `sniff` (Optional) - Set the node sniffing option for the elastic client. Client won't work with sniffing if nodes are not routable. Defaults to `ELASTICSEARCH_SNIFF` from the environment or false. -* `healthcheck` (Optional) - Set the client healthcheck option for the elastic client. Healthchecking is designed for direct access to the cluster. Defaults to `ELASTICSEARCH_HEALTH` from the environment, or false. +* `healthcheck` (Optional) - Set the client healthcheck option for the elastic client. Healthchecking is designed for direct access to the cluster. Defaults to `ELASTICSEARCH_HEALTH` from the environment, or true. * `username` (Optional) - Username to use to connect to elasticsearch using basic auth. Defaults to `ELASTICSEARCH_USERNAME` from the environment * `password` (Optional) - Password to use to connect to elasticsearch using basic auth. Defaults to `ELASTICSEARCH_PASSWORD` from the environment * `aws_assume_role_arn` (Optional) - ARN of role to assume when using AWS Elasticsearch Service domains. diff --git a/es/provider.go b/es/provider.go index 0c83ac92..4ee7cfea 100644 --- a/es/provider.go +++ b/es/provider.go @@ -84,7 +84,7 @@ func Provider() *schema.Provider { "healthcheck": { Type: schema.TypeBool, Optional: true, - DefaultFunc: schema.EnvDefaultFunc("ELASTICSEARCH_HEALTH", false), + DefaultFunc: schema.EnvDefaultFunc("ELASTICSEARCH_HEALTH", true), Description: "Set the client healthcheck option for the elastic client. Healthchecking is designed for direct access to the cluster.", }, "username": {