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

[ORCA-3486] Extend unrouted tests, add CustomizeDiff, clean shared functions #510

Merged
merged 2 commits into from
May 24, 2022

Conversation

alexzakabluk
Copy link
Contributor

Extended unrouted tests with regex extractions, added CustomizeDiff and moved shared functions for service and unrouted paths to the util file.

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v -run TestAccPagerDutyEventOrchestrationPath -timeout 120m
?   	github.com/terraform-providers/terraform-provider-pagerduty	[no test files]
=== RUN   TestAccPagerDutyEventOrchestrationPathRouter_import
--- PASS: TestAccPagerDutyEventOrchestrationPathRouter_import (11.27s)
=== RUN   TestAccPagerDutyEventOrchestrationPathService_import
--- PASS: TestAccPagerDutyEventOrchestrationPathService_import (10.51s)
=== RUN   TestAccPagerDutyEventOrchestrationPathUnrouted_import
--- PASS: TestAccPagerDutyEventOrchestrationPathUnrouted_import (10.08s)
=== RUN   TestAccPagerDutyEventOrchestrationPathRouter_Basic
--- PASS: TestAccPagerDutyEventOrchestrationPathRouter_Basic (32.96s)
=== RUN   TestAccPagerDutyEventOrchestrationPathService_Basic
--- PASS: TestAccPagerDutyEventOrchestrationPathService_Basic (38.30s)
=== RUN   TestAccPagerDutyEventOrchestrationPathUnrouted_Basic
--- PASS: TestAccPagerDutyEventOrchestrationPathUnrouted_Basic (29.20s)
PASS
ok  	github.com/terraform-providers/terraform-provider-pagerduty/pagerduty	132.825s

"pagerduty_event_orchestration_unrouted.unrouted", "sets.0.rules.0.actions.0.variables.1.type", "regex"),
resource.TestCheckResourceAttr(
"pagerduty_event_orchestration_unrouted.unrouted", "sets.0.rules.0.actions.0.variables.1.value", "High memory usage on (.*) server"),
resource.TestCheckTypeSetElemNestedAttrs(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored this section and switched to TestCheckTypeSetElemNestedAttrs instead of TestCheckResourceAttr which improves the code readability a bit for the key value objects.

),
},
// Providing invalid extractions attributes for set rules
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added tests for corrupted extractions (pattern we used in the service path)

@alexzakabluk alexzakabluk changed the title Extend unrouted tests, add CustomizeDiff, clean shared functions [ORCA-3486] Extend unrouted tests, add CustomizeDiff, clean shared functions May 23, 2022
@alenapan alenapan merged commit 1dcb886 into event-orchestrations May 24, 2022
@alenapan alenapan deleted the unrouted-tests-cleanup branch May 24, 2022 13:28
alenapan pushed a commit that referenced this pull request May 27, 2022
…nctions (#510)

* Extend unrouted tests, add CustomizeDiff, clean shared functions

* Move shared functions for unrouted and service paths to utils file
alenapan added a commit that referenced this pull request Jun 1, 2022
* ORCA-3459 - event orchestration resource

* reformat

* [REVERT LATER] Temporarily pointing to the local copy of go-pagerduty

* rename Orchestration references to EventOrchestration

* add more properties, mapping logic; add tests

* more tests to event_orchestration_resource

* add datasource event orchestration

* [REVERT LATER]-local testing

* fix create logic (set integrations), remove description and routes from orchestration data source

* fix data source, add data source tests

* reformat

* Add import tests

* update to latest alenapan/go-pagerduty

* add team checks to the tests

* [ORCA-3475] Allow deleting event orchestration team from an orchestration (#494)

* support unsetting orch team

* add retry logic to the event orchestration update method

* [ORCA-3463] Orchestration Path Router Resource (#493)

* router path

* Add support for parent

* refactor

* update handler and actions support

* support conditions

* move conditions to util

* move parent to util

* test for multiple rules and conditions

* actions and catchall

* refactor tests

* validateFunc

* refactor

* undo local vendor module path change

* rules schema change and test

* PR comments addressed

* Event orchestration unrouted resource (#495)

* Init commit for unrouted

* Added tests for unrouted

* Added catch_all to unrouted schema

* Tweaked catch_all

* Merge event-orchestrations

* Add testacc for unrouted

* Added full config test for unrouted

* Add test for number of extractions and variables

* Cleaned router and added new test checks to unrouted

* Change escalation_policy from snake case to camel case

* make type computed and set it on read/update

* Orca 3486 refactor (#500)

* Clean sweeper function for router/unrouted

* Clean sweeper function

* [ORCA-3465] - Event Orchestration Service path resource (#499)

* ORCA-3465 - Event Orchestration Service Path resource

* add resource file

* fix read/update, add test

* more tests

* more service path tests, add conditions

* more tests

* more tests

* add more service path props

* fix orch path PUT payload, add tests

* fix Suspend

* ToDos

* add catch_all support, fix tests

* add support for regex extractions, add mor tests, add service path import test

* update client

* PR feedback

* Flatten teams block (#506)

* Flatten teams block

* Fixed naming for the test orchestration

* ORCA-3486 - remove team attribute from service path

* flatten/rename parent to 'service' for service path

* remove type attribute from unrouted

* remove type attribute from router

* flatten/rename parent to 'event_orchestration' for router

* set event_orchestration attr on router import

* flatten/rename parent to 'event_orchestration' for unrouted

* Clean teams block

* revert changes on web file

* [ORCA-3486] - Reuse shared Event Orchestration Path logic, add import tests (#509)

* ORCA-3486 - add import tests for router/unrouted

* ORCA-3486 - add import tests for router, unrouted

* reuse severity/event_action validation functions in unrouted/service

* reuse variables and extractions schema in router/unrouted

* reuse shared conditions schema and mapping functions in router/unrouted/service

* [ORCA-3486] Extend unrouted tests, add CustomizeDiff, clean shared functions (#510)

* Extend unrouted tests, add CustomizeDiff, clean shared functions

* Move shared functions for unrouted and service paths to utils file

* orchestration and path resource documentation

* datasource documentation

* refactor

* update comment

* update type field documentation

* update documentation

* cleanup

* Remove mention of the suppress action from event_orchestration_unrouted docs

* Add "Optional" info to 1 attribute in event_orchestration_service docs

* give a better datasource example

* cleanup

* Add Event Orchestration info to the CHANGELOG (release date TBD) (#514)

* update go-pagerduty package

* Router - make sets, rules, conditions singular

* Unrouted, Service - make sets, rules, conditions, variables, extractions, pd_automation_actions, automations_action (headers, params) singular

* Event Orchestration - make integrations singular

* update Event Orchestration documentation

* EO data source - retry on any error

* EO data source - retry on any error

Co-authored-by: Pari Dhanakoti <pdhanakoti@pagerduty.com>
Co-authored-by: Alex Zakabluk <azakabluk@pagerduty.com>
Co-authored-by: Marcos Wright-Kuhns <webmaster@wrightkuhns.com>
Co-authored-by: Scott McAllister <smcallister@pagerduty.com>
stmcallister pushed a commit that referenced this pull request Jun 9, 2022
* ORCA-3459 - event orchestration resource

* reformat

* [REVERT LATER] Temporarily pointing to the local copy of go-pagerduty

* rename Orchestration references to EventOrchestration

* add more properties, mapping logic; add tests

* more tests to event_orchestration_resource

* add datasource event orchestration

* [REVERT LATER]-local testing

* fix create logic (set integrations), remove description and routes from orchestration data source

* fix data source, add data source tests

* reformat

* Add import tests

* update to latest alenapan/go-pagerduty

* add team checks to the tests

* [ORCA-3475] Allow deleting event orchestration team from an orchestration (#494)

* support unsetting orch team

* add retry logic to the event orchestration update method

* [ORCA-3463] Orchestration Path Router Resource (#493)

* router path

* Add support for parent

* refactor

* update handler and actions support

* support conditions

* move conditions to util

* move parent to util

* test for multiple rules and conditions

* actions and catchall

* refactor tests

* validateFunc

* refactor

* undo local vendor module path change

* rules schema change and test

* PR comments addressed

* Event orchestration unrouted resource (#495)

* Init commit for unrouted

* Added tests for unrouted

* Added catch_all to unrouted schema

* Tweaked catch_all

* Merge event-orchestrations

* Add testacc for unrouted

* Added full config test for unrouted

* Add test for number of extractions and variables

* Cleaned router and added new test checks to unrouted

* Change escalation_policy from snake case to camel case

* make type computed and set it on read/update

* Orca 3486 refactor (#500)

* Clean sweeper function for router/unrouted

* Clean sweeper function

* [ORCA-3465] - Event Orchestration Service path resource (#499)

* ORCA-3465 - Event Orchestration Service Path resource

* add resource file

* fix read/update, add test

* more tests

* more service path tests, add conditions

* more tests

* more tests

* add more service path props

* fix orch path PUT payload, add tests

* fix Suspend

* ToDos

* add catch_all support, fix tests

* add support for regex extractions, add mor tests, add service path import test

* update client

* PR feedback

* Flatten teams block (#506)

* Flatten teams block

* Fixed naming for the test orchestration

* ORCA-3486 - remove team attribute from service path

* flatten/rename parent to 'service' for service path

* remove type attribute from unrouted

* remove type attribute from router

* flatten/rename parent to 'event_orchestration' for router

* set event_orchestration attr on router import

* flatten/rename parent to 'event_orchestration' for unrouted

* Clean teams block

* revert changes on web file

* [ORCA-3486] - Reuse shared Event Orchestration Path logic, add import tests (#509)

* ORCA-3486 - add import tests for router/unrouted

* ORCA-3486 - add import tests for router, unrouted

* reuse severity/event_action validation functions in unrouted/service

* reuse variables and extractions schema in router/unrouted

* reuse shared conditions schema and mapping functions in router/unrouted/service

* [ORCA-3486] Extend unrouted tests, add CustomizeDiff, clean shared functions (#510)

* Extend unrouted tests, add CustomizeDiff, clean shared functions

* Move shared functions for unrouted and service paths to utils file

* orchestration and path resource documentation

* datasource documentation

* refactor

* update comment

* update type field documentation

* update documentation

* cleanup

* Remove mention of the suppress action from event_orchestration_unrouted docs

* Add "Optional" info to 1 attribute in event_orchestration_service docs

* give a better datasource example

* cleanup

* Add Event Orchestration info to the CHANGELOG (release date TBD) (#514)

* update go-pagerduty package

* Router - make sets, rules, conditions singular

* Unrouted, Service - make sets, rules, conditions, variables, extractions, pd_automation_actions, automations_action (headers, params) singular

* Event Orchestration - make integrations singular

* update Event Orchestration documentation

* EO data source - retry on any error

* EO data source - retry on any error

Co-authored-by: Pari Dhanakoti <pdhanakoti@pagerduty.com>
Co-authored-by: Alex Zakabluk <azakabluk@pagerduty.com>
Co-authored-by: Marcos Wright-Kuhns <webmaster@wrightkuhns.com>
Co-authored-by: Scott McAllister <smcallister@pagerduty.com>
stmcallister pushed a commit that referenced this pull request Jun 9, 2022
* ORCA-3459 - event orchestration resource

* reformat

* [REVERT LATER] Temporarily pointing to the local copy of go-pagerduty

* rename Orchestration references to EventOrchestration

* add more properties, mapping logic; add tests

* more tests to event_orchestration_resource

* add datasource event orchestration

* [REVERT LATER]-local testing

* fix create logic (set integrations), remove description and routes from orchestration data source

* fix data source, add data source tests

* reformat

* Add import tests

* update to latest alenapan/go-pagerduty

* add team checks to the tests

* [ORCA-3475] Allow deleting event orchestration team from an orchestration (#494)

* support unsetting orch team

* add retry logic to the event orchestration update method

* [ORCA-3463] Orchestration Path Router Resource (#493)

* router path

* Add support for parent

* refactor

* update handler and actions support

* support conditions

* move conditions to util

* move parent to util

* test for multiple rules and conditions

* actions and catchall

* refactor tests

* validateFunc

* refactor

* undo local vendor module path change

* rules schema change and test

* PR comments addressed

* Event orchestration unrouted resource (#495)

* Init commit for unrouted

* Added tests for unrouted

* Added catch_all to unrouted schema

* Tweaked catch_all

* Merge event-orchestrations

* Add testacc for unrouted

* Added full config test for unrouted

* Add test for number of extractions and variables

* Cleaned router and added new test checks to unrouted

* Change escalation_policy from snake case to camel case

* make type computed and set it on read/update

* Orca 3486 refactor (#500)

* Clean sweeper function for router/unrouted

* Clean sweeper function

* [ORCA-3465] - Event Orchestration Service path resource (#499)

* ORCA-3465 - Event Orchestration Service Path resource

* add resource file

* fix read/update, add test

* more tests

* more service path tests, add conditions

* more tests

* more tests

* add more service path props

* fix orch path PUT payload, add tests

* fix Suspend

* ToDos

* add catch_all support, fix tests

* add support for regex extractions, add mor tests, add service path import test

* update client

* PR feedback

* Flatten teams block (#506)

* Flatten teams block

* Fixed naming for the test orchestration

* ORCA-3486 - remove team attribute from service path

* flatten/rename parent to 'service' for service path

* remove type attribute from unrouted

* remove type attribute from router

* flatten/rename parent to 'event_orchestration' for router

* set event_orchestration attr on router import

* flatten/rename parent to 'event_orchestration' for unrouted

* Clean teams block

* revert changes on web file

* [ORCA-3486] - Reuse shared Event Orchestration Path logic, add import tests (#509)

* ORCA-3486 - add import tests for router/unrouted

* ORCA-3486 - add import tests for router, unrouted

* reuse severity/event_action validation functions in unrouted/service

* reuse variables and extractions schema in router/unrouted

* reuse shared conditions schema and mapping functions in router/unrouted/service

* [ORCA-3486] Extend unrouted tests, add CustomizeDiff, clean shared functions (#510)

* Extend unrouted tests, add CustomizeDiff, clean shared functions

* Move shared functions for unrouted and service paths to utils file

* orchestration and path resource documentation

* datasource documentation

* refactor

* update comment

* update type field documentation

* update documentation

* cleanup

* Remove mention of the suppress action from event_orchestration_unrouted docs

* Add "Optional" info to 1 attribute in event_orchestration_service docs

* give a better datasource example

* cleanup

* Add Event Orchestration info to the CHANGELOG (release date TBD) (#514)

* update go-pagerduty package

* Router - make sets, rules, conditions singular

* Unrouted, Service - make sets, rules, conditions, variables, extractions, pd_automation_actions, automations_action (headers, params) singular

* Event Orchestration - make integrations singular

* update Event Orchestration documentation

* EO data source - retry on any error

* EO data source - retry on any error

Co-authored-by: Pari Dhanakoti <pdhanakoti@pagerduty.com>
Co-authored-by: Alex Zakabluk <azakabluk@pagerduty.com>
Co-authored-by: Marcos Wright-Kuhns <webmaster@wrightkuhns.com>
Co-authored-by: Scott McAllister <smcallister@pagerduty.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants