Merge pull request #618 from pdecat/support_pipeline_schedule_import

Add support for importing Pipeline Schedules and Triggers

Author: Julien Pivotto

docs/resources/pipeline_schedule.md

@@ -30,3 +30,11 @@ The following arguments are supported:
 * `cron_timezone` - (Optional, string) The timezone.
 
 * `active` - (Optional, bool) The activation of pipeline schedule. If false is set, the pipeline schedule will deactivated initially.
+
+## Import
+
+GitLab pipeline schedules can be imported using an id made up of `{project_id}:{pipeline_schedule_id}`, e.g.
+
+```
+$ terraform import gitlab_pipeline_schedule.test 1:3
+```

docs/resources/pipeline_trigger.md

@@ -18,3 +18,11 @@ The following arguments are supported:
 * `project` - (Required, string) The name or id of the project to add the trigger to.
 
 * `description` - (Required, string) The description of the pipeline trigger.
+
+## Import
+
+GitLab pipeline triggers can be imported using an id made up of `{project_id}:{pipeline_trigger_id}`, e.g.
+
+```
+$ terraform import gitlab_pipeline_trigger.test 1:3
+```

gitlab/resource_gitlab_pipeline_schedule.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	gitlab "github.com/xanzy/go-gitlab"
@@ -16,6 +17,9 @@ func resourceGitlabPipelineSchedule() *schema.Resource {
 		Read:   resourceGitlabPipelineScheduleRead,
 		Update: resourceGitlabPipelineScheduleUpdate,
 		Delete: resourceGitlabPipelineScheduleDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceGitlabPipelineScheduleStateImporter,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"project": {
@@ -183,3 +187,17 @@ func resourceGitlabPipelineScheduleDelete(d *schema.ResourceData, meta interface
 
 	return nil
 }
+
+func resourceGitlabPipelineScheduleStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	s := strings.Split(d.Id(), ":")
+	if len(s) != 2 {
+		d.SetId("")
+		return nil, fmt.Errorf("Invalid Pipeline Schedule import format; expected '{project_id}:{pipeline_schedule_id}'")
+	}
+	project, id := s[0], s[1]
+
+	d.SetId(id)
+	d.Set("project", project)
+
+	return []*schema.ResourceData{d}, nil
+}

gitlab/resource_gitlab_pipeline_schedule_test.go

@@ -66,6 +66,48 @@ func TestAccGitlabPipelineSchedule_basic(t *testing.T) {
 	})
 }
 
+func TestAccGitlabPipelineSchedule_import(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "gitlab_pipeline_schedule.schedule"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGitlabPipelineScheduleDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGitlabPipelineScheduleConfig(rInt),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportStateIdFunc: getPipelineScheduleImportID(resourceName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func getPipelineScheduleImportID(n string) resource.ImportStateIdFunc {
+	return func(s *terraform.State) (string, error) {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return "", fmt.Errorf("Not Found: %s", n)
+		}
+
+		pipelineScheduleID := rs.Primary.ID
+		if pipelineScheduleID == "" {
+			return "", fmt.Errorf("No pipeline schedule ID is set")
+		}
+		projectID := rs.Primary.Attributes["project"]
+		if projectID == "" {
+			return "", fmt.Errorf("No project ID is set")
+		}
+
+		return fmt.Sprintf("%s:%s", projectID, pipelineScheduleID), nil
+	}
+}
+
 func testAccCheckGitlabPipelineScheduleExists(n string, schedule *gitlab.PipelineSchedule) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

gitlab/resource_gitlab_pipeline_trigger.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	gitlab "github.com/xanzy/go-gitlab"
@@ -15,6 +16,9 @@ func resourceGitlabPipelineTrigger() *schema.Resource {
 		Read:   resourceGitlabPipelineTriggerRead,
 		Update: resourceGitlabPipelineTriggerUpdate,
 		Delete: resourceGitlabPipelineTriggerDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceGitlabPipelineTriggerStateImporter,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"project": {
@@ -115,3 +119,17 @@ func resourceGitlabPipelineTriggerDelete(d *schema.ResourceData, meta interface{
 	_, err = client.PipelineTriggers.DeletePipelineTrigger(project, pipelineTriggerID)
 	return err
 }
+
+func resourceGitlabPipelineTriggerStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	s := strings.Split(d.Id(), ":")
+	if len(s) != 2 {
+		d.SetId("")
+		return nil, fmt.Errorf("Invalid Pipeline Trigger import format; expected '{project_id}:{pipeline_trigger_id}'")
+	}
+	project, id := s[0], s[1]
+
+	d.SetId(id)
+	d.Set("project", project)
+
+	return []*schema.ResourceData{d}, nil
+}

gitlab/resource_gitlab_pipeline_trigger_test.go

@@ -54,6 +54,48 @@ func TestAccGitlabPipelineTrigger_basic(t *testing.T) {
 	})
 }
 
+func TestAccGitlabPipelineTrigger_import(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "gitlab_pipeline_trigger.trigger"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGitlabPipelineTriggerDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGitlabPipelineTriggerConfig(rInt),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportStateIdFunc: getPipelineTriggerImportID(resourceName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func getPipelineTriggerImportID(n string) resource.ImportStateIdFunc {
+	return func(s *terraform.State) (string, error) {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return "", fmt.Errorf("Not Found: %s", n)
+		}
+
+		pipelineTriggerID := rs.Primary.ID
+		if pipelineTriggerID == "" {
+			return "", fmt.Errorf("No pipeline trigger ID is set")
+		}
+		projectID := rs.Primary.Attributes["project"]
+		if projectID == "" {
+			return "", fmt.Errorf("No project ID is set")
+		}
+
+		return fmt.Sprintf("%s:%s", projectID, pipelineTriggerID), nil
+	}
+}
+
 func testAccCheckGitlabPipelineTriggerExists(n string, trigger *gitlab.PipelineTrigger) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]