Add support for Tag import

Author: abhilash-av

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 3.10.1 (Unreleased)
+
+### Added
+- Support for importing tag. Note tag uses custom Id(import only) format (tagNamespaces/{tagNamespaceId}/tags/{tagName}) to support import.
+
 ## 3.10.0 (December 11, 2018)
 
 ### Added

oci/identity_tag_resource.go

@@ -4,18 +4,20 @@ package provider
 
 import (
 	"context"
-
-	"github.com/hashicorp/terraform/helper/schema"
-
-	"strings"
-
+	"fmt"
+	"regexp"
 	"strconv"
+	"strings"
 
+	"github.com/hashicorp/terraform/helper/schema"
 	oci_identity "github.com/oracle/oci-go-sdk/identity"
 )
 
 func TagResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: DefaultTimeout,
 		Create:   createTag,
 		Read:     readTag,
@@ -197,6 +199,12 @@ func (s *TagResourceCrud) Create() error {
 func (s *TagResourceCrud) Get() error {
 	request := oci_identity.GetTagRequest{}
 
+	tagName, tagNamespaceId, parseTagCompositeIdErr := parseTagCompositeId(s.D.Id())
+	if parseTagCompositeIdErr == nil {
+		request.TagName = &tagName
+		request.TagNamespaceId = &tagNamespaceId
+	}
+
 	if tagName, ok := s.D.GetOkExists("name"); ok {
 		tmp := tagName.(string)
 		request.TagName = &tmp
@@ -215,6 +223,14 @@ func (s *TagResourceCrud) Get() error {
 	}
 
 	s.Res = &response.Tag
+	if parseTagCompositeIdErr == nil {
+		// Import sets the ID to composite ID and hence overwriting ID to OCID from response
+		id := response.Tag.Id
+		if id == nil {
+			return fmt.Errorf("error : received null value for id attribute for request %s, id attribute cannot be null", *response.OpcRequestId)
+		}
+		s.D.SetId(*id)
+	}
 	return nil
 }
 
@@ -302,3 +318,16 @@ func (s *TagResourceCrud) SetData() error {
 
 	return nil
 }
+
+func parseTagCompositeId(compositeId string) (tagName string, tagNamespaceId string, err error) {
+	parts := strings.Split(compositeId, "/")
+	match, _ := regexp.MatchString("tagNamespaces/.*/tags/.*", compositeId)
+	if !match || len(parts) != 4 {
+		err = fmt.Errorf("illegal compositeId %s encountered", compositeId)
+		return
+	}
+	tagNamespaceId = parts[1]
+	tagName = parts[3]
+
+	return
+}

oci/identity_tag_test.go

@@ -161,6 +161,26 @@ func TestIdentityTagResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "tags.0.time_created"),
 				),
 			},
+			// verify resource import
+			{
+				Config:                  config,
+				ImportStateIdFunc:       getTagCompositeId(resourceName),
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{},
+				ResourceName:            resourceName,
+			},
 		},
 	})
 }
+
+func getTagCompositeId(resourceName string) resource.ImportStateIdFunc {
+	return func(s *terraform.State) (string, error) {
+		rs, ok := s.RootModule().Resources[resourceName]
+		if !ok {
+			return "", fmt.Errorf("Not found: %s", resourceName)
+		}
+
+		return fmt.Sprintf("tagNamespaces/%s/tags/%s", rs.Primary.Attributes["tag_namespace_id"], rs.Primary.Attributes["name"]), nil
+	}
+}

website/docs/r/identity_tag.html.markdown

@@ -70,3 +70,11 @@ The following attributes are exported:
 * `tag_namespace_id` - The OCID of the namespace that contains the tag definition.
 * `time_created` - Date and time the tag was created, in the format defined by RFC3339. Example: `2016-08-25T21:10:29.600Z` 
 
+## Import
+
+Tags can be imported using the `tagNamespaceId` and `tagName`, e.g.
+
+```
+$ terraform import oci_identity_tag.test_tag "tagNamespaces/{tagNamespaceId}/tags/{tagName}" 
+```
+