Support for identity resource discovery

Author: rashik-bhasin

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Support for `dbVersion` field added to Autonomous Database back resource
 - Support for patch and patch history in `database_vm_cluster`
 - Support resource discovery for `monitoring` resources
+- Support resource discovery for `identity` resources
 
 ## 3.79.0 (June 03, 2020)
 

oci/export_definitions.go

@@ -867,6 +867,16 @@ var exportIdentitySmtpCredentialHints = &TerraformResourceHints{
 	},
 }
 
+var exportIdentitySwiftPasswordHints = &TerraformResourceHints{
+	resourceClass:        "oci_identity_swift_password",
+	datasourceClass:      "oci_identity_swift_passwords",
+	datasourceItemsAttr:  "passwords",
+	resourceAbbreviation: "swift_password",
+	discoverableLifecycleStates: []string{
+		string(oci_identity.SwiftPasswordLifecycleStateActive),
+	},
+}
+
 var exportIdentityUiPasswordHints = &TerraformResourceHints{
 	resourceClass:        "oci_identity_ui_password",
 	datasourceClass:      "oci_identity_ui_password",
@@ -927,6 +937,17 @@ var exportIdentityTagHints = &TerraformResourceHints{
 	},
 }
 
+var exportIdentityNetworkSourceHints = &TerraformResourceHints{
+	resourceClass:          "oci_identity_network_source",
+	datasourceClass:        "oci_identity_network_sources",
+	datasourceItemsAttr:    "network_sources",
+	resourceAbbreviation:   "network_source",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_identity.NetworkSourcesLifecycleStateActive),
+	},
+}
+
 var exportLimitsQuotaHints = &TerraformResourceHints{
 	resourceClass:          "oci_limits_quota",
 	datasourceClass:        "oci_limits_quotas",

oci/export_graphs.go

@@ -350,6 +350,7 @@ var identityResourceGraph = TerraformResourceGraph{
 			datasourceQueryParams:  map[string]string{"compartment_id": "id"},
 		},
 		{TerraformResourceHints: exportIdentityUserHints},
+		{TerraformResourceHints: exportIdentityNetworkSourceHints},
 	},
 	"oci_identity_compartment": {
 		{
@@ -394,6 +395,12 @@ var identityResourceGraph = TerraformResourceGraph{
 				"user_id": "id",
 			},
 		},
+		{
+			TerraformResourceHints: exportIdentitySwiftPasswordHints,
+			datasourceQueryParams: map[string]string{
+				"user_id": "id",
+			},
+		},
 		{
 			TerraformResourceHints: exportIdentityUiPasswordHints,
 			datasourceQueryParams: map[string]string{

oci/export_resource_helpers.go

@@ -120,10 +120,82 @@ func init() {
 	exportFileStorageMountTargetHints.requireResourceRefresh = true
 
 	exportBudgetAlertRuleHints.getIdFn = getBudgetAlertRuleId
+
+	exportIdentityApiKeyHints.getIdFn = getIdentityApiKeyId
+
+	exportIdentityAuthTokenHints.getIdFn = getIdentityAuthTokenId
+
+	exportIdentityCustomerSecretKeyHints.getIdFn = getIdentityCustomerSecretKeyId
+
+	exportIdentityIdpGroupMappingHints.getIdFn = getIdentityIdpGroupMappingId
+
+	exportIdentitySmtpCredentialHints.getIdFn = getIdentitySmtpCredentialId
+
+	exportIdentitySwiftPasswordHints.getIdFn = getIdentitySwiftPasswordId
 }
 
 // Custom functions to alter behavior of resource discovery and resource HCL representation
 
+func getIdentityApiKeyId(resource *OCIResource) (string, error) {
+	fingerPrint, ok := resource.sourceAttributes["fingerprint"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find fingerprint for Api Key")
+	}
+	userId := resource.parent.id
+
+	return getApiKeyCompositeId(fingerPrint, userId), nil
+}
+
+func getIdentityAuthTokenId(resource *OCIResource) (string, error) {
+	authTokenId, ok := resource.sourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find id for Auth Token")
+	}
+	userId := resource.parent.id
+
+	return getAuthTokenCompositeId(authTokenId, userId), nil
+}
+
+func getIdentityCustomerSecretKeyId(resource *OCIResource) (string, error) {
+	id, ok := resource.sourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find id for Customer Secrest Key")
+	}
+	userId := resource.parent.id
+
+	return getCustomerSecretKeyCompositeId(id, userId), nil
+}
+
+func getIdentityIdpGroupMappingId(resource *OCIResource) (string, error) {
+	id, ok := resource.sourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find id for Customer Secrest Key")
+	}
+	providerId := resource.parent.id
+
+	return getIdpGroupMappingCompositeId(providerId, id), nil
+}
+
+func getIdentitySmtpCredentialId(resource *OCIResource) (string, error) {
+	id, ok := resource.sourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find id for Smtp Credential")
+	}
+	userId := resource.parent.id
+
+	return getSmtpCredentialCompositeId(id, userId), nil
+}
+
+func getIdentitySwiftPasswordId(resource *OCIResource) (string, error) {
+	id, ok := resource.sourceAttributes["id"].(string)
+	if !ok {
+		return "", fmt.Errorf("[ERROR] unable to find id for Swift Password")
+	}
+	userId := resource.parent.id
+
+	return getSwiftPasswordCompositeId(id, userId), nil
+}
+
 func processContainerengineNodePool(clients *OracleClients, resources []*OCIResource) ([]*OCIResource, error) {
 	for _, nodePool := range resources {
 		// subnet_ids and quantity_per_subnet are deprecated and conflict with node_config_details

oci/identity_api_key_resource.go

@@ -6,8 +6,12 @@ package oci
 import (
 	"context"
 	"errors"
+	"fmt"
+	"log"
+	"net/url"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
@@ -20,6 +24,9 @@ func init() {
 
 func IdentityApiKeyResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: DefaultTimeout,
 		Create:   createIdentityApiKey,
 		Read:     readIdentityApiKey,
@@ -162,6 +169,14 @@ func (s *IdentityApiKeyResourceCrud) Get() error {
 		request.UserId = &tmp
 	}
 
+	fingerprintFromCompositeId, userId, err := parseApiKeyCompositeId(s.D.Id())
+	if err == nil {
+		s.D.Set("fingerprint", fingerprintFromCompositeId)
+		request.UserId = &userId
+	} else {
+		log.Printf("[WARN] Get() unable to parse current ID: %s", s.D.Id())
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "identity")
 
 	response, err := s.Client.ListApiKeys(context.Background(), request)
@@ -224,3 +239,23 @@ func (s *IdentityApiKeyResourceCrud) SetData() error {
 
 	return nil
 }
+
+func getApiKeyCompositeId(fingerprint string, userId string) string {
+	fingerprint = url.PathEscape(fingerprint)
+	userId = url.PathEscape(userId)
+	compositeId := "users/" + userId + "/apiKeys/" + fingerprint
+	return compositeId
+}
+
+func parseApiKeyCompositeId(compositeId string) (fingerprint string, userId string, err error) {
+	parts := strings.Split(compositeId, "/")
+	match, _ := regexp.MatchString("users/.*/apiKeys/.*", compositeId)
+	if !match || len(parts) != 4 {
+		err = fmt.Errorf("illegal compositeId %s encountered", compositeId)
+		return
+	}
+	userId, _ = url.PathUnescape(parts[1])
+	fingerprint, _ = url.PathUnescape(parts[3])
+
+	return
+}

oci/identity_api_key_test.go

@@ -6,6 +6,8 @@ package oci
 import (
 	"context"
 	"fmt"
+	"log"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -68,6 +70,8 @@ func TestIdentityApiKeyResource_basic(t *testing.T) {
 	resourceName := "oci_identity_api_key.test_api_key"
 	datasourceName := "data.oci_identity_api_keys.test_api_keys"
 
+	var compositeId, fingerprint string
+
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
 		Providers: map[string]terraform.ResourceProvider{
@@ -84,6 +88,32 @@ func TestIdentityApiKeyResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "user_id"),
 				),
 			},
+			// delete before next create
+			{
+				Config: config + apiKeyVarStr + compartmentIdVariableStr + ApiKeyResourceDependencies,
+			},
+			// verify create with export
+			{
+				Config: config + apiKeyVarStr + compartmentIdVariableStr + ApiKeyResourceDependencies +
+					generateResourceFromRepresentationMap("oci_identity_api_key", "test_api_key", Required, Create, apiKeyRepresentation),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "key_value", apiKey),
+					resource.TestCheckResourceAttrSet(resourceName, "user_id"),
+
+					func(s *terraform.State) (err error) {
+						fingerprint, _ = fromInstanceState(s, resourceName, "fingerprint")
+						userId, _ := fromInstanceState(s, resourceName, "user_id")
+						compositeId = "users/" + userId + "/apiKeys/" + fingerprint
+						log.Printf("[DEBUG] Composite ID to import: %s", compositeId)
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&compositeId, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
+						return err
+					},
+				),
+			},
 
 			// verify datasource
 			{
@@ -103,6 +133,14 @@ func TestIdentityApiKeyResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "api_keys.0.user_id"),
 				),
 			},
+			// verify resource import
+			//{
+			//	Config:                  config,
+			//	ImportState:             true,
+			//	ImportStateVerify:       true,
+			//	ImportStateVerifyIgnore: []string{},
+			//	ResourceName:            resourceName,
+			//},
 		},
 	})
 }

oci/identity_auth_token_resource.go

@@ -6,7 +6,12 @@ package oci
 import (
 	"context"
 	"errors"
+	"fmt"
+	"log"
+	"net/url"
+	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
@@ -19,6 +24,9 @@ func init() {
 
 func IdentityAuthTokenResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: DefaultTimeout,
 		Create:   createIdentityAuthToken,
 		Read:     readIdentityAuthToken,
@@ -167,6 +175,14 @@ func (s *IdentityAuthTokenResourceCrud) Get() error {
 		request.UserId = &tmp
 	}
 
+	authTokenId, userId, err := parseAuthTokenCompositeId(s.D.Id())
+	if err == nil {
+		s.D.SetId(authTokenId)
+		request.UserId = &userId
+	} else {
+		log.Printf("[WARN] Get() unable to parse current ID: %s", s.D.Id())
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "identity")
 
 	response, err := s.Client.ListAuthTokens(context.Background(), request)
@@ -258,3 +274,23 @@ func (s *IdentityAuthTokenResourceCrud) SetData() error {
 
 	return nil
 }
+
+func getAuthTokenCompositeId(authTokenId string, userId string) string {
+	authTokenId = url.PathEscape(authTokenId)
+	userId = url.PathEscape(userId)
+	compositeId := "users/" + userId + "/authTokens/" + authTokenId
+	return compositeId
+}
+
+func parseAuthTokenCompositeId(compositeId string) (authTokenId string, userId string, err error) {
+	parts := strings.Split(compositeId, "/")
+	match, _ := regexp.MatchString("users/.*/authTokens/.*", compositeId)
+	if !match || len(parts) != 4 {
+		err = fmt.Errorf("illegal compositeId %s encountered", compositeId)
+		return
+	}
+	userId, _ = url.PathUnescape(parts[1])
+	authTokenId, _ = url.PathUnescape(parts[3])
+
+	return
+}

oci/identity_auth_token_test.go

@@ -6,6 +6,7 @@ package oci
 import (
 	"context"
 	"fmt"
+	"log"
 	"strconv"
 	"testing"
 
@@ -48,6 +49,7 @@ func TestIdentityAuthTokenResource_basic(t *testing.T) {
 	datasourceName := "data.oci_identity_auth_tokens.test_auth_tokens"
 
 	var resId, resId2 string
+	var compositeId string
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
@@ -66,8 +68,11 @@ func TestIdentityAuthTokenResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
+						userId, _ := fromInstanceState(s, resourceName, "user_id")
+						compositeId = "users/" + userId + "/authTokens/" + resId
+						log.Printf("[DEBUG] Composite ID to import: %s", compositeId)
 						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
-							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+							if errExport := testExportCompartmentWithResourceName(&compositeId, &compartmentId, resourceName); errExport != nil {
 								return errExport
 							}
 						}
@@ -110,6 +115,14 @@ func TestIdentityAuthTokenResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(datasourceName, "tokens.0.user_id"),
 				),
 			},
+			// verify resource import
+			//{
+			//	Config:                  config,
+			//	ImportState:             true,
+			//	ImportStateVerify:       true,
+			//	ImportStateVerifyIgnore: []string{},
+			//	ResourceName:            resourceName,
+			//},
 		},
 	})
 }