From 04683f7aae520b6f7bd7d82330615ef46977faab Mon Sep 17 00:00:00 2001
From: David Townshend <david.townshend@allangray.co.za>
Date: Fri, 19 Jun 2020 08:30:19 +0200
Subject: [PATCH 1/3] add support for importing gitlab group labels

---
 gitlab/resource_gitlab_group_label.go      | 27 ++++++++++++++
 gitlab/resource_gitlab_group_label_test.go | 42 ++++++++++++++++++++++
 website/docs/r/group_label.html.markdown   |  8 +++++
 3 files changed, 77 insertions(+)

diff --git a/gitlab/resource_gitlab_group_label.go b/gitlab/resource_gitlab_group_label.go
index b9c839224..b8a2f3545 100644
--- a/gitlab/resource_gitlab_group_label.go
+++ b/gitlab/resource_gitlab_group_label.go
@@ -1,7 +1,9 @@
 package gitlab
 
 import (
+	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	gitlab "github.com/xanzy/go-gitlab"
@@ -13,6 +15,9 @@ func resourceGitlabGroupLabel() *schema.Resource {
 		Read:   resourceGitlabGroupLabelRead,
 		Update: resourceGitlabGroupLabelUpdate,
 		Delete: resourceGitlabGroupLabelDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceGitlabGroupLabelImporter,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"group": {
@@ -123,3 +128,25 @@ func resourceGitlabGroupLabelDelete(d *schema.ResourceData, meta interface{}) er
 	_, err := client.GroupLabels.DeleteGroupLabel(group, options)
 	return err
 }
+
+func resourceGitlabGroupLabelImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	client := meta.(*gitlab.Client)
+	parts := strings.SplitN(d.Id(), ":", 2)
+	if len(parts) != 2 {
+		return nil, fmt.Errorf("invalid label id (should be <group ID>.<label name>): %s", d.Id())
+	}
+
+	d.SetId(parts[1])
+	group, _, err := client.Groups.GetGroup(parts[0])
+	if err != nil {
+		return nil, err
+	}
+
+	if err := d.Set("group", group.ID); err != nil {
+		return nil, err
+	}
+
+	err = resourceGitlabGroupLabelRead(d, meta)
+
+	return []*schema.ResourceData{d}, err
+}
diff --git a/gitlab/resource_gitlab_group_label_test.go b/gitlab/resource_gitlab_group_label_test.go
index d31abbfe9..ca16fd522 100644
--- a/gitlab/resource_gitlab_group_label_test.go
+++ b/gitlab/resource_gitlab_group_label_test.go
@@ -84,6 +84,48 @@ func TestAccGitlabGroupLabel_basic(t *testing.T) {
 	})
 }
 
+func TestAccGitlabGroupLabel_import(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "gitlab_group_label.foo"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGitlabGroupLabelDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGitlabGroupLabelConfig(rInt),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportStateIdFunc: getGroupLabelImportID(resourceName),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func getGroupLabelImportID(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)
+		}
+
+		labelID := rs.Primary.ID
+		if labelID == "" {
+			return "", fmt.Errorf("No deploy key ID is set")
+		}
+		groupID := rs.Primary.Attributes["group"]
+		if groupID == "" {
+			return "", fmt.Errorf("No group ID is set")
+		}
+
+		return fmt.Sprintf("%s:%s", groupID, labelID), nil
+	}
+}
+
 func testAccCheckGitlabGroupLabelExists(n string, label *gitlab.GroupLabel) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
diff --git a/website/docs/r/group_label.html.markdown b/website/docs/r/group_label.html.markdown
index c6b2bf66b..6dd463ef6 100644
--- a/website/docs/r/group_label.html.markdown
+++ b/website/docs/r/group_label.html.markdown
@@ -41,3 +41,11 @@ The following arguments are supported:
 The resource exports the following attributes:
 
 * `id` - The unique id assigned to the label by the GitLab server (the name of the label).
+
+## Import
+
+Gitlab group labels can be imported using an id made up of `{group_id}:{group_label_id}`, e.g.
+
+```
+$ terraform import gitlab_deploy_key_enable.example 12345:fixme
+```

From d488791dc79c90f5cca8f8326ed02f62bdfde02f Mon Sep 17 00:00:00 2001
From: David Townshend <david.townshend@allangray.co.za>
Date: Fri, 19 Jun 2020 09:01:00 +0200
Subject: [PATCH 2/3] fix resource name in the acceptance test

---
 gitlab/resource_gitlab_group_label_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitlab/resource_gitlab_group_label_test.go b/gitlab/resource_gitlab_group_label_test.go
index ca16fd522..8f6fb2a28 100644
--- a/gitlab/resource_gitlab_group_label_test.go
+++ b/gitlab/resource_gitlab_group_label_test.go
@@ -86,7 +86,7 @@ func TestAccGitlabGroupLabel_basic(t *testing.T) {
 
 func TestAccGitlabGroupLabel_import(t *testing.T) {
 	rInt := acctest.RandInt()
-	resourceName := "gitlab_group_label.foo"
+	resourceName := "gitlab_group_label.fixme"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

From 887ade6992357415bc9eadbe30dd29ce00805b14 Mon Sep 17 00:00:00 2001
From: David Townshend <david.townshend@allangray.co.za>
Date: Fri, 19 Jun 2020 09:14:12 +0200
Subject: [PATCH 3/3] convert group ID to string

---
 gitlab/resource_gitlab_group_label.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitlab/resource_gitlab_group_label.go b/gitlab/resource_gitlab_group_label.go
index b8a2f3545..f91b66d70 100644
--- a/gitlab/resource_gitlab_group_label.go
+++ b/gitlab/resource_gitlab_group_label.go
@@ -3,6 +3,7 @@ package gitlab
 import (
 	"fmt"
 	"log"
+	"strconv"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -142,7 +143,7 @@ func resourceGitlabGroupLabelImporter(d *schema.ResourceData, meta interface{})
 		return nil, err
 	}
 
-	if err := d.Set("group", group.ID); err != nil {
+	if err := d.Set("group", strconv.Itoa(group.ID)); err != nil {
 		return nil, err
 	}