-
Notifications
You must be signed in to change notification settings - Fork 122
Refactor all Kibana connector acceptance tests to use ConfigDirectory pattern #1484
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bc08358
Initial plan
Copilot 79eb415
Refactor AI connector tests into table-driven test
Copilot 973342d
Fix regex pattern for secret field in bedrock update checks
Copilot f5b838e
Restructure test to use ConfigDirectory pattern with testdata files
Copilot 7bb50da
Refactor all connector acceptance tests to use ConfigDirectory pattern
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
17 changes: 17 additions & 0 deletions
17
...l/kibana/connectors/testdata/TestAccResourceKibanaConnectorAI/bedrock/create/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| config = jsonencode({ | ||
| apiUrl = "https://bedrock-runtime.us-east-1.amazonaws.com" | ||
| defaultModel = "anthropic.claude-v2" | ||
| }) | ||
| secrets = jsonencode({ | ||
| accessKey = "test-access-key" | ||
| secret = "test-secret-key" | ||
| }) | ||
| connector_type_id = ".bedrock" | ||
| } |
17 changes: 17 additions & 0 deletions
17
...l/kibana/connectors/testdata/TestAccResourceKibanaConnectorAI/bedrock/update/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = "Updated ${var.connector_name}" | ||
| config = jsonencode({ | ||
| apiUrl = "https://bedrock-runtime.us-west-2.amazonaws.com" | ||
| defaultModel = "anthropic.claude-3-5-sonnet-20240620-v1:0" | ||
| }) | ||
| secrets = jsonencode({ | ||
| accessKey = "updated-access-key" | ||
| secret = "updated-secret-key" | ||
| }) | ||
| connector_type_id = ".bedrock" | ||
| } |
17 changes: 17 additions & 0 deletions
17
...al/kibana/connectors/testdata/TestAccResourceKibanaConnectorAI/gen-ai/create/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| config = jsonencode({ | ||
| apiProvider = "OpenAI" | ||
| apiUrl = "https://api.openai.com/v1" | ||
| defaultModel = "gpt-4" | ||
| }) | ||
| secrets = jsonencode({ | ||
| apiKey = "test-api-key" | ||
| }) | ||
| connector_type_id = ".gen-ai" | ||
| } |
17 changes: 17 additions & 0 deletions
17
...al/kibana/connectors/testdata/TestAccResourceKibanaConnectorAI/gen-ai/update/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = "Updated ${var.connector_name}" | ||
| config = jsonencode({ | ||
| apiProvider = "OpenAI" | ||
| apiUrl = "https://api.openai.com/v1" | ||
| defaultModel = "gpt-4o" | ||
| }) | ||
| secrets = jsonencode({ | ||
| apiKey = "updated-api-key" | ||
| }) | ||
| connector_type_id = ".gen-ai" | ||
| } |
23 changes: 23 additions & 0 deletions
23
...ta/TestAccResourceKibanaConnectorCasesWebhook/with_empty_connector_id/create/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| config = jsonencode({ | ||
| createIncidentJson = "{}" | ||
| createIncidentResponseKey = "key" | ||
| createIncidentUrl = "https://www.elastic.co/" | ||
| getIncidentResponseExternalTitleKey = "title" | ||
| getIncidentUrl = "https://www.elastic.co/" | ||
| updateIncidentJson = "{}" | ||
| updateIncidentUrl = "https://www.elastic.co/" | ||
| viewIncidentUrl = "https://www.elastic.co/" | ||
| }) | ||
| secrets = jsonencode({ | ||
| user = "user1" | ||
| password = "password1" | ||
| }) | ||
| connector_type_id = ".cases-webhook" | ||
| } |
24 changes: 24 additions & 0 deletions
24
...ta/TestAccResourceKibanaConnectorCasesWebhook/with_empty_connector_id/update/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = "Updated ${var.connector_name}" | ||
| config = jsonencode({ | ||
| createIncidentJson = "{}" | ||
| createIncidentResponseKey = "key" | ||
| createIncidentUrl = "https://www.elastic.co/" | ||
| getIncidentResponseExternalTitleKey = "title" | ||
| getIncidentUrl = "https://www.elastic.co/" | ||
| updateIncidentJson = "{}" | ||
| updateIncidentUrl = "https://elasticsearch.com/" | ||
| viewIncidentUrl = "https://www.elastic.co/" | ||
| createIncidentMethod = "put" | ||
| }) | ||
| secrets = jsonencode({ | ||
| user = "user2" | ||
| password = "password2" | ||
| }) | ||
| connector_type_id = ".cases-webhook" | ||
| } |
29 changes: 29 additions & 0 deletions
29
...stAccResourceKibanaConnectorCasesWebhook/with_predefined_connector_id/create/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| variable "connector_id" { | ||
| description = "Connector ID" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| connector_id = var.connector_id | ||
| config = jsonencode({ | ||
| createIncidentJson = "{}" | ||
| createIncidentResponseKey = "key" | ||
| createIncidentUrl = "https://www.elastic.co/" | ||
| getIncidentResponseExternalTitleKey = "title" | ||
| getIncidentUrl = "https://www.elastic.co/" | ||
| updateIncidentJson = "{}" | ||
| updateIncidentUrl = "https://www.elastic.co/" | ||
| viewIncidentUrl = "https://www.elastic.co/" | ||
| }) | ||
| secrets = jsonencode({ | ||
| user = "user1" | ||
| password = "password1" | ||
| }) | ||
| connector_type_id = ".cases-webhook" | ||
| } |
30 changes: 30 additions & 0 deletions
30
...stAccResourceKibanaConnectorCasesWebhook/with_predefined_connector_id/update/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| variable "connector_id" { | ||
| description = "Connector ID" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = "Updated ${var.connector_name}" | ||
| connector_id = var.connector_id | ||
| config = jsonencode({ | ||
| createIncidentJson = "{}" | ||
| createIncidentResponseKey = "key" | ||
| createIncidentUrl = "https://www.elastic.co/" | ||
| getIncidentResponseExternalTitleKey = "title" | ||
| getIncidentUrl = "https://www.elastic.co/" | ||
| updateIncidentJson = "{}" | ||
| updateIncidentUrl = "https://elasticsearch.com/" | ||
| viewIncidentUrl = "https://www.elastic.co/" | ||
| createIncidentMethod = "put" | ||
| }) | ||
| secrets = jsonencode({ | ||
| user = "user2" | ||
| password = "password2" | ||
| }) | ||
| connector_type_id = ".cases-webhook" | ||
| } |
17 changes: 17 additions & 0 deletions
17
.../kibana/connectors/testdata/TestAccResourceKibanaConnectorEmptyConfigFromSDK/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| provider "elasticstack" { | ||
| elasticsearch {} | ||
| kibana {} | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| connector_type_id = ".slack" | ||
| secrets = jsonencode({ | ||
| webhookUrl = "https://example.com/webhook" | ||
| }) | ||
| } |
18 changes: 18 additions & 0 deletions
18
internal/kibana/connectors/testdata/TestAccResourceKibanaConnectorFromSDK/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| provider "elasticstack" { | ||
| elasticsearch {} | ||
| kibana {} | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| config = jsonencode({ | ||
| index = ".kibana" | ||
| refresh = true | ||
| }) | ||
| connector_type_id = ".index" | ||
| } |
13 changes: 13 additions & 0 deletions
13
internal/kibana/connectors/testdata/TestAccResourceKibanaConnectorIndex/create/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = var.connector_name | ||
| config = jsonencode({ | ||
| index = ".kibana" | ||
| refresh = true | ||
| }) | ||
| connector_type_id = ".index" | ||
| } | ||
13 changes: 13 additions & 0 deletions
13
internal/kibana/connectors/testdata/TestAccResourceKibanaConnectorIndex/update/connector.tf
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| variable "connector_name" { | ||
| description = "The connector name" | ||
| type = string | ||
| } | ||
|
|
||
| resource "elasticstack_kibana_action_connector" "test" { | ||
| name = "Updated ${var.connector_name}" | ||
| config = jsonencode({ | ||
| index = ".kibana" | ||
| refresh = false | ||
| }) | ||
| connector_type_id = ".index" | ||
| } |
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.
All test configuration files define the same
connector_namevariable with identical description and type. Consider creating a shared variables file to eliminate this duplication across 13 test configuration files.