[datadog_logs_archives] Handle encryption field for S3 destinations for Logs Archives #2740
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,7 +43,9 @@ func resourceDatadogLogsArchive() *schema.Resource { | |
| Required: true, | ||
| ValidateDiagFunc: validators.ValidateAWSAccountID, | ||
| }, | ||
| "role_name": {Description: "Your AWS role name", Type: schema.TypeString, Required: true}, | ||
| "encryption_type": {Description: "The type of encryption on your archive.", Type: schema.TypeString, Optional: true, Default: "NO_OVERRIDE"}, | ||
|
There was a problem hiding this comment. I think these should be in its own There was a problem hiding this comment. If the There was a problem hiding this comment. It should not conflict. There was a problem hiding this comment. I created the optional encryption block. I was originally getting errors when testing a resource that didn't have any encryption information, since it's not required to provide it (the first step in The terraform error output displays |
||
| "encryption_key": {Description: "The AWS KMS encryption key.", Type: schema.TypeString, Optional: true}, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -253,8 +255,15 @@ func buildGCSMap(destination datadogV2.LogsArchiveDestinationGCS) map[string]int | |
| func buildS3Map(destination datadogV2.LogsArchiveDestinationS3) map[string]interface{} { | ||
| result := make(map[string]interface{}) | ||
| integration := destination.GetIntegration() | ||
| encryption := destination.GetEncryption() | ||
| result["account_id"] = integration.GetAccountId() | ||
| result["role_name"] = integration.GetRoleName() | ||
| if encryptionType, ok := encryption.GetTypeOk(); ok { | ||
| result["encryption_type"] = encryptionType | ||
| } | ||
| if encryptionKey, ok := encryption.GetKeyOk(); ok { | ||
| result["encryption_key"] = encryptionKey | ||
| } | ||
| result["bucket"] = destination.GetBucket() | ||
| result["path"] = destination.GetPath() | ||
| return result | ||
|
|
@@ -426,6 +435,17 @@ func buildS3Destination(dest interface{}) (*datadogV2.LogsArchiveDestinationS3, | |
| *integration, | ||
| datadogV2.LOGSARCHIVEDESTINATIONS3TYPE_S3, | ||
| ) | ||
| encryptionType, ok := d["encryption_type"] | ||
| if ok && encryptionType != "" { | ||
| encryption := datadogV2.NewLogsArchiveEncryptionS3( | ||
| datadogV2.LogsArchiveEncryptionS3Type(encryptionType.(string)), | ||
| ) | ||
| encryptionKey, ok := d["encryption_key"] | ||
| if ok && encryptionKey != "" { | ||
| encryption.SetKey(encryptionKey.(string)) | ||
| } | ||
| destination.SetEncryption(*encryption) | ||
| } | ||
| destination.Path = datadog.PtrString(path.(string)) | ||
| return destination, nil | ||
| } | ||
|
|
||
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-23T18:41:36.656668-05: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,90 +1,181 @@ | ||
| --- | ||
| version: 2 | ||
| interactions: | ||
| - id: 0 | ||
| request: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| content_length: 66 | ||
| transfer_encoding: [] | ||
| trailer: {} | ||
| host: api.datadoghq.com | ||
| remote_addr: "" | ||
| request_uri: "" | ||
| body: | | ||
| {"data":{"attributes":{"archive_ids":[]},"type":"archive_order"}} | ||
| form: {} | ||
| headers: | ||
| Accept: | ||
| - application/json | ||
| Content-Type: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v2/logs/config/archive-order | ||
| method: PUT | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"errors":["Missing order for archive BKmiim5bQXC9RDfsaq9bjQ"]} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 422 Unprocessable Entity | ||
| code: 422 | ||
| duration: 147.416375ms | ||
| - 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/v2/logs/config/archive-order | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"data":{"type":"archive_order","attributes":{"archive_ids":["FDhaAaBtQ9yXG41RPzHFzQ","k97y1-gSTWKLXkJwfmNVbQ","s8blIHa5QmmFJZkyYK-MQg","CbNClyqUTbaVHga-YXGkIQ","BKmiim5bQXC9RDfsaq9bjQ","eEXtNWT_TamG48WUDiyGNQ"]}}} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 70.391916ms | ||
| - 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/v2/logs/config/archive-order | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"data":{"type":"archive_order","attributes":{"archive_ids":["FDhaAaBtQ9yXG41RPzHFzQ","k97y1-gSTWKLXkJwfmNVbQ","s8blIHa5QmmFJZkyYK-MQg","CbNClyqUTbaVHga-YXGkIQ","BKmiim5bQXC9RDfsaq9bjQ","eEXtNWT_TamG48WUDiyGNQ"]}}} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 77.23625ms | ||
| - 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: | ||
| - application/json | ||
| url: https://api.datadoghq.com/api/v2/logs/config/archive-order | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"data":{"type":"archive_order","attributes":{"archive_ids":["FDhaAaBtQ9yXG41RPzHFzQ","k97y1-gSTWKLXkJwfmNVbQ","s8blIHa5QmmFJZkyYK-MQg","CbNClyqUTbaVHga-YXGkIQ","BKmiim5bQXC9RDfsaq9bjQ","eEXtNWT_TamG48WUDiyGNQ"]}}} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 66.465667ms | ||
| - 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/v2/logs/config/archive-order | ||
| method: GET | ||
| response: | ||
| proto: HTTP/1.1 | ||
| proto_major: 1 | ||
| proto_minor: 1 | ||
| transfer_encoding: | ||
| - chunked | ||
| trailer: {} | ||
| content_length: -1 | ||
| uncompressed: true | ||
| body: | | ||
| {"data":{"type":"archive_order","attributes":{"archive_ids":["FDhaAaBtQ9yXG41RPzHFzQ","k97y1-gSTWKLXkJwfmNVbQ","s8blIHa5QmmFJZkyYK-MQg","CbNClyqUTbaVHga-YXGkIQ","BKmiim5bQXC9RDfsaq9bjQ","eEXtNWT_TamG48WUDiyGNQ"]}}} | ||
| headers: | ||
| Content-Type: | ||
| - application/json | ||
| status: 200 OK | ||
| code: 200 | ||
| duration: 69.449ms |
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-23T18:43:49.757164-05: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.
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.
Does sending a default value all the time without an encryption key change the behavior in any way?