Merge pull request #945 from juliannagreen1/AA-1837

AA-1837 Add only_invocable_on_unresolved_incidents to Automation Action's schema.

pagerduty/data_source_pagerduty_automation_actions_action.go

@@ -94,6 +94,11 @@ func dataSourcePagerDutyAutomationActionsAction() *schema.Resource {
 				Computed: true,
 				Optional: true,
 			},
+			"only_invocable_on_unresolved_incidents": {
+				Type:     schema.TypeBool,
+				Computed: true,
+				Optional: true,
+			},
 		},
 	}
 }

pagerduty/data_source_pagerduty_automation_actions_action_test.go

@@ -75,6 +75,7 @@ resource "pagerduty_automation_actions_action" "test" {
 		process_automation_job_arguments = "-arg 1"
 		process_automation_node_filter = "tags: production"
 	  }
+	only_invocable_on_unresolved_incidents = true
 }
 
 data "pagerduty_automation_actions_action" "foo" {

pagerduty/resource_pagerduty_automation_actions_action.go

@@ -99,6 +99,11 @@ func resourcePagerDutyAutomationActionsAction() *schema.Resource {
 				Computed: true,
 				Optional: true,
 			},
+			"only_invocable_on_unresolved_incidents": {
+				Type:     schema.TypeBool,
+				Computed: true,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -153,6 +158,14 @@ func buildAutomationActionsActionStruct(d *schema.ResourceData) (*pagerduty.Auto
 		automationActionsAction.ModifyTime = &val
 	}
 
+	if attr, ok := d.GetOk("only_invocable_on_unresolved_incidents"); ok {
+		val := attr.(bool)
+		automationActionsAction.OnlyInvocableOnUnresolvedIncidents = &val
+	}
+
+	attr, _ := d.Get("only_invocable_on_unresolved_incidents").(bool)
+	automationActionsAction.OnlyInvocableOnUnresolvedIncidents = &attr
+
 	return &automationActionsAction, nil
 }
 
@@ -298,6 +311,10 @@ func resourcePagerDutyAutomationActionsActionRead(d *schema.ResourceData, meta i
 			if automationActionsAction.ActionClassification != nil {
 				d.Set("action_classification", &automationActionsAction.ActionClassification)
 			}
+
+			if automationActionsAction.OnlyInvocableOnUnresolvedIncidents != nil {
+				d.Set("only_invocable_on_unresolved_incidents", *automationActionsAction.OnlyInvocableOnUnresolvedIncidents)
+			}
 		}
 		return nil
 	})

pagerduty/resource_pagerduty_automation_actions_action_test.go

@@ -57,6 +57,7 @@ func TestAccPagerDutyAutomationActionsActionTypeProcessAutomation_Basic(t *testi
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "modify_time"),
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "runner_id"),
 					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "runner_type", "runbook"),
+					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "only_invocable_on_unresolved_incidents", "true"),
 				),
 			},
 			{
@@ -84,6 +85,7 @@ func TestAccPagerDutyAutomationActionsActionTypeProcessAutomation_Basic(t *testi
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "modify_time"),
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "runner_id"),
 					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "runner_type", "runbook"),
+					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "only_invocable_on_unresolved_incidents", "false"),
 				),
 			},
 		},
@@ -127,6 +129,7 @@ func TestAccPagerDutyAutomationActionsActionTypeScript_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "modify_time"),
 					resource.TestCheckNoResourceAttr("pagerduty_automation_actions_action.foo", "runner_type"),
 					resource.TestCheckNoResourceAttr("pagerduty_automation_actions_action.foo", "runner_id"),
+					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "only_invocable_on_unresolved_incidents", "false"),
 				),
 			},
 			{
@@ -152,6 +155,7 @@ func TestAccPagerDutyAutomationActionsActionTypeScript_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("pagerduty_automation_actions_action.foo", "modify_time"),
 					resource.TestCheckNoResourceAttr("pagerduty_automation_actions_action.foo", "runner_type"),
 					resource.TestCheckNoResourceAttr("pagerduty_automation_actions_action.foo", "runner_id"),
+					resource.TestCheckResourceAttr("pagerduty_automation_actions_action.foo", "only_invocable_on_unresolved_incidents", "false"),
 				),
 			},
 		},
@@ -215,6 +219,7 @@ resource "pagerduty_automation_actions_action" "foo" {
 		process_automation_job_arguments = "-arg 1"
 		process_automation_node_filter = "tags: production"
 	  }
+	only_invocable_on_unresolved_incidents = "true"
 }
 `, actionName, actionName)
 }
@@ -238,7 +243,8 @@ resource "pagerduty_automation_actions_action" "foo" {
 	runner_id = pagerduty_automation_actions_runner.foo_runner.id
 	action_data_reference {
 		process_automation_job_id = "updated_pa_job_id_123"
-	  }
+	}
+	only_invocable_on_unresolved_incidents = "false"
 }
 `, previousActionName, actionName, actionDescription, actionClassification)
 }

website/docs/d/automation_actions_action.html.markdown

@@ -31,14 +31,15 @@ The following attributes are exported:
 * `id` - The ID of the action.
 * `name` - The name of the action.
 * `type` - The type of object. The value returned will be `action`.
-* `action_type` - The type of the action. The only allowed values are `process_automation` and `script`. 
+* `action_type` - The type of the action. The only allowed values are `process_automation` and `script`.
 * `creation_time` - The time action was created. Represented as an ISO 8601 timestamp.
 * `action_data_reference` - Action Data block. Action Data is documented below.
 * `description` - (Optional) The description of the action.
-* `runner_id` - (Optional) The Process Automation Actions runner to associate the action with. 
+* `runner_id` - (Optional) The Process Automation Actions runner to associate the action with.
 * `runner_type` - (Optional) The type of the runner associated with the action.
-* `action_classification` - (Optional) The category of the action. The only allowed values are `diagnostic` and `remediation`. 
+* `action_classification` - (Optional) The category of the action. The only allowed values are `diagnostic` and `remediation`.
 * `modify_time` - (Optional) The last time action has been modified. Represented as an ISO 8601 timestamp.
+* `only_invocable_on_unresolved_incidents` - (Optional) Whether or not the action can be invoked on unresolved incidents.
 
 Action Data (`action_data_reference`) supports the following:
 

website/docs/r/automation_actions_action.html.markdown

@@ -43,7 +43,7 @@ The following arguments are supported:
   * `action_type` - (Required) The type of the action. The only allowed values are `process_automation` and `script`. Cannot be changed once set.
   * `action_data_reference` - (Required) Action Data block. Action Data is documented below.
   * `runner_id` - (Optional) The Process Automation Actions runner to associate the action with. Cannot be changed for the `process_automation` action type once set.
-  * `action_classification` - (Optional) The category of the action. The only allowed values are `diagnostic` and `remediation`. 
+  * `action_classification` - (Optional) The category of the action. The only allowed values are `diagnostic` and `remediation`.
 
 Action Data (`action_data_reference`) supports the following:
 
@@ -52,6 +52,7 @@ Action Data (`action_data_reference`) supports the following:
   * `process_automation_node_filter` - (Optional) The expression that filters on which nodes a Process Automation Job executes [Learn more](https://docs.rundeck.com/docs/manual/05-nodes.html#node-filtering).
   * `script` - (Required for `script` action_type) Body of the script to be executed on the Runner. Max length is 16777215 characters.
   * `invocation_command` - (Optional) The command to execute the script with.
+  * `only_invocable_on_unresolved_incidents` - (Optional) Whether or not the action can be invoked on unresolved incidents.
 
 ## Attributes Reference