resource/gitlab_project_hook: Add importer

Refs: #36

Author: timofurrer

docs/resources/project_hook.md

@@ -47,7 +47,16 @@ resource "gitlab_project_hook" "example" {
 - **push_events_branch_filter** (String) Invoke the hook for push events on matching branches only.
 - **releases_events** (Boolean) Invoke the hook for releases events.
 - **tag_push_events** (Boolean) Invoke the hook for tag push events.
-- **token** (String, Sensitive) A token to present when invoking the hook.
+- **token** (String, Sensitive) A token to present when invoking the hook. The token is not available for imported resources.
 - **wiki_page_events** (Boolean) Invoke the hook for wiki page events.
 
+## Import
 
+Import is supported using the following syntax:
+
+```shell
+# A GitLab Project Hook can be imported using a key composed of `<project-id>:<hook-id>`, e.g.
+terraform import gitlab_project_hook.example "12345:1"
+
+# NOTE: the `token` resource attribute is not available for imported resources as this information cannot be read from the GitLab API.
+```

examples/resources/gitlab_project_hook/import.sh

@@ -0,0 +1,4 @@
+# A GitLab Project Hook can be imported using a key composed of `<project-id>:<hook-id>`, e.g.
+terraform import gitlab_project_hook.example "12345:1"
+
+# NOTE: the `token` resource attribute is not available for imported resources as this information cannot be read from the GitLab API.

internal/provider/resource_gitlab_project_hook.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	gitlab "github.com/xanzy/go-gitlab"
 )
 
 var _ = registerResource("gitlab_project_hook", func() *schema.Resource {
-	// lintignore: XR002 // TODO: Resolve this tfproviderlint issue
 	return &schema.Resource{
 		Description: `The ` + "`" + `gitlab_project_hook` + "`" + ` resource allows to manage the lifecycle of a project hook.
 
@@ -22,6 +22,9 @@ var _ = registerResource("gitlab_project_hook", func() *schema.Resource {
 		ReadContext:   resourceGitlabProjectHookRead,
 		UpdateContext: resourceGitlabProjectHookUpdate,
 		DeleteContext: resourceGitlabProjectHookDelete,
+		Importer: &schema.ResourceImporter{
+			StateContext: resourceGitlabProjectHookStateImporter,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"project": {
@@ -35,7 +38,7 @@ var _ = registerResource("gitlab_project_hook", func() *schema.Resource {
 				Required:    true,
 			},
 			"token": {
-				Description: "A token to present when invoking the hook.",
+				Description: "A token to present when invoking the hook. The token is not available for imported resources.",
 				Type:        schema.TypeString,
 				Optional:    true,
 				Sensitive:   true,
@@ -160,6 +163,7 @@ func resourceGitlabProjectHookCreate(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.SetId(fmt.Sprintf("%d", hook.ID))
+	d.Set("token", options.Token)
 
 	return resourceGitlabProjectHookRead(ctx, d, meta)
 }
@@ -256,3 +260,17 @@ func resourceGitlabProjectHookDelete(ctx context.Context, d *schema.ResourceData
 
 	return nil
 }
+
+func resourceGitlabProjectHookStateImporter(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	s := strings.Split(d.Id(), ":")
+	if len(s) != 2 {
+		d.SetId("")
+		return nil, fmt.Errorf("Invalid Project Hook import format; expected '{project_id}:{hook_id}'")
+	}
+	project, id := s[0], s[1]
+
+	d.SetId(id)
+	d.Set("project", project)
+
+	return []*schema.ResourceData{d}, nil
+}

internal/provider/resource_gitlab_project_hook_test.go

@@ -68,6 +68,14 @@ func TestAccGitlabProjectHook_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify import
+			{
+				ResourceName:            "gitlab_project_hook.foo",
+				ImportStateIdFunc:       getProjectHookImportID("gitlab_project_hook.foo"),
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"token"},
+			},
 		},
 	})
 }
@@ -203,6 +211,25 @@ func testAccCheckGitlabProjectHookDestroy(s *terraform.State) error {
 	return nil
 }
 
+func getProjectHookImportID(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)
+		}
+
+		hookID := rs.Primary.ID
+		if hookID == "" {
+			return "", fmt.Errorf("No hook ID is set")
+		}
+		projectID := rs.Primary.Attributes["project"]
+		if projectID == "" {
+			return "", fmt.Errorf("No project ID is set")
+		}
+		return fmt.Sprintf("%s:%s", projectID, hookID), nil
+	}
+}
+
 func testAccGitlabProjectHookConfig(rInt int) string {
 	return fmt.Sprintf(`
 resource "gitlab_project" "foo" {