[datadog_logs_custom_pipeline] Add tags and description to logs pipelines #2773
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -417,6 +417,12 @@ func updateLogsCustomPipelineState(d *schema.ResourceData, pipeline *datadogV1.L | |||||
| if err := d.Set("is_enabled", pipeline.GetIsEnabled()); err != nil { | ||||||
| return diag.FromErr(err) | ||||||
| } | ||||||
| if err := d.Set("tags", pipeline.GetTags()); err != nil { | ||||||
| return diag.FromErr(err) | ||||||
| } | ||||||
| if err := d.Set("description", pipeline.GetDescription()); err != nil { | ||||||
| return diag.FromErr(err) | ||||||
| } | ||||||
| if err := d.Set("filter", buildTerraformFilter(pipeline.Filter)); err != nil { | ||||||
| return diag.FromErr(err) | ||||||
| } | ||||||
|
|
@@ -757,6 +763,13 @@ func buildDatadogPipeline(d *schema.ResourceData) (*datadogV1.LogsPipeline, erro | |||||
| var ddPipeline datadogV1.LogsPipeline | ||||||
| ddPipeline.SetName(d.Get("name").(string)) | ||||||
| ddPipeline.SetIsEnabled(d.Get("is_enabled").(bool)) | ||||||
| tagsInterface := d.Get("tags").([]interface{}) | ||||||
| tags := make([]string, len(tagsInterface)) | ||||||
| for i, v := range tagsInterface { | ||||||
| tags[i] = v.(string) | ||||||
| } | ||||||
| ddPipeline.SetTags(tags) | ||||||
| ddPipeline.SetDescription(d.Get("description").(string)) | ||||||
| if tfFilter := d.Get("filter").([]interface{}); len(tfFilter) > 0 { | ||||||
| filter, ok := tfFilter[0].(map[string]interface{}) | ||||||
| if !ok { | ||||||
|
|
@@ -1205,8 +1218,10 @@ func buildDatadogFilter(tfFilter map[string]interface{}) *datadogV1.LogsFilter { | |||||
|
|
||||||
| func getPipelineSchema(isNested bool) map[string]*schema.Schema { | ||||||
| return map[string]*schema.Schema{ | ||||||
| "name": {Type: schema.TypeString, Required: true}, | ||||||
| "is_enabled": {Type: schema.TypeBool, Optional: true}, | ||||||
| "tags": {Type: schema.TypeList, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}}, | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. @skarimo if we use a set isn't it a risk of changing the order of the tags? |
||||||
| "description": {Type: schema.TypeString, Optional: true}, | ||||||
| "filter": { | ||||||
| Type: schema.TypeList, | ||||||
| Required: true, | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2025-01-28T17:06:49.90292+01:00 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,95 +1,180 @@ | ||
| --- | ||
| version: 2 | ||
| interactions: | ||
| - id: 0 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 476 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: | | ||
| {"description":"","filter":{"query":""},"is_enabled":true,"name":"tf-TestAccDatadogLogsPipelineEmptyFilterQuery-local-1738080409","processors":[{"is_enabled":true,"name":"","sources":["redis.severity"],"type":"status-remapper"},{"categories":[{"filter":{"query":""},"name":"debug"}],"is_enabled":true,"name":"sample category processor","target":"foo.severity","type":"category-processor"},{"filter":{"query":""},"is_enabled":true,"name":"Nginx","type":"pipeline"}],"tags":[]} | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - application/json | ||
| Content-Type: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v1/logs/config/pipelines | ||
| method: POST | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"id":"MsnpTFYQQHGlqMjKsWlPBQ","type":"pipeline","name":"tf-TestAccDatadogLogsPipelineEmptyFilterQuery-local-1738080409","is_enabled":true,"is_read_only":false,"filter":{"query":""},"processors":[{"name":"","is_enabled":true,"sources":["redis.severity"],"type":"status-remapper"},{"name":"sample category processor","is_enabled":true,"categories":[{"filter":{"query":""},"name":"debug"}],"target":"foo.severity","type":"category-processor"},{"type":"pipeline","name":"Nginx","is_enabled":true,"filter":{"query":""},"processors":[]}],"tags":[],"description":""} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 412.800792ms | ||
| - id: 1 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 0 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: "" | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v1/logs/config/pipelines/MsnpTFYQQHGlqMjKsWlPBQ | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"id":"MsnpTFYQQHGlqMjKsWlPBQ","type":"pipeline","name":"tf-TestAccDatadogLogsPipelineEmptyFilterQuery-local-1738080409","is_enabled":true,"is_read_only":false,"filter":{"query":""},"processors":[{"name":"","is_enabled":true,"sources":["redis.severity"],"type":"status-remapper"},{"name":"sample category processor","is_enabled":true,"categories":[{"filter":{"query":""},"name":"debug"}],"target":"foo.severity","type":"category-processor"},{"type":"pipeline","name":"Nginx","is_enabled":true,"filter":{"query":""},"processors":[]}],"tags":[],"description":""} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 150.6ms | ||
| - id: 2 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 0 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: "" | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v1/logs/config/pipelines/MsnpTFYQQHGlqMjKsWlPBQ | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"id":"MsnpTFYQQHGlqMjKsWlPBQ","type":"pipeline","name":"tf-TestAccDatadogLogsPipelineEmptyFilterQuery-local-1738080409","is_enabled":true,"is_read_only":false,"filter":{"query":""},"processors":[{"name":"","is_enabled":true,"sources":["redis.severity"],"type":"status-remapper"},{"name":"sample category processor","is_enabled":true,"categories":[{"filter":{"query":""},"name":"debug"}],"target":"foo.severity","type":"category-processor"},{"type":"pipeline","name":"Nginx","is_enabled":true,"filter":{"query":""},"processors":[]}],"tags":[],"description":""} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 146.403208ms | ||
| - id: 3 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 0 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: "" | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - '*/*' | ||
| url: https://api.datadoghq.com/api/v1/logs/config/pipelines/MsnpTFYQQHGlqMjKsWlPBQ | ||
| method: DELETE | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| content_length: 3 | ||
| uncompressed: false | ||
| body: | | ||
| {} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 161.173ms | ||
| - id: 4 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 0 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: "" | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v1/logs/config/pipelines/MsnpTFYQQHGlqMjKsWlPBQ | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"error":{"code":"InvalidArgument","message":"Non existing pipeline"}} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 400 Bad Request | ||
| code: 400 | ||
| duration: 136.473958ms |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2025-01-27T19:12:45.636115+01:00 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.