Skip to content
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.

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

[ci] Extends the list of tested versions #118

Merged
merged 5 commits into from
Jun 22, 2022
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
2 changes: 1 addition & 1 deletion .ci/pipelines/acceptance.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipeline {
axes {
axis {
name 'ES_VERSION'
values '8.0.0', '7.15.1'
values '7.11.2', '7.12.1', '7.13.4', '7.14.2', '7.15.2', '7.16.3', '7.17.4', '8.0.1', '8.1.3', '8.2.2'
}
}
agent { label('linux && immutable && docker') }
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [Unreleased]
### Fixed
- Correctly identify a missing security user ([#101](https://github.com/elastic/terraform-provider-elasticstack/issues/101))
- Support **7.x** Elasticsearch < **7.15** by removing the default `media_type` attribute in the Append processor ([#118](https://github.com/elastic/terraform-provider-elasticstack/pull/118))

## [0.3.3] - 2023-03-22
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/elasticsearch_ingest_processor_append.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ resource "elasticstack_elasticsearch_ingest_pipeline" "my_ingest_pipeline" {
- **description** (String) Description of the processor.
- **if** (String) Conditionally execute the processor
- **ignore_failure** (Boolean) Ignore failures for the processor.
- **media_type** (String) The media type for encoding value. Applies only when value is a template snippet. Must be one of `application/json`, `text/plain`, or `application/x-www-form-urlencoded`.
- **media_type** (String) The media type for encoding value. Applies only when value is a template snippet. Must be one of `application/json`, `text/plain`, or `application/x-www-form-urlencoded`. Supported only from Elasticsearch version **7.15**.
- **on_failure** (List of String) Handle failures for the processor.
- **tag** (String) Identifier for the processor.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ func DataSourceProcessorAppend() *schema.Resource {
Default: true,
},
"media_type": {
Description: "The media type for encoding value. Applies only when value is a template snippet. Must be one of `application/json`, `text/plain`, or `application/x-www-form-urlencoded`.",
Description: "The media type for encoding value. Applies only when value is a template snippet. Must be one of `application/json`, `text/plain`, or `application/x-www-form-urlencoded`. Supported only from Elasticsearch version **7.15**.",
Type: schema.TypeString,
Optional: true,
Default: "application/json",
},
"description": {
Description: "Description of the processor. ",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ const expectedJsonAppend = `{
"append": {
"field": "tags",
"value": ["production", "{{{app}}}", "{{{owner}}}"],
"allow_duplicates": true,
"media_type": "application/json",
"allow_duplicates": true,
"description": "Append tags to the doc",
"ignore_failure": false
}
Expand Down
2 changes: 1 addition & 1 deletion internal/models/ingest.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ProcessorAppend struct {
Field string `json:"field"`
Value []string `json:"value"`
AllowDuplicates bool `json:"allow_duplicates"`
MediaType string `json:"media_type"`
MediaType string `json:"media_type,omitempty"`
}

type ProcessorBytes struct {
Expand Down