Add support for index creation query params #244
Conversation
k-yomo
force-pushed
the
support-index-query-params
branch
from
518b9b2 to
dae0688
Compare
k-yomo
force-pushed
the
support-index-query-params
branch
from
dae0688 to
34f654b
Compare
| @@ -208,15 +210,33 @@ func DeleteIndexTemplate(ctx context.Context, apiClient *clients.ApiClient, temp | |||
| return diags | |||
| } | |||
|
|
|||
| func PutIndex(ctx context.Context, apiClient *clients.ApiClient, index *models.Index) diag.Diagnostics { | |||
| var includeTypeNameUnsupportedVersion = version.Must(version.NewVersion("8.0.0")) | |||
There was a problem hiding this comment.
nit: IMO it would be nice to include if this is an upper or lower bound in the name.
| var includeTypeNameUnsupportedVersion = version.Must(version.NewVersion("8.0.0")) | |
| var includeTypeNameMinUnsupportedVersion = version.Must(version.NewVersion("8.0.0")) |
| if diags := elasticsearch.PutIndex(ctx, client, &index); diags.HasError() { | ||
| params := models.PutIndexParams{ | ||
| WaitForActiveShards: d.Get("wait_for_active_shards").(string), | ||
| IncludeTypeName: d.Get("include_type_name").(bool), |
There was a problem hiding this comment.
I think we should throw an error if include_type_name = true when running against an 8.x server. IMO it avoids potential confusion for users.
Personally, I would probably do all the version checking in here, switch the IncludeTypeName struct property to a pointer and then set it in the create request if it's not nil in the params but I don't feel strongly about it.
There was a problem hiding this comment.
Fixed to return error when the version is unsupported!
Personally, I would probably do all the version checking in here, switch the IncludeTypeName struct property to a pointer and then set it in the create request if it's not nil in the params but I don't feel strongly about it.
Agreed, moved the logic here. We don't have a way to know if the value is zero value (false) or not set , I simply make it evaluate and set when include_type_name = true.
| @@ -519,6 +520,32 @@ If specified, this mapping can include: field names, [field data types](https:// | |||
| Type: schema.TypeString, | |||
| Computed: true, | |||
| }, | |||
| "include_type_name": { | |||
| Type: schema.TypeBool, | |||
| Description: "If true, a mapping type is expected in the body of mappings. Defaults to false.", | |||
There was a problem hiding this comment.
We should detail the version constraint here
| Description: "If true, a mapping type is expected in the body of mappings. Defaults to false.", | |
| Description: "If true, a mapping type is expected in the body of mappings. Defaults to false. Supported for Elasticsearch 7.x", |
Resolve #242
This PR adds support for the following query params that we can set for index creation.
include_type_namewait_for_active_shardsmaster_timeouttimeouthttps://www.elastic.co/guide/en/elasticsearch/reference/7.17/indices-create-index.html#indices-create-api-query-params
📝
master_timeoutandtimeoutare used in the other apis, so it might be better to make it reusable.https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html#ilm-put-lifecycle-query-params