[ORCA-4811] Add support for dynamic_route_to action to pagerduty_event_orchestration_router
#1
+162
−6
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
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 |
|---|---|---|
|
|
@@ -63,9 +63,29 @@ func resourcePagerDutyEventOrchestrationPathRouter() *schema.Resource { | |
| MaxItems: 1, // there can only be one action for router | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "dynamic_route_to": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "lookup_by": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "regex": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "source": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "route_to": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
|
There was a problem hiding this comment. Annotation: We can't have either |
||
| ValidateFunc: func(v interface{}, key string) (warns []string, errs []error) { | ||
| value := v.(string) | ||
| if value == "unrouted" { | ||
|
|
@@ -294,7 +314,12 @@ func expandRouterActions(v interface{}) *pagerduty.EventOrchestrationPathRuleAct | |
| actions := new(pagerduty.EventOrchestrationPathRuleActions) | ||
| for _, ai := range v.([]interface{}) { | ||
| am := ai.(map[string]interface{}) | ||
| dra := am["dynamic_route_to"] | ||
| if !isNilFunc(dra) && len(dra.([]interface{})) > 0 { | ||
| actions.DynamicRouteTo = expandRouterDynamicRouteToAction(dra) | ||
| } else { | ||
| actions.RouteTo = am["route_to"].(string) | ||
| } | ||
|
Comment on lines
+318
to
+322
There was a problem hiding this comment. Annotation: The |
||
| } | ||
|
|
||
| return actions | ||
|
|
@@ -311,6 +336,17 @@ func expandCatchAll(v interface{}) *pagerduty.EventOrchestrationPathCatchAll { | |
| return catchAll | ||
| } | ||
|
|
||
| func expandRouterDynamicRouteToAction(v interface{}) *pagerduty.EventOrchestrationPathDynamicRouteTo { | ||
| dr := new(pagerduty.EventOrchestrationPathDynamicRouteTo) | ||
| for _, i := range v.([]interface{}) { | ||
| dra := i.(map[string]interface{}) | ||
| dr.LookupBy = dra["lookup_by"].(string) | ||
| dr.Regex = dra["regex"].(string) | ||
| dr.Source = dra["source"].(string) | ||
| } | ||
| return dr | ||
| } | ||
|
|
||
| func flattenSets(orchPathSets []*pagerduty.EventOrchestrationPathSet) []interface{} { | ||
| var flattenedSets []interface{} | ||
| for _, set := range orchPathSets { | ||
|
|
@@ -344,7 +380,11 @@ func flattenRouterActions(actions *pagerduty.EventOrchestrationPathRuleActions) | |
| var actionsMap []map[string]interface{} | ||
|
|
||
| am := make(map[string]interface{}) | ||
| if actions.DynamicRouteTo != nil { | ||
| am["dynamic_route_to"] = flattenRouterDynamicRouteToAction(actions.DynamicRouteTo) | ||
| } else { | ||
| am["route_to"] = actions.RouteTo | ||
| } | ||
| actionsMap = append(actionsMap, am) | ||
| return actionsMap | ||
| } | ||
|
|
@@ -360,6 +400,18 @@ func flattenCatchAll(catchAll *pagerduty.EventOrchestrationPathCatchAll) []map[s | |
| return caMap | ||
| } | ||
|
|
||
| func flattenRouterDynamicRouteToAction(dra *pagerduty.EventOrchestrationPathDynamicRouteTo) []map[string]interface{} { | ||
| var dr []map[string]interface{} | ||
|
|
||
| dr = append(dr, map[string]interface{}{ | ||
| "lookup_by": dra.LookupBy, | ||
| "regex": dra.Regex, | ||
| "source": dra.Source, | ||
| }) | ||
|
|
||
| return dr | ||
| } | ||
|
|
||
| func resourcePagerDutyEventOrchestrationPathRouterImport(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { | ||
| client, err := meta.(*Config).Client() | ||
| if err != 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
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
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.
Annotation: This change as well as the changes in
go.sum,vendor/github.com/heimweh/go-pagerduty/pagerduty/event_orchestration_path.go, andvendor/modules.txtis the result of temporarily pointing the provider to a feature branch ofgh.neting.cc/heimweh/go-pagerduty:$ go mod edit -replace "github.com/heimweh/go-pagerduty=github.com/alexzakabluk/go-pagerduty@rule-actions-updates" $ go mod tidy $ go mod vendorWe can merge this change into the base branch and upgrade to the latest
go-pagerdutyversion before merging into https://github.com/PagerDuty/terraform-provider-pagerduty. If we don't merge this change the base branch won't compile since theDynamicRouteToproperty will be missing in the API Client.