[ORCA-3463] Orchestration Path Router Resource #493

Pari-Dhanakoti · 2022-05-09T15:05:27Z

Adds a router orchestration resource. Test router resource created by the 4 steps described in test file is here

pagerduty/resource_pagerduty_event_orchestration_path_router.go

pagerduty/resource_pagerduty_event_orchestration_path_router_test.go

alenapan

There are some potential blockers that we haven't discussed that we may need to resolve for all the path types. We can pair/mob on them to figure out what we want to do

pagerduty/resource_pagerduty_event_orchestration_path_router.go

alenapan · 2022-05-12T16:39:26Z

pagerduty/resource_pagerduty_event_orchestration_path_router.go

+	}
+
+	return resource.Retry(2*time.Minute, func() *resource.RetryError {
+		path := buildRouterPathParent(d)


Not a BLOCKER BLOCKER but good to fix: TF reads a resource after it's created and the ID is assigned so I don't think we need to build the path here if it's only used in client.EventOrchestrationPaths.Get(path.Parent.ID, "router"), we can just call Get() with d.Id():

client.EventOrchestrationPaths.Get(d.Id(), "router")

pagerduty/resource_pagerduty_event_orchestration_path_router.go

alenapan · 2022-05-12T16:47:38Z

pagerduty/resource_pagerduty_event_orchestration_path_router.go

+	if attr, ok := d.GetOk("sets"); ok {
+		orchPath.Sets = expandSets(attr.([]interface{}))
+	}
+
+	if attr, ok := d.GetOk("catch_all"); ok {
+		orchPath.CatchAll = expandCatchAll(attr.([]interface{}))
+	}


Not a blocker: Do we need to convert attr to a slice here: attr.([]interface{})? Ca we drop the conversion since we're converting it in expandSets and expandCatchAll again?

alenapan · 2022-05-12T16:48:43Z

pagerduty/resource_pagerduty_event_orchestration_path_router.go

+		Type: p["type"].(string),
+		Self: p["self"].(string),


Not a blocker: if Type and Self are computed we don't need to send them to the API

alenapan · 2022-05-12T16:51:22Z

pagerduty/resource_pagerduty_event_orchestration_path_router.go

+}
+
+func expandRouterConditions(v interface{}) []*pagerduty.EventOrchestrationPathRuleCondition {
+	var conditions []*pagerduty.EventOrchestrationPathRuleCondition


Blocker: I think we may have to do the same thing here as we did with the rules - if a user wants to delete conditions we need to explicitly send them as an empty list. And we should probably add a test for it.

conditions are cleared if not supplied I think. In test step 3 conditions are added, step 4 more conditions are added, step 6, they are cleared. Resultant file is here. Does that cover the case?

alenapan · 2022-05-12T16:56:21Z

pagerduty/resource_pagerduty_event_orchestration_path_router_test.go

+		CheckDestroy: testAccCheckPagerDutyEventOrchestrationPathDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckPagerDutyEventOrchestrationPathConfigNoRules(team, escalation_policy, service, orchestration),


Not a blocker: should we have the word "router" present in function names, maybe instead of "path"? Because we are going to have similar tests for unrouted and service paths

alenapan · 2022-05-12T17:10:32Z

pagerduty/resource_pagerduty_event_orchestration_path_router_test.go

+	resource "pagerduty_user" "foo" {
+		name        = "user"
+		email       = "user@pagerduty.com"


Should the user have the name prefixed with tf- in order for the sweeper to delete it?

* 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

* 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>

Pari-Dhanakoti closed this May 9, 2022

Pari-Dhanakoti reopened this May 9, 2022

Pari-Dhanakoti closed this May 9, 2022

Pari-Dhanakoti reopened this May 9, 2022

Pari-Dhanakoti marked this pull request as ready for review May 9, 2022 15:08

Pari-Dhanakoti changed the base branch from master to event-orchestrations May 9, 2022 15:08

Pari-Dhanakoti marked this pull request as draft May 9, 2022 15:09

Pari-Dhanakoti force-pushed the ORCA-3463-orchestration-router-resource branch 4 times, most recently from 490486e to 3ef1d80 Compare May 11, 2022 20:40

Pari-Dhanakoti added 12 commits May 11, 2022 16:43

router path

3f6925b

Add support for parent

72bc203

refactor

8b17456

update handler and actions support

b9db4d5

support conditions

6fc1248

move conditions to util

a9d13c4

move parent to util

7b78046

test for multiple rules and conditions

f87ce03

actions and catchall

8722a66

refactor tests

468a7cb

validateFunc

77b3da8

refactor

eb73b4a

Pari-Dhanakoti force-pushed the ORCA-3463-orchestration-router-resource branch from 3ef1d80 to eb73b4a Compare May 11, 2022 20:44

Pari-Dhanakoti changed the title ~~Orca 3463 orchestration router resource~~ [ORCA-3463] Orchestration Path Router Resource May 11, 2022

Pari-Dhanakoti marked this pull request as ready for review May 11, 2022 20:49

Pari-Dhanakoti force-pushed the ORCA-3463-orchestration-router-resource branch from 95ae983 to fd10926 Compare May 11, 2022 20:51

undo local vendor module path change

547d4e5

Pari-Dhanakoti force-pushed the ORCA-3463-orchestration-router-resource branch from fd10926 to 547d4e5 Compare May 11, 2022 20:52

Pari-Dhanakoti commented May 11, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

Pari-Dhanakoti commented May 11, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

Pari-Dhanakoti commented May 12, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

rules schema change and test

0979f81

Pari-Dhanakoti force-pushed the ORCA-3463-orchestration-router-resource branch from 8f00542 to 0979f81 Compare May 12, 2022 16:11

Pari-Dhanakoti commented May 12, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

Pari-Dhanakoti commented May 12, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

Pari-Dhanakoti commented May 12, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router.go Show resolved Hide resolved

Pari-Dhanakoti commented May 12, 2022

View reviewed changes

pagerduty/resource_pagerduty_event_orchestration_path_router_test.go Show resolved Hide resolved

alenapan reviewed May 12, 2022

View reviewed changes

PR comments addressed

49e9aeb

alenapan approved these changes May 12, 2022

View reviewed changes

alenapan merged commit 2c31cd6 into event-orchestrations May 12, 2022

alenapan deleted the ORCA-3463-orchestration-router-resource branch May 12, 2022 20:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ORCA-3463] Orchestration Path Router Resource #493

[ORCA-3463] Orchestration Path Router Resource #493

Pari-Dhanakoti commented May 9, 2022 •

edited

Loading

alenapan left a comment

alenapan May 12, 2022

alenapan May 12, 2022

alenapan May 12, 2022

alenapan May 12, 2022

Pari-Dhanakoti May 12, 2022 •

edited

Loading

alenapan May 12, 2022

alenapan May 12, 2022

[ORCA-3463] Orchestration Path Router Resource #493

[ORCA-3463] Orchestration Path Router Resource #493

Conversation

Pari-Dhanakoti commented May 9, 2022 • edited Loading

alenapan left a comment

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

Pari-Dhanakoti May 12, 2022 • edited Loading

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

alenapan May 12, 2022

Choose a reason for hiding this comment

Pari-Dhanakoti commented May 9, 2022 •

edited

Loading

Pari-Dhanakoti May 12, 2022 •

edited

Loading