Merge pull request #148 from rich-boyce/rich.boyce-add-default-tab-jo…

…b-arg

Add default_tab job argument

rundeck/job.go

@@ -61,6 +61,7 @@ type JobDetail struct {
 	OptionsConfig             *JobOptions         `xml:"context>options,omitempty"`
 	Description               string              `xml:"description"`
 	ExecutionEnabled          bool                `xml:"executionEnabled"`
+	DefaultTab                string              `xml:"defaultTab"`
 	LogLevel                  string              `xml:"loglevel,omitempty"`
 	LoggingLimit              *JobLoggingLimit    `xml:"logging,omitempty"`
 	AllowConcurrentExecutions bool                `xml:"multipleExecutions,omitempty"`

rundeck/resource_job.go

@@ -49,6 +49,12 @@ func resourceRundeckJob() *schema.Resource {
 				Default:  true,
 			},
 
+			"default_tab": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "nodes",
+			},
+
 			"log_level": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -724,6 +730,7 @@ func jobFromResourceData(d *schema.ResourceData) (*JobDetail, error) {
 		ProjectName:               d.Get("project_name").(string),
 		Description:               d.Get("description").(string),
 		ExecutionEnabled:          d.Get("execution_enabled").(bool),
+		DefaultTab:                d.Get("default_tab").(string),
 		Timeout:                   d.Get("timeout").(string),
 		ScheduleEnabled:           d.Get("schedule_enabled").(bool),
 		NodesSelectedByDefault:    d.Get("nodes_selected_by_default").(bool),
@@ -741,6 +748,9 @@ func jobFromResourceData(d *schema.ResourceData) (*JobDetail, error) {
 			RankOrder:               d.Get("rank_order").(string),
 		},
 	}
+	if !(job.DefaultTab == "nodes" || job.DefaultTab == "output" || job.DefaultTab == "html") {
+		return nil, fmt.Errorf("Argument \"default_tab\" must be set to one of `nodes`, `output`, `html`.")
+	}
 
 	successOnEmpty := d.Get("success_on_empty_node_filter")
 	if successOnEmpty != nil {
@@ -1027,6 +1037,9 @@ func jobToResourceData(job *JobDetail, d *schema.ResourceData) error {
 	if err := d.Set("execution_enabled", job.ExecutionEnabled); err != nil {
 		return err
 	}
+	if err := d.Set("default_tab", job.DefaultTab); err != nil {
+		return err
+	}
 	if err := d.Set("schedule_enabled", job.ScheduleEnabled); err != nil {
 		return err
 	}

website/docs/r/job.html.md

@@ -103,6 +103,8 @@ The following arguments are supported:
 
 * `execution_enabled` - (Optional) If you want job execution to be enabled or disabled. Defaults to `true`.
 
+* `default_tab` - (Optional) The default tab to show during job execution. Set to 'output' to follow the execution log. Must be set to `output`, `html`, or `nodes`
+
 * `group_name` - (Optional) The name of a group within the project in which to place the job.
   Setting this creates collapsable subcategories within the Rundeck UI's project job index.